Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,866 Commits 1 Branch 0 Tags
62423ffb95ae1cbf7e8d26431eb7f61d3cffb4df
Commit Graph

38866 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Albert (AJ) St. Aubin
62423ffb95 Merge pull request #13719 from edx/christina/tnl-5737 
Corrected issue with the Show Hint button enabled state with single hint.
 2016-10-11 20:29:36 -04:00
Albert St. Aubin
088b5c6615 Corrected issue with the Show Hint button enabled state with single hint. 
TNL-5737
 2016-10-11 15:50:40 -04:00
alisan617
f8589e4df8 Merge pull request #13714 from edx/alisan/bookmark-btn-TNL5734 
Bookmarks button style fix
 2016-10-11 14:06:08 -04:00
alisan617
69b5a4adfc classname clash in uxpl shims TNL-5534 2016-10-11 12:51:01 -04:00
Nimisha Asthagiri
2112e7f8c8 Merge pull request #13659 from edx/common_cleanup/external_auth 
Moves external_auth from common to openedx/core
 2016-10-07 13:39:21 -04:00
Nimisha Asthagiri
84bdd8598b Merge pull request #13686 from edx/openedx_cleanup/misc 
Remove few LMS references from openedx/core
 2016-10-07 13:33:51 -04:00
Brian Beggs
8371e21b3c Merge pull request #13701 from edx/edx-django-release-util/0.1.2 
Change edx-django-release-util version.
 2016-10-07 13:30:12 -04:00
Nimisha Asthagiri
2b9e60ad17 Merge pull request #13691 from edx/common_cleanup/performance 
Move performance from common to openedx/core
 2016-10-07 13:25:51 -04:00
Nimisha Asthagiri
fd49f88e08 Moves external_auth from common to openedx/core. 2016-10-07 12:34:22 -04:00
alisan617
d7c841f80d Merge pull request #13703 from edx/alisan/capa-button-bar-label-minor-fix 
put display previously removed in capa space pr
 2016-10-07 11:46:19 -04:00
Brian Jacobel
bc66285b53 Merge pull request #13588 from edx/bjacobel/5555 
UX improvements to sequence nav
 2016-10-07 11:09:45 -04:00
Mushtaq Ali
23388588e7 Merge pull request #13564 from edx/mushtaq/video-transcript 
Handle when no video transcript uploaded for a language
 2016-10-07 20:08:25 +05:00
alisan617
e1f2072c42 put display previously removed in capa space pr 2016-10-07 10:32:05 -04:00
John Eskew
60294f2739 Updating edx-django-release-util requirement to version 0.1.2 2016-10-07 10:20:16 -04:00
Mushtaq Ali
11a07ca8c9 Show validation message when no transcript file uploaded for a language in a video component in studio. 
Also, don't show respective transcript language in video language menu when a related transcript is not uploaded for that language.

TNL-5200
 2016-10-07 19:15:44 +05:00
Nimisha Asthagiri
74912bc50d Merge pull request #13693 from edx/common_cleanup/geoinfo 
Move geoinfo from common to openedx/core
 2016-10-07 10:04:13 -04:00
Andy Armstrong
12ec1fffba Merge pull request #13668 from edx/andya/remove-empty-reverification-app 
Remove empty reverification Django app
 2016-10-07 09:51:28 -04:00
noraiz-anwar
0f3a146177 Merge pull request #13551 from noraiz-anwar/na/mathjax-fix 
Fix mathjax rendering
 2016-10-07 16:58:03 +05:00
Muhammad Ammar
07caef951f Merge pull request #13696 from edx/ammar/fix-attribute-access 
fix attribute access
 2016-10-07 16:10:50 +05:00
muhammad-ammar
aed1ea8028 fix attribute access 2016-10-07 12:14:32 +05:00
Nimisha Asthagiri
07801f3b96 Move performance from common to openedx/core 2016-10-07 00:39:39 -04:00
Nimisha Asthagiri
579145f0e1 Move geoinfo from common to openedx/core 2016-10-07 00:26:35 -04:00
Nimisha Asthagiri
7b365bcaa0 Move view_course_access functionality to sole caller lms/mobile_api. 2016-10-06 22:28:23 -04:00
Nimisha Asthagiri
9ae36152e8 Have core module use common's JsonResponse utility instead of LMS's. 2016-10-06 22:18:04 -04:00
Nimisha Asthagiri
15d9883f76 Create core/url_utils.py, moving utilities from lms_xblock/runtime 2016-10-06 21:59:11 -04:00
Christina Roberts
256223d07b Merge pull request #13052 from edx/alisan/capa-problem-button-bar-tnl4880 
Problem (capa) feedback rework
 2016-10-06 21:20:25 -04:00
