Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,826 Commits 1 Branch 0 Tags
f4f4da4ef335fea0eed83733c09d201b917e565b
Commit Graph

34826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Naranjo
f4f4da4ef3 Add Bound3R in Authors List 2016-01-21 09:52:24 -05:00
Daniel Naranjo
a639846a26 Reemplace property min-width value 
The min-width property accept only values <length> | <percentage> | inherit. to reset better set to 0.
Properties documentation: https://www.w3.org/TR/CSS2/visudet.html#min-max-widths

This error generates an invalid style, and, therefore, this value is set to 760px by: https://github.com/edx/edx-platform/blob/master/lms/static/sass/course/courseware/_courseware.scss#L50
 2016-01-21 09:50:35 -05:00
Ned Batchelder
d8af95246c Merge pull request #11283 from open-craft/update-xblock-utils 
Bump xblock-utils hash.
 2016-01-21 09:26:33 -05:00
Syed Hasan raza
fb8478b084 Merge pull request #11228 from edx/shr/bug/AN-4509-HTTP_USER_AGENT 
Fix HTTP_USER_AGENT latin1 characters
 2016-01-21 15:23:16 +05:00
Braden MacDonald
5e3cc70783 Merge pull request #10943 from open-craft/email-authorized-list-master 
Allow each instance to configure restrictions on allowed email addresses
 2016-01-20 14:51:29 -08:00
Tim Krones
b9ac4e8341 Bump xblock-utils hash. 2016-01-20 22:22:19 +01:00
Peter Pinch
f584b1749f Merge pull request #10971 from msegado/msegado/customresponse-expect-context 
Allow python variable interpolation in CustomResponse "expect" field
 2016-01-20 16:09:36 -05:00
Piotr Mitros
417b0d2ebe Merge pull request #11252 from edx/pmitros/xblock-testcase-fixes 
Updating test case code to handle feedback XBlock
 2016-01-20 15:12:45 -05:00
Martin Segado
a15388b20c Allow python variable interpolation in CustomResponse 'expect' and 'answer' attributes 2016-01-20 15:11:51 -05:00
Eric Fischer
e65e8df2b5 Merge pull request #11269 from edx/efischer/flaky_tests 
Flaky test fix
 2016-01-20 15:01:37 -05:00
Peter Pinch
02a7d6eb47 Merge pull request #10931 from mitocw/gdm_push_ccx_info_to_connector_#128 
Added CCXCon app and CCXCon URL in course advanced settings
 2016-01-20 14:28:48 -05:00
Piotr Mitros
b480645654 Updating test case code to handle feedback XBlock 2016-01-20 14:24:06 -05:00
Eric Fischer
2b2f6d18d6 Wait for text to appear 
Adding a wait statement to allow ajax calls to finish before making assertions
about text that has changed. Fixes TNL-3943 flaky test ticket.
 2016-01-20 14:08:13 -05:00
Braden MacDonald
110714ee81 Allow each instance to configure restrictions on allowed email addresses 2016-01-20 11:03:30 -08:00
Douglas Hall
73f311f1f6 Merge pull request #11270 from edx/douglashall/TNL-4046/fix_lti_consumer_due_date_comparison_bug 
TNL-4046 Updating xblock-lti-consumer requirement to pull in bug fix
 2016-01-20 13:59:16 -05:00
Diana Huang
ea2a0cab27 Merge pull request #11069 from OmarIthawi/edraak/oithawi/draggable-capa-rtl 
Fixup: draggable capa icons disappear in RTL layout
 2016-01-20 13:32:56 -05:00
Ned Batchelder
fe2e4a7481 Merge pull request #11273 from openfun/fun/fix_default_email_localization 
Fix (un)enrollment email default language
 2016-01-20 13:15:30 -05:00
Ben Patterson
31841bdcbb Merge pull request #11271 from edx/benp/9-bokchoy-shards 
Benp/9 bokchoy shards
 2016-01-20 12:09:53 -05:00
Régis Behmo
5fee7480e9 Fix (un)enrollment email default language 
When one or many users are sent an enrollment or unenrollment email via
the teacher subscription form, the emails are written in the user
language. If the user has no preferred language, e.g: when the user does
not exist, the platform language is supposed to be selected. In
practice, the emails were not being translated at all.
 2016-01-20 17:30:43 +01:00
Giovanni Di Milia
bb36ab013f Added CCXCon app 
The CCXCon app is used to push course updated to the CCXCon
 externale service.
 2016-01-20 10:47:37 -05:00
Mushtaq Ali
d8b902ad58 Merge pull request #11200 from edx/mushtaq/ecom2082-fix-enrollment-msg 
Escape Course Name in enrolment message
 2016-01-20 20:04:23 +05:00
Syed Hassan Raza
de91ceaae2 Fix HTTP_USER_AGENT latin1 characters 2016-01-20 18:40:09 +05:00
Muhammad Ammar
4938601cd9 Merge pull request #11177 from edx/ammar/fix-play-video-event 
Avoid emitting play_video event during buffering
 2016-01-20 17:59:04 +05:00
