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

38830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ned Batchelder
4fe01bfb88 Update translations (autogenerated message) 2016-10-06 14:35:43 +00: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
42f8b4a2ce Merge pull request #13422 from edx/ammar/tnl-5402-single-form-per-problem 
single form element per capa problem
 2016-10-06 18:01:53 +05:00
muhammad-ammar
943a3a5eb1 single form element per capa problem 
TNL-5402
 2016-10-06 14:27:39 +05:00
Andy Armstrong
dda92d1319 Merge pull request #13518 from edx/andya/proctoring-verification-step 
Introduce id verification step for proctored exams
 2016-10-05 18:29:01 -04: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
Jesse Shapiro
22c42dbf78 Merge pull request #13602 from open-craft/haikuginger/deprecate-dnd-v1 
[SOL-1612] Add DnDv2 to advanced problems; relabel DnDv1 as deprecated
 2016-10-05 15:28:50 -04:00
Marko Jevtić
1e1b7e1ad3 Merge pull request #13648 from edx/mjevtic/TNL-5709 
[TNL-5709] Mark a test as flaky
 2016-10-05 19:55:12 +02: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
Adam
6043fcb195 Merge pull request #13647 from edx/hotfix/2016-10-05 
Hotfix: Revert "Fix Gating to use grades API, instead of its own calculations"
 2016-10-05 10:32:20 -04:00
Jesse Shapiro
47d18c35fe Add DnDv2 to advanced problems; relabel DnDv1 as deprecated 2016-10-05 09:22:35 -04:00
Marko Jevtic
5d128f32ee [TNL-5709] Mark a test as flaky 2016-10-05 10:45:14 +00:00
Muddasser
c943d42b7d Merge pull request #13566 from edx/muddasser/help/cohort 
cohort help tests
 2016-10-05 12:33:31 +05: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
Cliff Dyer
bd38ed2645 Merge pull request #13620 from edx/cdyer/flakies-2016-09-30 
Flaky test annotations 2016
 2016-10-04 17:03:24 -04:00
alisan617
a0a46c461e add new unit page title TNL-5623 
new bookmark button placement and look TNL-5625
 2016-10-04 16:51:34 -04:00
Christina Roberts
ddce329118 Merge pull request #13629 from ubc/fix-OpenSeaDragonAnnotation 
Fix the wrong target.src for annotations
 2016-10-04 14:41:42 -04:00
Adam
75772d2084 Merge pull request #13616 from edx/rc/2016-10-04 
Release Candidate rc/2016-10-04
 2016-10-04 10:06:58 -04:00
Muzaffar yousaf
29061fcd97 Merge pull request #13528 from edx/mushtaq/fix-flaky-edxnotes-test 
Fix flaky test test_easy_access_from_notes_page
 2016-10-04 16:02:35 +05:00
Mushtaq Ali
0abd2fce81 Increase connect & read timeout to fix flaky test test_easy_access_from_notes_page. 
TNL-4590
 2016-10-04 14:52:41 +05:00
Muddasser
cde90fd120 cohort help tests 2016-10-04 06:51:50 +00:00