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

4005 Commits

Author SHA1 Message Date
ihoover
3d669eabe0 fix merge conflicts with master 2013-07-19 16:03:13 -04:00
Don Mitchell
df7b917b40 Implement next generation modulestore 
A new modulestore backed by mongo that changes the data format to
facilitate easy versioning, sharing content between courses, and fast
lookup of course structure and Scope.settings data.

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
 2013-07-19 13:10:14 -04:00
Don Mitchell
4a127e51c9 Merge pull request #441 from edx/dhm/course_update_bugs 
POST requests were claiming request.method == 'PUT'
 2013-07-19 08:56:01 -07:00
Vik Paruchuri
a2522c492c Merge pull request #160 from edx/fix/vik/studio-oe 
Fix/vik/studio oe
 2013-07-19 08:44:16 -07:00
Calen Pennington
2a3dd7323f CMS i18n changes from Tsinghua 2013-07-19 11:40:47 -04:00
Don Mitchell
541c98a3af POST requests were claiming request.method == 'PUT' 
So, changed handlers to look for either value.
 2013-07-19 11:14:01 -04:00
Don Mitchell
63c3bb0812 Reproduce POST showing up as PUT error 2013-07-19 11:12:23 -04:00
chrisndodge
37dc27cec4 Merge pull request #438 from edx/fix/cdodge/missing-space-on-landing-page 
I18N work seems to have lost a very prominent space in the landing page
 2013-07-19 07:43:10 -07:00
chrisndodge
d78af5cf51 Merge pull request #294 from edx/feature/cdodge/add-dump-course-structure 
add a new django-admin command to dump out a course structure document. ...
 2013-07-19 07:04:41 -07:00
Chris Dodge
95302b02a8 I18N work seems to have a very prominent space in the landing page 2013-07-18 21:12:49 -04:00
Don Mitchell
0aa9c6c1ae json field value conversion test 2013-07-18 16:48:29 -04:00
Don Mitchell
badf86f71b Have save_item parse json formatted field values by type 
including allowing javascript to serialize date/time natively.
 2013-07-18 16:48:29 -04:00
Diana Huang
3f9431e8cf Provide implicit saves for XBlocks and XModules. 
Update existing tests and provide new ones to test new paradigm.
 2013-07-18 16:37:34 -04:00
Vik Paruchuri
84c4b7f139 Test fixes 2013-07-18 15:08:52 -04:00
Peter Fogg
58f147c161 Change delete asset prompt to Warning type for consistency. 2013-07-18 11:47:40 -04:00
Chris Dodge
66287d0d99 fix test to use the new create_item method rather than clone_item, which has been deprecated, and thus breaking the test 2013-07-18 09:30:30 -04:00
Calen Pennington
96a9d74190 Merge pull request #422 from edx/release 
Hotfix: 2013-07-17
 2013-07-17 13:12:06 -07:00
Chris Dodge
8325e28a10 add a default XML serialization if the 'data' field is empty or None. Some XModules now - like video XModule - do not have XML set in the 'data' field 2013-07-17 12:31:33 -04:00
ihoover
ee4bc424ce remove depracated feature flag GENERATE_RANDOM_USER_CREDENTIALS 2013-07-17 09:12:07 -04:00
Chris Dodge
ecbf148688 add a new django-admin command to dump out a course structure document. This is response to an emergency request from Harvard researchers. 2013-07-16 16:53:01 -04:00
Don Mitchell
be4fbc562e Refactor tests to no longer use templates 
Add boilerplate option to ItemFactory
Minor start date fix to not use microsecs
 2013-07-16 16:00:28 -04:00
Calen Pennington
f6b7b2678d Set about page default content from overview.yml template 2013-07-16 14:33:59 -04:00
Calen Pennington
4b53478859 Require markdown to be explicitly set 2013-07-16 14:33:59 -04:00
Calen Pennington
8b5979641b Change default rerandomize and showanswer 
The defaults used to be rerandomize=always, showanswer=closed. This is
preserved for capa problems being imported from XML. However, for
courses, and for problems created in Studio, the default has been
changed to never/finished, to match the previous defaults used by
Studio.
 2013-07-16 14:33:58 -04:00
