Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,726 Commits 1 Branch 0 Tags
aba25c2de7dbb8ec60c276bacf9dcd8019da7c26
Commit Graph

19726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Waheed Ahmed
aba25c2de7 In OpenEndedModule latest_score and all_score calculate sum of rubric scores every time for ML grading. 
ORA-72
 2013-12-10 11:17:44 -05:00
Don Mitchell
7e4820af52 Reduce sql queries for groupname tests. (STUD-1039) 
Conflicts:
	cms/djangoapps/auth/authz.py
 2013-12-10 11:17:23 -05:00
John Jarvis
ddc45ea5bf Merge pull request #1821 from edx/rc/2013-12-03 
rc/2013 12 03
 2013-12-09 07:42:35 -08:00
Ned Batchelder
faa8f16fff Merge pull request #1877 from edx/ned/hotfix-2013-12-04-with-temp-stuff-removed 
Update 12/3 RC branch with the part of the hotfix we want permanently.
 2013-12-06 07:49:46 -08:00
Ned Batchelder
85495bb5d1 Merge pull request #1864 from edx/adam/add-all-clear-message 
add all clear message
 2013-12-05 12:43:21 -08:00
Adam Palay
76c8a7a38d add all clear message 2013-12-05 14:57:36 -05:00
Ned Batchelder
be3ab1c5e9 Drop the temp table 2013-12-05 14:56:30 -05:00
Ned Batchelder
108e02e1ed Remove the one-time-use managemant command. 2013-12-05 14:41:30 -05:00
Ned Batchelder
f1f0111648 Merge pull request #1860 from edx/hotfix/no-error-messages 
removes temporary error messages
 2013-12-05 10:01:18 -08:00
Adam Palay
9d48bb0ef1 removes temporary error messages 2013-12-05 12:08:39 -05:00
Calen Pennington
72bb0f8cab Merge pull request #1854 from cpennington/wording-fixes 
modify partial recovery message
 2013-12-04 18:35:39 -08:00
Adam Palay
a458b469d1 modify partial recovery message 2013-12-04 21:26:45 -05:00
Ned Batchelder
326d9dbeac Merge pull request #1851 from edx/ned/merge-lti-hotfix 
Ned/merge lti hotfix
 2013-12-04 13:48:22 -08:00
Ned Batchelder
3118a5de1b Merge pull request #1852 from cpennington/more-db-error-fixes 
Add recovery command
 2013-12-04 13:46:56 -08:00
Calen Pennington
b9926a2fd3 Add message explaining partial recovery 2013-12-04 16:42:57 -05:00
Calen Pennington
e561c1354d Add managemant command to generate sql to clean up tp truncated student ids in ORA db 2013-12-04 16:18:40 -05:00
Adam Palay
4d506016e7 Add a backwards migration to delete the archive table 2013-12-04 16:07:43 -05:00
Александр
e96108629d Fix LTI tests. 2013-12-04 15:55:47 -05:00
Александр
c4515faedf Make has_score to be XField insted of decriptor property. 
Conflicts:
	common/lib/xmodule/xmodule/lti_module.py
 2013-12-04 15:55:42 -05:00
polesye
e4403815e7 Fix LTI max_score method. 2013-12-04 15:54:51 -05:00
Ned Batchelder
c7ac4100ff Merge pull request #1840 from edx/adam/db-error 
Fixes to database columns
 2013-12-04 12:07:07 -08:00
Ned Batchelder
19c6b8564d Merge pull request #1842 from edx/hotfix/error-msg-ORA-panel 
adds more temporary error messages
 2013-12-04 11:34:07 -08:00
Adam Palay
175e1aab9e adds more temporary error messages 2013-12-04 14:30:09 -05:00
Ned Batchelder
83c6a72051 Merge pull request #1841 from edx/hotfix/error-msg-ORA-panel 
Hotfix/error msg ora panel
 2013-12-04 11:12:55 -08:00