Matt Drayer
68d770116b Merge pull request #11262 from edx/saleem-latif/WL-276 
WL-276: Move microsite_configuration/templatetags/microsite.py from individual templates to static_content.html
 2016-01-20 07:49:36 -05:00
Mushtaq Ali
8f76f3385a Fix enrollment message 2016-01-20 15:59:27 +05:00
Saleem Latif
6c8c67cad5 Remove microsite_configuration/templatetags/microsite.py references from individual templates. 2016-01-20 14:36:07 +05:00
raeeschachar
536ac77af0 Merge pull request #11263 from edx/raees/chrome-bokchoy-test-course-rerun 
Fixed test course rerun failing on Chrome
 2016-01-20 12:39:54 +05:00
Braden MacDonald
f8f9689d5b Merge pull request #11230 from open-craft/omar/saml-crawl-fix 
Redirect to login when SAML accessed without idp param
 2016-01-19 19:47:50 -08:00
Omar Khan
ab688e63ea Redirect to login when SAML accessed without idp param 
The python social auth SAML page returns a 500 response when accessed
without the 'idp' query param. It should redirect to the login page if
the param is missing.

SOL-1550
 2016-01-20 09:36:31 +07:00
Ben Patterson
d0f6aee339 Update script for 9 shards. 2016-01-19 17:20:21 -05:00
Ben Patterson
ce716bbbc4 Create additional bok-choy shards for faster feedback. 2016-01-19 17:18:33 -05:00
Douglas Hall
c1efd13f86 Updating xblock-lti-consumer requirement to pull in bug fix for TNL-4046 2016-01-19 16:37:47 -05:00
Ned Batchelder
2c9783c881 Merge pull request #10937 from ubc/ubcpi-0.5 
Update Peer Instruction XBlock to 0.5
 2016-01-19 15:03:42 -05:00
Matt Drayer
20f6b545fb Merge pull request #11256 from edx/mattdrayer/index-page-bokchoy 
mattdrayer/index-page-bokchoy: Refactor+cover Open edX LMS index page
 2016-01-19 14:28:46 -05:00
raeeschachar
d440e209e1 Fixed test course rerun failing on Chrome 2016-01-20 00:19:40 +05:00
Ben Patterson
7ca5e4ab7a Merge pull request #11255 from edx/benp/replace-actionchain-with-js 
[firefox upgrade] Replace action chain with tinymce JS.
 2016-01-19 11:26:53 -05:00
Douglas Hall
26e09feef7 Merge pull request #11243 from edx/hasnain-naveed/HOL-37-proxy-rss 
HOL-12 HOL-29 rss_proxy djangoapp
 2016-01-19 10:49:37 -05:00
Hasnain
e3c9f87364 Added rss_proxy djangoapp for proxying requests to whitelisted RSS feed URLs 2016-01-19 09:57:23 -05:00
muhammad-ammar
83be42edd0 once again new logic 2016-01-19 18:31:08 +05:00
Matt Drayer
9b35844b98 mattdrayer/index-page-bokchoy: Refactor+cover Open edX LMS index page 2016-01-18 23:12:04 -05:00
muhammad-ammar
c4065f7b33 Avoid emitting play_video event during buffering 
TNL-2178
 2016-01-18 19:55:37 +05:00
Douglas Hall
22e01a8c95 Merge pull request #11172 from edx/hasnain-naveed/HOL-36 
HOL-36 Allow for override of course listing in index.html
 2016-01-16 15:36:31 -05:00
Ben Patterson
699aa4d570 [firefox upgrade] Replace action chain with tinymce JS. 
This action chain is not reliable across firefox versions (and
in fact, even on the older firefox, fails locally). Instead we
use native JS tinymce to set the content.
 2016-01-16 12:46:49 -05:00
Ben Patterson
e3664c3504 Merge pull request #11220 from edx/benp/drop-db-bok-choy 
TE-1133 Fix to allow for serversonly /testsonly and full test modes.
 2016-01-15 16:04:10 -05:00
Ben Patterson
0c1fd7ab6b Merge pull request #11240 from edx/benp/ff42-container-block-3 
Fix flaky condition for firefox 42 on subsection container block (studio)
 2016-01-15 15:15:34 -05:00
Ned Batchelder
5ca8494898 Merge pull request #11249 from edx/ned/update-i18n-tools 
Use the latest i18n-tools to reduce bogus problem reports
 2016-01-15 14:43:29 -05:00
Ned Batchelder
37d6192e7a Merge pull request #11244 from edx/ned/update-translations 
Latest translations
 2016-01-15 12:40:59 -05:00
Jim Abramson
adb70e44b7 Merge pull request #11218 from edx/jsa/studio-id-token-expiration 
Set default id token expiration to 5m for Studio
 2016-01-15 11:37:47 -05:00
Ned Batchelder
ffbbf37052 Use the latest i18n-tools to reduce bogus problem reports 2016-01-15 11:16:41 -05:00
Matt Drayer
c9933a5878 Merge pull request #11209 from edx/saleem-latif/MAYN-167 
MAYN-167: Bulk uploads (CSV) of manual enrollments on white labels should be performed as 'honor' modes
 2016-01-15 11:07:50 -05:00