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

40279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ahsan Ulhaq
8798ee0f53 Add credentials service user 2016-01-20 12:51:48 +05:00
Tasawer
6e14461adc Update 'certificate_url' field for view certificate on learner dashboard. 
ECOM-3281
 2016-01-20 12:51:48 +05:00
Ahsan Ulhaq
8fb998fee7 caching for requests to credentials service 
ECOM-3278
 2016-01-20 12:51:28 +05:00
Ahsan Ulhaq
4ce58a6f67 Show message for earned programs credentials 
ECOM-3015
 2016-01-20 12:50:30 +05:00
Ahsan Ulhaq
2cec045d92 Added configuration model for credentials 
ECOM-3033
 2016-01-20 12:50:29 +05:00
Ahsan Ulhaq
6f8727a285 Create placeholder django apps for credentials 
ECOM-3057
 2016-01-20 12:50:29 +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
Bill DeRusha
e47e65d04a Merge pull request #11267 from edx/bderusha/rel-enrollment-cmd-updates 
Update change_enrollment management command to be more robust and tested
 2016-01-19 15:48:17 -05:00
Bill DeRusha
ecae21e66c Update change_enrollment management command to be more robust and tested 2016-01-19 15:06:18 -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
Jesse Zoldak
a00ebe925a Do not clean test files with bok choy testsonly command 2016-01-19 13:48:17 -05:00
Peter Fogg
6e9c6207cf Merge pull request #11264 from edx/peter-fogg/fix-audit-cert-gen 
Correctly query for any generated certificate, not just eligible ones.
 2016-01-19 12:42:53 -05:00
Peter Fogg
ee13ffd149 Correctly query for any generated certificate, not just eligible ones. 2016-01-19 12:01:04 -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
Ehtesham
df649ba21c [MA-1862] changing default value to fix quality 2016-01-19 14:31:38 +05:00
Ehtesham
43fdf9a63d [MA-1862] converting function signature to take kwargs 2016-01-19 12:54:29 +05:00
Ehtesham
1297f0af45 [MA-1862] changing next to next_link, next is builtin 2016-01-19 12:54:29 +05:00
Ehtesham
8c94fdcf90 [MA-1862] updating views tests 2016-01-19 12:54:29 +05:00
Ehtesham
73aceb5d8a [MA-1862] updating api tests 2016-01-19 12:54:28 +05:00
Ehtesham
e9622f0d0c [MA-1862] fixing pagination tests 2016-01-19 12:54:28 +05:00
Ehtesham
a13bf52dbf [MA-1862] using NamespacedPageNumberPagination class for pagination 2016-01-19 12:54:28 +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
Christine Lytwynec
76c8e33d49 Fix file upload in IE 2016-01-15 14:54:54 -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
Piotr Mitros
6b6248b44a Minor cleanup of Studio settings: removing extra indirection, and advanced components list 2016-01-15 11:21:52 -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
Ned Batchelder
5135a4c449 Update translations (autogenerated message) 2016-01-15 16:04:24 +00:00