Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,340 Commits 1 Branch 0 Tags
667df875bdb2bb66546b395d3aba2c9e3f40b0f7
Commit Graph

17839 Commits

Author SHA1 Message Date
Nimisha Asthagiri
dced810138 Merge pull request #11489 from edx/release 
Hotfix for reducing mobile warnings in tracking logs
 2016-02-09 21:33:31 -05:00
John Eskew
3f58954f3a Merge pull request #11469 from edx/jeskew/fix_django_19_warnings 
Remove deprecation warnings from Django models.
 2016-02-09 16:38:23 -05:00
Nimisha Asthagiri
a5574792fb Fix mobile Warning errors in tracking logs. 2016-02-09 13:22:15 -05:00
Andy Armstrong
84773d2ff7 Merge pull request #11482 from edx/release 
Merge release back to master
 2016-02-09 12:49:41 -05:00
Andy Armstrong
caf4cfbd3a Merge pull request #11268 from edx/andya/add-pattern-library 
Add edX Pattern Library to edx-platform
 2016-02-09 12:07:03 -05:00
clrux
a5e34d4e12 Merge pull request #11105 from edx/clrux/ac-23 
Updating forum buttons and overall icon cleanup
 2016-02-09 10:53:31 -05:00
clrux
0b3f9ee5e8 Merge pull request #11457 from edx/clrux/ac-252 
LMS: updating response status messaging
 2016-02-09 10:22:18 -05:00
Chris Rodriguez
4454c819c8 LMS: forum markup tweaks and cleanup 2016-02-09 09:34:58 -05:00
John Eskew
bb5c28c0c5 Remove deprecation warnings from Django models. 
Add app_label definitions in Meta classes for models.
Move import of course_mode model into methods to prevent importing
the models at startup time.
 2016-02-09 09:28:43 -05:00
Chris Rodriguez
9e0497dfab Updating response status messaging 2016-02-09 08:16:20 -05:00
Ehtesham Kafeel
cf5dc1075f Merge pull request #11289 from edx/ekafeel/Deprecated-Advanced-Component-Types 
Ekafeel/deprecated advanced component types
 2016-02-09 15:07:59 +05:00
Omar Khan
ed2cba2e2d Keep SAML configuration check 2016-02-09 16:10:31 +07:00
Omar Khan
9b7bb0dc20 Make SAMLAuthBackend._config a cached_property 
Cleaner, and keeps pylint happy
 2016-02-09 15:45:49 +07:00
Omar Khan
2c4e97ebfa Don't remove auth_url method 2016-02-09 15:45:21 +07:00
Omar Khan
78d4ed31a1 Revert "Keep SAML configuration check" 
This reverts commit a020464a41.
 2016-02-09 15:40:27 +07:00
Toby Lawrence
e2ed8ff787 Switch to SharedModuleStoreTestCase in the 'student' app where possible. 2016-02-08 14:13:57 -05:00
Adam Palay
ae279569db address mathjax rendering bug (TNL-4080) 2016-02-08 10:32:22 -05:00
David Ormsbee
9ae0dada4c Merge pull request #11445 from edx/ormsbee/clear_cache_in_tests 
Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase
 2016-02-08 10:23:54 -05:00
John Eskew
07c542d8cb Merge pull request #11420 from edx/jeskew/ensure_indexes_fix 
Make ensure_indexes mgmt cmd semi-idempotent.
 2016-02-08 09:55:05 -05:00
Christina Roberts
74bdef1eca Merge pull request #11430 from edx/christina/tnl-4057 
Remove flaky decorator from test_cancel_comment_edit
 2016-02-08 07:32:29 -05:00
Ehtesham
b9c8b3308d [TNL-3962] moving DEPRECATED_ADVANCED_COMPONENT_TYPES to dJango admin 2016-02-08 17:26:49 +05:00
Omar Khan
a020464a41 Keep SAML configuration check 2016-02-08 14:32:12 +07:00
David Ormsbee
be25bb8aba Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase 
Cached values were leaking across tests, causing difficult to debug errors,
particularly when using Config Models. As part of this work, certain tests
that had query counts that relied on those values being cached needed to
be adjusted up.
 2016-02-06 00:01:15 -05:00
cahrens
d8a63fbd93 Remove flaky decorator from test_cancel_comment_edit. 
Test passed over 100 times in Jenkins.
TNL-4057
 2016-02-05 21:22:39 -05:00
