Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

7928 Commits

Author SHA1 Message Date
Andy Armstrong
9db8b4979c Merge pull request #2175 from edx/andya/typo 
Fix typo in the announcement template
 2014-01-15 06:59:12 -08:00
Waheed Ahmed
b98f4e0229 JSON serialization error fixed and added test for it. 
ORA-195
 2014-01-15 19:47:45 +05:00
polesye
1347645ef0 BLD-434: Add fix for negative exponents. 
Set default tolerance to 1e-3% for all responsetypes.
 2014-01-15 13:17:05 +02:00
Alexander Kryklia
cbe97d6fe6 Merge pull request #1948 from edx/anton/allow-arbitrary-regex-in-stringresponse 
Anton/allow arbitrary regex in stringresponse
 2014-01-15 03:15:43 -08:00
polesye
ee1953b37a BLD-474: Allow multiple answers for string response. 2014-01-15 12:51:24 +02:00
Andy Armstrong
4436ad9aca Fix typo in the announcement template 2014-01-14 18:33:56 -05:00
Don Mitchell
13a04927f8 Encode periods and $ in block_id map 
STUD-872
 2014-01-14 14:43:31 -05:00
Calen Pennington
a55724d117 Prevent unicode data from being injected into a Location using the _replace function 2014-01-14 13:28:49 -05:00
Calen Pennington
46109bb3e8 Use XBlock xml serialization and deserialization 
XModules continue to use their own interface for xml, but provide an
adaptor that makes the the XBlock interface available.

[LMS-179]
 2014-01-14 13:28:47 -05:00
Ned Batchelder
566bb16220 Implement InheritanceFieldData 2014-01-14 13:09:36 -05:00
Ned Batchelder
1932c126b8 Rename DbModel to KvsFieldData. 2014-01-14 13:09:36 -05:00
Ned Batchelder
679f1d68fc Remove unused things. 2014-01-14 13:09:36 -05:00
Ned Batchelder
b6bd293266 Clean up some pre-existing formatting. 2014-01-14 13:09:35 -05:00
Chris Rossi
831f907c79 Add individual due dates feature. 
Adds a feature to the edX platform which allows instructors to set
individual due dates for students on particular coursework. This code is
meant primarily for on-campus use--it is not intended that this feature
would be used for MOOCs. It adds a new tab, "Extensions", to the beta
instructor dashboard which allows changing due dates per student. This
feature is enabled by setting FEATURES['INDIVIDUAL_DUE_DATES'] = True.
 2014-01-14 10:19:02 -05:00
Will Daly
60a56c4876 Disabled video updateplaytime JS test 2014-01-13 16:47:08 -05:00
Will Daly
3f126ac46c Disabled video start and end time test 2014-01-13 13:37:58 -05:00
Christina Roberts
6c49e0db14 Merge pull request #2105 from edx/christina/reorder-privates 
Fix bug about draft verticals reordering.
 2014-01-13 07:22:17 -08:00
cahrens
38c516e9e9 Fix bug about draft verticals reordering. 
STUD-714
 2014-01-13 09:25:16 -05:00
polesye
af56a2df72 BLD-518: Fix video volume cookie. 2014-01-13 12:03:57 +02:00
Calen Pennington
2ad4749a5d Merge pull request #2119 from cpennington/xblocks-behind-feature-flag 
Enable pure XBlocks, hidden by feature flags
 2014-01-10 09:51:23 -08:00
Calen Pennington
417fe21d05 Enable pure XBlocks, but behind a feature flag 
[LMS-226]
[LMS-2013]
 2014-01-10 11:40:03 -05:00
polesye
95a88823b9 BLD-633: Fix show answer for ImageResponse. 2014-01-10 13:32:16 +02:00
Ned Batchelder
520822c3a6 Merge pull request #2122 from edx/ned/i18n-xblock-support 
Make LMS use runtime.service("i18n") for i18n.
 2014-01-09 12:52:13 -08:00
Ned Batchelder
7f1fc01f80 Change XModule i18n to use runtime.service 
LMS-1597
 2014-01-09 14:19:56 -05:00
Don Mitchell
a07896dacc Set definition_locator on in-memory xblocks 2014-01-09 12:39:39 -05:00
Don Mitchell
bccae306db Merge pull request #2111 from edx/dhm/drop_contentstore 
During testing: drop contentstore when cleaning up modulestore
 2014-01-08 11:37:42 -08:00