Don Mitchell
3722685e1a No longer persist XModule templates 
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
 2013-07-16 14:33:58 -04:00
Don Mitchell
8c904f31a9 Move defaults from yaml templates to field definitions. 
This standardizes the XModule field default values to be the same as the
values that are presented by studio when a component is added to a
course.
 2013-07-16 14:24:41 -04:00
Brian Talbot
978d33badd Merge pull request #319 from edx/talbs/studio-sassmixins 
Studio Sass Mixin/Extend Re-Org
 2013-07-15 11:52:35 -07:00
Peter Fogg
5c0fd18910 Validate date/time settings when typed in directly. 
The changeTime event isn't fired when the user types in the field, but
only when clicking on the time in the dropdown. I'd consider this a
timepicker bug, but for now we can just listen to the user typing in
the field and update the value (and thus validate) like we do with
other field types.
 2013-07-15 11:00:43 -04:00
Brian Talbot
388724c485 Studio: updates Sass mixins/extend references based on textbook/Sass cleanup 2013-07-15 10:12:51 -04:00
Brian Talbot
19a7e63e40 Studio: renames nav dropdown pattern and corrects references 2013-07-15 10:12:51 -04:00
Brian Talbot
7ea55757bf Studio: references newly renamed app-wide Sass extends 2013-07-15 10:12:50 -04:00
Brian Talbot
88d06a16e5 Studio: renames and re-orgs app-wide Sass extends 2013-07-15 10:12:50 -04:00
Brian Talbot
a2ac5c87db Studio: revises nav display issue by re-scoping poor Updates Sass rules 2013-07-15 10:12:17 -04:00
Peter Fogg
60d151497f Fix section release acceptance test failure. 2013-07-15 09:21:25 -04:00
David Baumgold
7f5aedb215 Merge pull request #380 from edx/db/studio-i18n 
Studio internationalization
 2013-07-13 05:45:50 -07:00
ichuang
547f230002 Merge pull request #381 from edx/feature/ichuang/export_all_courses 
Add management command to Studio for exporting all courses; useful for periodic backups of course content in Studio
 2013-07-12 16:59:53 -07:00
ichuang
8b6a55e2a8 fix pep-8 in export_all_courses 2013-07-12 19:58:16 -04:00
Brian Talbot
e1c02b1b31 Studio: removing preventDefault from course creator request button 2013-07-12 16:50:00 -04:00
David Baumgold
04ddb63dad i18n the studio nav help button 2013-07-12 16:27:54 -04:00
Frances Botsford
260b5ccef4 i18n the view live button on the studio dashboard 2013-07-12 16:25:44 -04:00
David Baumgold
a6f349dab9 Studio i18n 2013-07-12 16:25:39 -04:00
Brian Talbot
b28b4bfb75 Studio: abstracts and revises form/notice UI 2013-07-12 14:25:32 -04:00
Brian Talbot
c75041e168 Studio: adds in disabled/submitting state and logic for course creation button 2013-07-12 14:25:32 -04:00
cahrens
923ba365b1 Merge branch 'master' into talbs/studio-authorship 2013-07-12 13:35:52 -04:00
cahrens
08a1055cba Updates to index page text. 2013-07-12 13:35:27 -04:00
cahrens
d417a78c74 Tests for course creator status as returned in index page. 2013-07-12 11:25:12 -04:00
JonahStanley
940113efee Fixed long lines 2013-07-12 10:32:49 -04:00
JonahStanley
484e217de3 Fixed some errors 2013-07-12 10:32:48 -04:00
JonahStanley
1f1bba5507 Scenario Dictionary now holds objects 2013-07-12 10:32:48 -04:00
JonahStanley
8110307ba9 CMS now refactored to use world dictionary 2013-07-12 10:32:48 -04:00