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

7013 Commits

Author SHA1 Message Date
David Baumgold
2666b96976 Change mitx.db to edx.db for dev sqlite 2013-12-06 11:21:19 -05:00
Don Mitchell
39f4cb806c Merge pull request #1832 from edx/dhm/publish 
SplitMongo publish method
 2013-12-05 13:34:38 -08:00
David Baumgold
effee03bd7 Merge pull request #1867 from edx/db/update-factory-boy 
Update factory_boy to 2.2.1
 2013-12-05 13:22:22 -08:00
Don Mitchell
43789a9252 Fixed test to ensure deletion on publish 2013-12-05 16:15:19 -05:00
Don Mitchell
7a4204b72a SplitMongo publish method 
STUD-451
 2013-12-05 16:15:19 -05:00
David Baumgold
d15391fdfa Update factory_boy to 2.2.1 2013-12-05 15:50:49 -05:00
Ned Batchelder
1cbc171616 Merge master in prep for merging back the hotfix changes. 2013-12-05 15:48:49 -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
Greg Price
88610cb8fb Change forum role granted to staff on enrollment 
This applies to global staff (is_staff=True), not course staff.
Previously, staff were granted the Moderator role but not the Student
role upon enrolling in a course. If the Moderator role were later
revoked, then the user would have no role and be unable to post in the
forums, which is confusing for the user. edX staff indicated they would
prefer to not automatically receive the Moderator role, so the Student
role is granted instead. Note that staff will still be able to grant
themselves Moderator privileges through the instructor dashboard if
they wish.

JIRA: FOR-338
 2013-12-05 12:54:12 -05:00
Adam
f7d86bfff5 Merge pull request #1814 from edx/adam/fix-ora-typo 
fix typo in ORA template (ORA-136)
 2013-12-05 07:37:52 -08:00
Alexander Kryklia
bceadd4830 Merge pull request #1819 from edx/anton/fix-lti-scores 
Fix LTI max_score method.
 2013-12-05 02:40:19 -08: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
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
David Baumgold
e26fc08d2b Update logging.getLogger() calls to use edx instead of mitx 2013-12-04 15:18:15 -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
David Baumgold
b32f2bc170 MITX_ROOT_URL => EDX_ROOT_URL 2013-12-04 12:59:35 -05:00
David Baumgold
1a585a88a9 Merge pull request #1833 from edx/db/mitx_markdown-edx_markdown 
mitx_markdown => edx_markdown
 2013-12-04 09:58:50 -08:00
zubair-arbi
5347923304 Merge pull request #1829 from zubair-arbi/zub/bugfix/std1008-disablepeertrackchanges 
Disable Peer Track Changes
 2013-12-04 08:04:33 -08:00
David Baumgold
6af8ecef03 mitx_markdown => edx_markdown 2013-12-04 10:23:47 -05:00
Zubair Afzal
5dba3fb47a Disable Peer Track Changes 
STUD-1008
 2013-12-04 16:43:17 +05:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
David Baumgold
69899e24df Merge pull request #1823 from edx/db/mitxmako-edxmako 
mitxmako => edxmako
 2013-12-03 11:36:50 -08:00
Adam Palay
c812c5509a fix typo in ORA template (ORA-136) 2013-12-03 14:35:20 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
Ned Batchelder
599bdbb102 Show full diffs in ResponseType tests. 2013-12-03 14:05:33 -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
Александр
1cd9325ef5 Fix LTI tests. 2013-12-03 19:04:21 +02:00
Александр
932d13ede8 Make has_score to be XField insted of decriptor property. 2013-12-03 17:48:27 +02: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
2088a2159e Add min value. 2013-12-03 13:41:51 +02:00
polesye
8a180744ed Fix LTI max_score method. 2013-12-03 12:50:16 +02: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
polesye
8f01387178 BLD-525: Fix Numerical input to support mathematical operations. 2013-12-02 17:47:20 +02:00
Ned Batchelder
c8a7b259ff Resolve conflicts merging master to rc/2013-11-21 2013-11-27 11:55:44 -05:00
Jay Zoldak
6614d7e9bb Add migration to remove pearson tables 2013-11-26 17:04:19 -05:00
Jay Zoldak
a56b9457a0 Rebase to re-prepare PR 2013-11-26 17:04:19 -05:00
Jay Zoldak
341875bb18 Remove code related to Pearson Testing Centers 2013-11-26 17:04:19 -05:00
Calen Pennington
11bbf4c182 Add grading functionality to LTI xmodule 
Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
[BLD-384]
 2013-11-26 16:30:55 -05:00
Calen Pennington
1205173d6f Add a per-course anonymous student id 
This does not yet replace the existing per-student anonymous id, but
is intended to do so in the future.

Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
 2013-11-26 16:29:35 -05:00
Calen Pennington
9b6edea406 Rename the LTIModuleDescriptor to LTIDescriptor to follow convention 2013-11-26 16:29:34 -05:00
Calen Pennington
6d613f9d4e Enable un-authenticated handler urls 
Updates to depend on the latest version of XBlock, which includes
support for service-to-service (thirdparty) handler urls, which aren't
authenticated with a user (unlike handler requests coming from the
xblock client-side javascript).

Co-author: Ned Batchelder <ned@edx.org>
 2013-11-26 16:29:34 -05:00