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

19706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
79815acc6e Fall back on MITX_FEATURES env variable if FEATURES isn't found 
For a smoother transition to the new world
 2013-12-03 16:29:48 -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
Ned Batchelder
e872c4f276 Merge pull request #1824 from edx/ned/show-full-diff-in-responsetype-tests 
Show full diffs in ResponseType tests.
 2013-12-03 11:34:19 -08:00
David Ormsbee
842355293d Merge pull request #1816 from edx/ormsbee/grading_tests 
Add basic tests of gradeset iteration.
 2013-12-03 11:24:00 -08:00
David Ormsbee
f10df353d2 Add basic tests of gradeset iteration. 2013-12-03 14:23:12 -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
Ned Batchelder
c62abeddb7 Merge branch 'release' 2013-12-03 13:20:29 -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
Ned Batchelder
6dac4b79d3 Merge pull request #1791 from cpennington/rebased-lti-graded 
BLD-384: Add grading to LTI module
 2013-11-26 14:07:55 -08: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
52ab2b1313 Make FieldDataCache use the user from scope_ids, rather than its pre-configured user 
Co-author: Ned Batchelder <ned@edx.org>
 2013-11-26 16:29:35 -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
Jason Bau
f94565d699 Merge pull request #1685 from edx/jbau/shopping-cart/report 
CSV Reporting of Shopping Cart Purchases, with tests
 2013-11-26 11:45:59 -08: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
Will Daly
3ed96f75a1 Merge pull request #1788 from edx/will/disable-caption-test-2 
Disabled another video test that failed in master
 2013-11-26 11:09:28 -08:00
Will Daly
761699bf74 Disabled another video test that failed in master 2013-11-26 14:01:58 -05:00
Brian Talbot
812c8210da Merge pull request #1778 from edx/talbs/studio-fix-italics 
Studio: FIX - Italicize in xmodule/block previews
 2013-11-26 09:59:56 -08:00
Brian Talbot
bff94de284 Studio: adding basic italicize text styling into xmodule/block preview UI 
STUD-963
 2013-11-26 12:21:55 -05:00
Brian Talbot
5a5c8c0eb5 Merge pull request #1779 from edx/talbs/fix-studio-notificationsie 
Studio: FIX - correcting hiding state of notification UI for < IE9
 2013-11-26 09:09:17 -08:00
Will Daly
88ccf85d42 Merge pull request #1786 from edx/will/disable-caption-test 
Disabled video caption tests that failed in master
 2013-11-26 09:08:51 -08:00
Will Daly
d00e5a4503 Disabled video caption tests that failed in master 2013-11-26 12:07:04 -05:00
Andy Armstrong
957175e3da Merge pull request #1773 from edx/andy/unitidentifier 
Changed unit identifier to be readonly, not disabled
 2013-11-26 08:23:27 -08:00