Don Mitchell
81a5b36363 During testing: drop contentstore when cleaning up modulestore 2014-01-08 12:05:32 -05:00
Andy Armstrong
93675304da Add sorting to Studio's Files & Uploads page 
Added sorting to the new pagination logic for STUD-995.
 2014-01-08 10:35:40 -05:00
David Baumgold
5d63cd0eb0 Merge pull request #2094 from edx/db/change-section-start-date 
Set default section start date to Jan 1, 2030
 2014-01-07 13:10:29 -08:00
David Baumgold
ce4b130113 Set default section start date to Jan 1, 2030 
STUD-1072
 2014-01-07 15:46:15 -05:00
Ned Batchelder
27b8c83b34 Mark XModule strings for i18n 2014-01-07 09:43:46 -05:00
Ned Batchelder
549d9230f8 Merge pull request #2077 from edx/ned/misc-msg-fixes 
Miscellaneous fixes to strings found during i18n work.
 2014-01-07 06:41:42 -08:00
zubair-arbi
f71688ce42 Merge pull request #2075 from zubair-arbi/zub/bugfix/std878-wrongcontenttype 
Assign valid content_type to static resource (import_static_content)
 2014-01-06 23:35:44 -08:00
Usman Khalid
6108529ce1 Merge pull request #2001 from edx/waheed/openended-problems-commands-2 
Django command to post submissions to ora
 2014-01-06 08:04:33 -08:00
Ned Batchelder
93682af4eb Don't catch all exceptions. 2014-01-06 10:24:00 -05:00
Usman Khalid
57710d7226 Added django commands to get statistics and repost submissions to grader for open ended problems. 
ORA-286
 2014-01-06 19:13:28 +05:00
zubiar-arbi
b998a161d2 Assign valid content_type to static resource (import_static_content) 
STUD-878
 2014-01-06 14:05:09 +05:00
Andy Armstrong
f9c45586a4 Add pagination to Studio's Files and Uploads page 
These changes implement STUD-813. The commit consists of the
following logical changes:
 - a REST API has been implemented for a course's assets
 - the page itself now fetches the assets client-side
 - the Backbone.Paginator library is used to support pagination
 - the AssetCollection has been refactored to extend
   Backbone.Paginator.requestPager so that it can be paged
 - an abstract PagingView class has been added to generalize
   the communication with a paging REST API
 - the AssetsView has been reimplemented to extend PagingView
 - two new child views have been added:
   - PagingHeader: the paging controls above the list of assets
   - PagingFooter: the paging controls below the assets
 2014-01-05 23:35:12 -05:00
Ned Batchelder
be6c57f53a Mark XModule strings for i18n 2014-01-03 17:50:16 -05:00
polesye
65f903a325 Disable tests due to flakiness. 2013-12-30 18:07:40 +02:00
Christina Roberts
ad6e4f2c64 Merge pull request #2020 from edx/christina/export-bug2 
Support non-ascii chars as arguments to format.
 2013-12-27 08:35:55 -08:00
Christina Roberts
719a898e0f Merge pull request #2018 from edx/christina/export-bug 
Bug fixes related to unicode support in export workflow.
 2013-12-27 08:34:49 -08:00
Oleg Marshev
7c070f29a1 Add better messaging, turn off SSL verification when sending grade back. 2013-12-27 09:59:21 +02:00
polesye
934b5198c3 Address comments. 2013-12-24 14:59:21 +02:00
polesye
afec2dd4ad Add tests for Android. 2013-12-24 14:59:21 +02:00
polesye
b6808d3d13 BLD-541: Fix video controls on iPad. 2013-12-24 14:59:20 +02:00
Don Mitchell
f5f24fcc12 Merge pull request #2022 from edx/dhm/locator_course_id 
Change course_id to package_id
 2013-12-23 11:15:48 -08:00
Don Mitchell
b7368ef69a Change course_id to package_id 
on new Locators to make it clear that they have a different syntax
than Location.course_id altho they represent the same info.
 2013-12-20 16:16:50 -05:00
cahrens
367ea683bd Support non-ascii chars as arguments to format. 
We've had errors in export related to non-ascii chars being passed to format. Proactively making these usages of format robut to non-ascii chars.

Part of STUD-868
 2013-12-20 14:55:07 -05:00
Calen Pennington
aa57481ecc Add handler_url usable by descriptors 
[LMS-1614]
 2013-12-20 14:05:53 -05:00