Andy Armstrong
1da5572830 Merge pull request #13674 from edx/andya/move-i18n-tests 
Move i18n_tests from common into pavelib
 2016-10-06 20:17:55 -04:00
Andy Armstrong
9f08457c53 Merge pull request #13675 from edx/andy/move-service-status 
Move service_status from common into openedx
 2016-10-06 20:16:07 -04:00
Nimisha Asthagiri
8ebc4106f2 Merge pull request #13673 from edx/common_cleanup/cache_toolbox 
Move cache_toolbox from common to openedx/core
 2016-10-06 18:07:46 -04:00
muhammad-ammar
47280eddb6 support descriptons for multiple inputs group 
TNL-5403
 2016-10-06 17:36:04 -04:00
cahrens
1122c40f07 Moving ignore rules to relevant classes instead general rule. 
Also replaces section with div, updates short_id, and makes textbox accessible.

TNL-5576, TNL-5575, TNL-5574, TNL-5671, TNL-5376
 2016-10-06 17:35:54 -04:00
muhammad-ammar
c3b6b10478 Problem (capa) feedback UX revamp. 
TNL-4877
 2016-10-06 17:34:43 -04:00
Christina Roberts
432f6cdf0c Merge pull request #13680 from edx/christina/revert-capa-form 
Revert "single form element per capa problem"
 2016-10-06 17:18:48 -04:00
Nimisha Asthagiri
2c7975f804 Move cache_toolbox from common to openedx/core. 2016-10-06 16:57:00 -04:00
John Eskew
b27f8a29b5 Merge pull request #13671 from edx/jeskew/move_xmodule_django_to_openedx_core 
Move xmodule_django app to openedx.core.djangoapps
 2016-10-06 16:53:25 -04:00
Eric Fischer
aae9f9ccaa Merge pull request #13676 from edx/release-10-06-conflict 
Merge release to master
 2016-10-06 16:10:20 -04:00
cahrens
53a6edd032 Revert "single form element per capa problem" 
This reverts commit 943a3a5eb1.
 2016-10-06 16:00:19 -04:00
Nimisha Asthagiri
6073ea2e2e Merge pull request #13658 from edx/common_cleanup/auth_exchange 
Move auth_exchange from common to openedx/core
 2016-10-06 15:16:33 -04:00
John Eskew
3614eb2800 Move xmodule_django app to openedx.core.djangoapps 2016-10-06 14:50:40 -04:00
John Eskew
24d29be3f3 Merge pull request #13667 from edx/jeskew/move_monkey_patch 
Move monkey_patch to openedx.core.djangoapps.
 2016-10-06 14:32:35 -04:00
Eric Fischer
50d55bbad6 Merge branch 'release' into release-10-06-conflict 2016-10-06 14:25:47 -04:00
Eric Fischer
e24915d286 Revert "Merge pull request #13614 from edx/efischer/revert_grades" 
This reverts commit 9aa35cd8ad.
 2016-10-06 14:25:27 -04:00
Andy Armstrong
a63bb0e50f Merge pull request #13664 from edx/andya/common-refactoring 
Move pipeline_js Django app into CMS
 2016-10-06 14:24:45 -04:00
Eric Fischer
80cbb59fce Merge pull request #13655 from edx/hotfix-2016-10-06 
Break early if max_score is not defined
 2016-10-06 14:22:19 -04:00
Andy Armstrong
a75f64b6c0 Move service_status from common into openedx 2016-10-06 13:37:35 -04:00
Andy Armstrong
6d0136fea9 Move i18n_tests from common into pavelib 2016-10-06 13:28:46 -04:00
Ned Batchelder
f0550b15f3 Merge pull request #13670 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-10-06 13:07:11 -04:00
Nimisha Asthagiri
4c0f85b4d9 Move auth_exchange from common to openedx/core. 
Move oauth_dispatch from lms to openedx/core.
 2016-10-06 12:54:39 -04:00
Nimisha Asthagiri
4bb8810957 Merge pull request #13660 from edx/common_cleanup/student_grades 
Move get_grades management command from student to grades app
 2016-10-06 12:40:06 -04:00
Andy Armstrong
0f18b740c8 Move pipeline_js Django app into CMS 
Note: this used to be in common, but it was only used in Studio.
 2016-10-06 12:08:04 -04:00