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

40453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
294bbe7fe0 Test speedup: Monkey patch Kombu entrypoints fn. 
We monkey patch Kombu's entrypoints listing because scanning through
this accounts for the majority of LMS/Studio startup time for tests,
and we don't use custom Kombu serializers (which is what this is for).
Still, this is pretty evil, and should be taken out when we update
Celery to the next version where it looks like this method of custom
serialization has been removed.

FWIW, this is identical behavior to what happens in Kombu if
pkg_resources isn't available.
 2017-03-14 13:45:40 -04:00
Ned Batchelder
23c1ee3231 Merge pull request #14679 from edx/nedbat/flexible-help-link-tests 
HelpContextProcessorTest improvements from the Ficus branch.
 2017-03-14 10:20:57 -04:00
Mushtaq Ali
40621b6cc2 Merge pull request #14315 from edx/mushtaq/move-component 
Move a component
 2017-03-14 12:58:20 +05:00
Ned Batchelder
5e5f0c170e The exact version differs by open edx release 
(cherry picked from commit 1c7f35d44a68010f3dd9110061e9ecc55a641043)
 2017-03-13 14:13:55 -04:00
Ned Batchelder
fa5e286236 Simplify HelpContextProcessorTest a little 
(cherry picked from commit acee7b55aff0c73c08552199c536d84555bcaae4)
 2017-03-13 13:21:46 -04:00
Albert (AJ) St. Aubin
be0fad1b4b Merge pull request #14662 from edx/aj/TNL-6356_show_answer_notification 
Updates to add a show answer notification and update focus when the
 2017-03-13 13:00:31 -04:00
Jeremy Bowman
54d9bbd848 Merge pull request #14635 from edx/jmbowman/async_course_export_2 
PLAT-1121 Export courses asynchronously
 2017-03-13 11:34:59 -04:00
Albert St. Aubin
b4956cf1cb Updates to add a show answer notification and update focus when the notification is shown. 
TNL-6356
 2017-03-13 09:31:40 -04:00
Jeremy Bowman
8d36c3825c PLAT-1121 Export courses asynchronously 2017-03-13 09:00:11 -04:00
Saleem Latif
d40e8c05e8 Merge pull request #14660 from edx/saleem-latif/ENT-232 
ENT-232: Add a switch for selecting pagination traversal in edx_api_utils
 2017-03-13 16:57:25 +05:00
Saleem Latif
381d136a06 Add a switch for selecting pagination traversal in edx_api_utils 2017-03-13 16:03:34 +05:00
Mushtaq Ali
7ab699bce6 Merge pull request #14659 from edx/mushtaq/remove-banner-logging 
Remove success banner on container state change
 2017-03-13 12:08:24 +05:00
Clinton Blackburn
4cc7628696 Upgraded to Python Social Auth 0.2.21 to resolve migration issue 2017-03-10 23:06:02 -05:00
Simon Chen
5cd3a86382 Merge pull request #14668 from edx/schen/add_logging 
Add logging for user cookie send for sailthru
 2017-03-10 13:29:40 -05:00
Simon Chen
764ef48332 Add logging for user cookie send for sailthru 2017-03-10 10:10:37 -05:00
Mushtaq Ali
cb2d78bf34 Add logging on move xblock 
Add i18n to backend error messages in case they appear to end user
Remove success banner when trying to publish or discard changes on container page
 2017-03-10 19:25:03 +05:00
Jillian Vogel
36be4b2499 Merge pull request #14631 from open-craft/jill/ent-204-consent-wiki-forums 
[ENT-204] Require data sharing consent before accessing forum and wiki
 2017-03-10 12:09:23 +10:30
Jillian Vogel
25383a603e Ensure Enterprise-integrated courses require user consent before granting access to Wiki and Discussion forum. 
* User-facing links are gated; internal services are not.
* Adds view decorator data_sharing_consent_required
* Renames `get_course_specific_consent_url` to `get_enterprise_consent_url`,
  which now checks `consent_needed_for_course` before returning a consent URL.
 2017-03-10 09:29:24 +10:30
Cliff Dyer
27dc58464b Merge pull request #14639 from edx/neem/scorable-xblock 
Make instructor_tasks aware of ScorableXBlockMixin
 2017-03-09 17:08:47 -05:00
J. Cliff Dyer
21b224ec59 Give instructor task knowledge of new rescore. 
* Bump xblock version
* Update rescore instructor task helper to handle generic rescore.
* Add set_score to grade signal handler.
 2017-03-09 14:59:06 -05:00
Ned Batchelder
7d7f17a3b3 Merge pull request #14663 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-03-09 14:03:09 -05:00
Brian Jacobel
6eda14e72e Merge pull request #14629 from edx/bjacobel/bourbon-warnings 
Quiet Bourbon deprecation warnings, UXPL upgrade 0.18.1
 2017-03-09 12:42:18 -05:00
Ned Batchelder
9d9266f1c5 Update translations (autogenerated message) 2017-03-09 16:17:10 +00:00
Albert (AJ) St. Aubin
ee68726bf2 Merge pull request #14655 from edx/aj/fix_cms_style_bug 
Update to Studio style for recent capa action bar style changes
 2017-03-09 08:42:15 -05:00
