Commit Graph

15104 Commits

Author SHA1 Message Date
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
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
Brian Jacobel
bc66285b53 Merge pull request #13588 from edx/bjacobel/5555
UX improvements to sequence nav
2016-10-07 11:09:45 -04: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
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
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
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
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
a75f64b6c0 Move service_status from common into openedx 2016-10-06 13:37:35 -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
Ned Batchelder
4fe01bfb88 Update translations (autogenerated message) 2016-10-06 14:35:43 +00:00
Andy Armstrong
96a572dded Remove empty reverification Django app 2016-10-06 10:35:08 -04:00
Nimisha Asthagiri
406daa513b Move get_grades management command from student to grades app. 2016-10-06 10:34:24 -04:00
J. Cliff Dyer
fb38488083 Revert "Move student_account templates into app."
This reverts commit 4dc744b104.
2016-10-06 10:31:09 -04:00
J. Cliff Dyer
4dc744b104 Move student_account templates into app. 2016-10-06 10:29:42 -04:00
John Eskew
fab11b90d7 Move monkey_patch to openedx.core.djangoapps. 2016-10-06 10:16:14 -04:00
sanfordstudent
1db70deb92 Merge pull request #13643 from edx/sstudent/TNL-5310
SQL model for course grades
2016-10-06 09:49:41 -04:00
Eric Fischer
7be2093edb Break early if max_score is not defined
Some XModules are breaking their contracts and defining has_score but not
max_score.

TNL-5715
2016-10-06 09:15:14 -04:00
muhammad-ammar
943a3a5eb1 single form element per capa problem
TNL-5402
2016-10-06 14:27:39 +05:00
Andy Armstrong
ecf4515b6e Introduce id verification step for proctored exams
TNL-5083
2016-10-05 17:22:35 -04:00
Jesse Zoldak
ce1eb237d1 Merge pull request #13651 from edx/revert-13483-itsjeyd/inline-discussion-assets
Revert "Have DiscussionXBlock take care of loading assets it depends on"
2016-10-05 17:20:56 -04:00
Sanford Student
9d71ac2ecf SQL model for course grades
Includes unit tests
For TNL-5310
2016-10-05 15:45:54 -04:00
Brian Jacobel
8b0b4f5ce2 Redesign sequence nav, move breadcrumbs out of sequence container
TNL-5555
2016-10-05 13:39:27 -04:00
Eric Fischer
caef3fe86c Merge pull request #13635 from edx/efischer/tnl-5698
Persistent Grades Flag multiple entries per course
2016-10-05 13:06:22 -04:00
alisan617
66ea22cab6 Merge pull request #13587 from edx/alisan/bookmark-btn-TNl-5625-unit-title-TNL-5623
add new unit title and renew bookmark button
2016-10-05 12:53:40 -04:00
Jesse Zoldak
dbab855742 Revert "Have DiscussionXBlock take care of loading assets it depends on" 2016-10-05 12:37:12 -04:00
Eric Fischer
78075d8bf6 Persistent Grades Flag multiple entries per course
With this change, it is now possible to enable and disable the feature for a
particular course as many times as desired. Fix confirmed locally.

TNL-5698
2016-10-05 11:35:13 -04:00
Nimisha Asthagiri
99ce254b15 Fix import required by downstream commit. 2016-10-05 01:25:57 -04:00
Brian Beggs
9ec45e8ed7 Merge pull request #13499 from mitocw/blarghmatey/update_compute_grades_command
Updated `compute_grades` command for Django 1.8
2016-10-04 18:38:43 -04:00
J. Cliff Dyer
62042188f5 Revert "Fix Gating to use grades API, instead of its own calculations"
This reverts commit 318121411a.
2016-10-04 17:19:30 -04:00