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

6993 Commits

Author SHA1 Message Date
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
David Baumgold
e26fc08d2b Update logging.getLogger() calls to use edx instead of mitx 2013-12-04 15:18:15 -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
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
Greg Price
81798dd8be Improve accessibility of inline discussions 
The show/hide toggle now properly acts like a button, and focus is now
trapped on the loading element for both the show/hide action and loading
of a new page.
 2013-11-26 14:12:34 -05:00
Greg Price
a0fa9d0b14 Refactor keypress activation for forum buttons 
This removes the use of the space key to activate buttons, which is not
expected behavior.
 2013-11-26 14:12:34 -05:00
Don Mitchell
7f91ce40ae Restful api for course advanced settings 
STUD-948
 2013-11-26 10:17:52 -05:00
zubair-arbi
18f342c076 Merge pull request #1781 from zubair-arbi/zub/bugfix/std979-displaynameclashes 
Fix unique vertical url + add test
 2013-11-26 06:26:57 -08:00
Zubair Afzal
829cd7d861 Fix unique vertical url + add test 
STUD-979
 2013-11-26 14:30:17 +05:00
Carson Gee
3ad705cd16 Removing external_auth addition to cms, and skipping test 2013-11-25 17:08:18 -05:00
Julia Hansbrough
e4ebb586e8 Update mode appropriately when user enrolls 
The "mode" was remaining unchanged when a student unenrolled & re-enrolled in a course--i.e., someone who was verified when first registering would still be verified when unenrolling and re-registering in audit mode.  This commit fixes this problem.

LMS-1526
 2013-11-25 21:20:15 +00:00
Carson Gee
bf9ac26a06 Corrected CMS tests so that one is passing, added external_auth to cms apps 
Several pylint fixes and bad super call
 2013-11-25 15:30:36 -05:00
Ned Batchelder
368c5758a5 Fix CHANGELOG conflicts again. 2013-11-25 15:01:26 -05:00
Ned Batchelder
9a106a32d5 Merged master to rc/2013-11-21 2013-11-25 14:56:09 -05:00
Will Daly
bf94083d2c Revert PR 1711; disabling JS tests again 2013-11-25 14:50:40 -05:00
cahrens
b5d72a38d3 Updates from code review. Includes backing out the 
"as_published" changes I previously put in, as now we
are not adding @draft to locations converted from locators.
 2013-11-25 13:55:33 -05:00
cahrens
50128cfb5c Convert edit_subsection, edit_unit, and publishing to RESTful URLs. 
STUD-844
 2013-11-25 13:55:33 -05:00
Valera Rozuvan
ace8df3916 Turned back on several Video Jasmine tests. 
BLD-463
 2013-11-25 20:22:53 +02:00
Carson Gee
96c7cb5ffd Added tests for signup skipping 2013-11-25 13:06:28 -05:00
Greg Price
3f0f7fa3d4 Merge pull request #1752 from edx/gprice/inline-discussion-error-recovery 
Add error recovery to inline discussion loading
 2013-11-25 10:05:53 -08:00
Carson Gee
0f324baaca Fixed PEP8 and indentation issues 2013-11-25 11:16:06 -05:00
Carson Gee
5d066db1bf Add feature to do auto signup with external auth 
This adds a feature flag: AUTH_USE_MIT_CERTIFICATES_IMMEDIATE_SIGNUP
that does an automatic signup of users if they are using external authentcation.
 2013-11-25 11:16:06 -05:00
Diana Huang
7a56e00d53 Merge pull request #1604 from edx/jarv/verified-certs 
Jarv/verified certs
 2013-11-25 07:37:13 -08:00
Calen Pennington
329419696e Merge pull request #1746 from cpennington/fix-lms-1532 
Fix LMS-1532 (partially instantiated XModules after an exception)
 2013-11-22 10:01:43 -08:00