Ned Batchelder
15a4fc420a Update translations (autogenerated message) 2017-03-09 12:08:25 +00:00
Rabia Iftikhar
687a48c71d Merge pull request #14624 from edx/ri/TNL-6610-fix-more-button 
TNl-6610 Fix "more" menu on discussion post for global staff.
 2017-03-09 16:41:09 +05:00
rabiaiftikhar
ccfa3ea74d TNl-6610 Fix "more" menu on discussion post for global staff. 2017-03-09 14:16:31 +05:00
Mushtaq Ali
3a9dc5de04 Merge pull request #14625 from edx/mushtaq/bug-bash-fixes 
Move Bug fixes
 2017-03-09 11:36:55 +05:00
Calen Pennington
0c30c06a78 Merge pull request #14656 from edx/release-mergeback-to-master 
Merge release back to master
 2017-03-08 15:23:50 -05:00
Albert St. Aubin
86e202c5ab Update to Studio style for recent capa action bar style changes 2017-03-08 14:23:19 -05:00
Albert (AJ) St. Aubin
22f58606af Merge pull request #14564 from edx/aj/TNL-6347_headers 
Aj/tnl 6347 headers
 2017-03-08 13:27:40 -05:00
Nimisha Asthagiri
1224e341de Revert "Merge pull request #14588 from edx/efischer/kill_stuff" 
This reverts commit 83f2be4929, reversing
changes made to 01ed17426f.
 2017-03-08 13:10:48 -05:00
Noraiz Anwar
b69b586401 Merge pull request #14601 from edx/noraiz/ECOM-6939 
ECOM-6939 Fixed social auth false password-validation error
 2017-03-08 22:15:46 +05:00
Albert St. Aubin
7c7c27183f changes header levels for a11y 
TNL-6347
 2017-03-08 11:45:45 -05:00
Albert (AJ) St. Aubin
b168b04a20 Merge pull request #14640 from edx/aj/TNL-6620_action_style 
Updating the notification to remove overlap of action bar buttons
 2017-03-08 10:27:27 -05:00
noraiz-anwar
1c0ccb2f61 ECOM-6939 Fixed social auth false password-validation error (adding form field) 2017-03-08 20:16:21 +05:00
Ahsan Ulhaq
e51c692ef8 Merge pull request #14570 from edx/ahsan/ECOM-6463-login-should-not-point-asset-new 
login should not point asset new
 2017-03-08 18:26:07 +05:00
Mushtaq Ali
e83bee65bd Fixed Backend: Move component directly to content experiment level (component will now be the sibling of groups) 
Fixed Move button is disabled when moving components inside conditional module

Fixed When navigating upward/backward, target parent is not set correct, resulting source to be moved in the previously selected parent
 2017-03-08 16:48:52 +05:00
Clinton Blackburn
078974d24a Disabled search for Docker-based devstack 
This feature is not well-documented, so it is unclear how to setup Elasticsearch properly to make it work. The next person who needs to work on this feature will need to make it work and, ideally, document it.
 2017-03-07 21:21:49 -05:00
Brian Mesick
8caa4c56d6 Merge pull request #14619 from edx/bmedx/user-task-email 
PLAT-1075 - Send email async upon completed django-user-tasks
 2017-03-07 14:32:53 -05:00
alisan617
60787393ec change to comlete flex layout 2017-03-07 13:48:46 -05:00
Calen Pennington
4bd13a6e34 Merge pull request #14650 from edx/release-mergeback-to-master 
Merge release back to master
 2017-03-07 13:02:30 -05:00
Ahsan Ulhaq
7712bf3151 edx.org/login?next= should not be able to point to an asset 
ECOM-6463
 2017-03-07 22:17:50 +05:00
Awais Jibran
af76401b23 Discussion Selector fixes. TNL-6648 2017-03-07 08:50:39 -05:00
Attiya Ishaque
df73474c5c Merge pull request #14645 from edx/aj/discussion-fixes 
Discussion Selector fixes.
 2017-03-07 18:29:27 +05:00
M. Rehan
9351600c73 Merge pull request #14594 from edx/mrehan/duplicate-video-id-in-basic-tab 
TNL-6489 – duplicate video id in basic tab
 2017-03-07 18:03:21 +05:00
Awais Jibran
9c0f72d516 Discussion Selector fixes. TNL-6648 2017-03-07 17:08:51 +05:00
Qubad786
f064e991bf duplicate video id in basic tab 2017-03-07 15:33:33 +05:00
Ahsan Ulhaq
8688edaf4f Merge pull request #14595 from edx/ahsan/ECOM-7312-lms-user-menu-dropdown-a11y-issues 
LMS user menu dropdown a11y issues
 2017-03-07 15:12:05 +05:00
Eric Fischer
7ad0e27d23 Merge pull request #14641 from edx/efischer/masquerade_progress 
Allow masquerade on progress page
 2017-03-06 21:03:22 -05:00