John Eskew
77d2456542 Make MongoDB index creation idempotent by catching errors about existing 
indexes with different options. Emit warning instead and continue.
 2016-02-05 14:04:41 -05:00
Andy Armstrong
d731b07bd4 Add UXPL to edx-platform 
UITK-39
 2016-02-05 13:33:55 -05:00
Toby Lawrence
409a947c0d Merge pull request #11435 from edx/bugfix/add-admin-for-ext-exclusion 
Fix up the excluded extensions bit.
 2016-02-05 12:15:07 -05:00
Toby Lawrence
b03ee49a82 Fix up the excluded extensions bit. 
This adds the missing admin class, and registration of it, required to
actually change the value of the excluded extensions configuration.
 2016-02-05 12:14:15 -05:00
Robert Raposa
29fe2c7b0c Move markup helpers to djangolib 2016-02-05 02:42:43 -05:00
Omar Khan
28cb402a04 Return 404 response from third party auth login when SAML disabled 2016-02-05 13:49:20 +07:00
Ned Batchelder
158c4e58a3 Merge pull request #11424 from edx/ned/make-i18n-more-foolproof 
Move JSON samples out of translated strings so translators can't make mistakes
 2016-02-04 20:31:42 -05:00
Kevin Falcone
98671a8aa6 Merge pull request #11399 from edx/jibsheet/dont-use-using 
Don't use using() in migrations
 2016-02-04 19:47:10 -05:00
Jonathan Piacenti
328c84a2bb Update bok_choy database cache. 2016-02-04 15:55:18 -06:00
Muhammad Ammar
886d54dce9 Merge pull request #11320 from edx/ammar/boomark-button-requirejs-caching 
bookmark button js caching
 2016-02-04 21:07:45 +05:00
clrux
9ef9bc6efb Merge pull request #11129 from edx/clrux/ac-201 
LMS: darkening a gray on the profile page
 2016-02-04 10:11:24 -05:00
Ned Batchelder
6f9fd5d357 Move JSON samples out of translated strings so translators can't make mistakes 2016-02-04 10:07:05 -05:00
Chris Rodriguez
652e4ce0c1 LMS: darkening a gray on the profile page 2016-02-04 09:09:45 -05:00
muhammad-ammar
3127ac9180 bookmark button js caching 
TNL-3954
 2016-02-04 17:59:47 +05:00
Christina Roberts
901cafe57a Merge pull request #11419 from edx/christina/enable-test 
Remove skip from studio page bok choy test
 2016-02-03 16:37:10 -05:00
cahrens
19162fb752 Asset page is hopefully loading more reliably now. 2016-02-03 15:46:51 -05:00
Peter Fogg
8ed051e3cf Merge pull request #10642 from edx/feature/self-paced 
Course home page improvements.
 2016-02-03 15:06:59 -05:00
Peter Fogg
77aa07544e Internationalize course info sidebar default. 2016-02-03 13:58:23 -05:00
Peter Fogg
71a00bf946 Revert "Move Course Handouts to Course Resources and Tools." 
This reverts commit e8909e4439f22a7568d95a7672ab60d4a36f7322.
 2016-02-03 13:58:23 -05:00
Bill DeRusha
e75f7950d4 Updates XBlock renders its own template. Adds expand and collapse JS + jasmine tests. 
ECOM-2809
 2016-02-03 13:58:23 -05:00
Peter Fogg
c22677c171 Move Course Handouts to Course Resources and Tools. 
The existing course handouts section is moved underneath Course
Updates and News, with updated styling.

ECOM-2808
 2016-02-03 13:58:22 -05:00
Peter Fogg
786c4456ea Last-accessed courseware on the home page. 
ECOM-2806
 2016-02-03 13:58:22 -05:00
Matt Drayer
71a6779dfa Merge pull request #11138 from fghaas/no-video-if-unset 
lms: Only show welcome video if show_homepage_promo_video is set
 2016-02-03 13:08:31 -05:00
Ahsan Ulhaq
96d030b6d9 Reverse and Rename Courseware and Course Info Tabs 
ECOM-2678
 2016-02-03 12:20:53 -05:00
Hasnain
d275dd4a70 Added bok choy test for proctoring instructor dashboard 2016-02-03 10:48:55 -05:00
clrux
8a2d989369 Merge pull request #11247 from edx/clrux/ac-313-fixup 
CMS: Removing H1 and H2 from editor options; updating editor icons
 2016-02-03 09:28:44 -05:00