Adam Palay
eb23b65992 add temporary error message for ORA panel 2013-12-04 14:10:47 -05:00
Calen Pennington
838622f5bd Handle integrity errors when creating/retrieving AnonymousUserId entries 2013-12-04 13:56:53 -05:00
Adam Palay
7171397d95 extend max_length of anonymous_user_id (LMS-1571) 2013-12-04 13:56:53 -05:00
Zubair Afzal
050031f7d5 Disable Peer Track Changes 
STUD-1008
 2013-12-04 11:21:38 -05:00
cahrens
dd5ac4cf34 Change video transcripts to use locators instead of locations. 
Part of STUD-870
 2013-12-04 11:21:19 -05:00
polesye
e0f2ece2f2 Merge pull request #1820 from edx/anton/fix-lti-display-name 
LTI: Add display name.
 2013-12-03 09:36:30 -08:00
polesye
41d82dfcc1 BLD-542: Add display name. 2013-12-03 17:21:04 +02:00
polesye
29e3a03db5 Merge pull request #1810 from edx/anton/fix-math-operations-in-numerical-input 
Fix Numerical input to support mathematical operations.
 2013-12-03 07:18:54 -08:00
brianhw
c8adbe3895 Merge pull request #1182 from carsongee/add_mitx_ssl_bypass_signup 
Add feature to do auto signup with external auth
 2013-12-03 07:03:43 -08:00
polesye
78149d0ae4 Add comment. 2013-12-03 09:08:44 +02:00
Greg Price
62a25824df Merge pull request #1765 from edx/gprice/inline-discussion-a11y 
Improve accessibility of inline discussions
 2013-12-02 15:12:19 -08:00
Ned Batchelder
ddb2483367 Update the XBlock version. 2013-12-02 15:48:05 -05:00
Don Mitchell
7fa7641c0a Merge pull request #1799 from edx/dhm/bug-1003 
Improve auth handling of Locators
 2013-12-02 12:42:51 -08:00
Don Mitchell
9dc68b03a0 Improve auth handling of Locators 
Ensure user admin screen gets the union of all possibly matching group names.
Smarter default group naming.
STUD-1003
 2013-12-02 15:28:22 -05:00
polesye
8f01387178 BLD-525: Fix Numerical input to support mathematical operations. 2013-12-02 17:47:20 +02:00
polesye
45d373c278 Merge pull request #1798 from edx/anton/calculator-hint-a11y 
Improve calculator's tooltip accessibility.
 2013-12-02 01:47:09 -08:00
polesye
0dbb7603fb BLD-533: Improve calculator's tooltip accessibility. 2013-12-02 09:56:24 +02:00
Valera Rozuvan
ef528494ab Merge pull request #1797 from edx/valera/enable_acceptance_video 
Enabled back turned off tests.
 2013-11-29 01:23:15 -08:00
Valera Rozuvan
d75b580f8f Enabled back turned off Video acceptance tests. 
Updated comments.

BLD-537
 2013-11-29 10:53:31 +02:00
Ned Batchelder
39b29dcb65 Merge pull request #1802 from edx/ned/merge-master-to-rc-2013-11-21-again 
Merged master to rc/2013-11-21, so we can merge it back to master.
 2013-11-27 10:18:01 -08:00
Ned Batchelder
c8a7b259ff Resolve conflicts merging master to rc/2013-11-21 2013-11-27 11:55:44 -05:00
Julia Hansbrough
3e3a57f5cd Merge pull request #1774 from edx/flowerhack/refund-requested-date 
Added refund datetime info to Orders, OrderItems
 2013-11-27 07:35:23 -08:00
Julia Hansbrough
30cd57f539 New migrations file 2013-11-27 15:16:25 +00:00
Julia Hansbrough
280e3c3856 Merge conflicts 2013-11-27 14:43:16 +00:00
vagrant
006b8f8298 Removed old migration 2013-11-27 14:38:59 +00:00
Jay Zoldak
bb3917fa1d Merge pull request #1299 from edx/zoldak/remove-pearson-code 
Remove code related to Pearson Testing Centers
 2013-11-27 04:35:30 -08:00