Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,750 Commits 1 Branch 0 Tags
63c5cfda94fcf4e7b27cbddae0941135905501e2
Commit Graph

2989 Commits

Author SHA1 Message Date
Chris Dodge
1c79b9c874 add a /jump_to_id/ shortcut for producing more durable links between courseware in Studio 2013-07-23 12:10:49 -04:00
David Baumgold
89705f275d Merge pull request #461 from edx/db/change-asset-to-pdf 
Change "asset" to "PDF" in textbooks interface
 2013-07-23 06:49:39 -07:00
Brian Talbot
4a3b680ee6 Merge pull request #447 from edx/talbs/studio-fix-title 
Studio: adds a space back to the phrase 'Welcome to edX Studio'
 2013-07-22 13:27:46 -07:00
Peter Fogg
d87dba9e04 Correctly persist checklist settings. 
Incidentally, fixes an acceptance test (which would have caught this
bug) not running. Its step regex was "They are correctly selected
after I reload the page$", which happens to be matched by "I reload
the page$", another step definition. Lettuce seems to arbitrarily pick
between definitions if they both match a step, so it's good to ensure
that each step isn't a sub-regexes of another.
 2013-07-22 15:10:59 -04:00
David Baumgold
ca2bb0e850 PDF Upload button now refers to "PDF" rather than "asset" 2013-07-22 12:54:31 -04:00
David Baumgold
b51aa31231 PDF uploader dialog refers to "PDF" instead of "asset" 2013-07-22 12:54:16 -04:00
Peter Fogg
c4a21fc906 Merge pull request #403 from edx/peter-fogg/fix-stud-421 
Validate date/time settings when typed in directly.
 2013-07-22 08:41:04 -07:00
Calen Pennington
cba9827a91 Merge pull request #443 from edx/tsinghuax/cms-i18n-leftovers 
CMS i18n changes from Tsinghua
 2013-07-22 08:32:12 -07:00
Brian Talbot
4a7e793ab2 Studio: revises spacing fix for welcome to edX studio title 2013-07-22 09:47:59 -04:00
Brian Talbot
dc2631cb5a Studio: adds a space back to the phrase 'Welcome to edX Studio' that went missing 2013-07-22 09:47:59 -04:00
Peter Fogg
9a61038c87 Merge pull request #432 from edx/peter-fogg/update-asset-deletion-prompt 
Change delete asset prompt to Warning type for consistency.
 2013-07-22 06:10:15 -07:00
Jason Bau
6c3de222cc Merge pull request #450 from edx/jbau/configure-session 
Allow session backend to be configurable
 2013-07-21 20:44:15 -07:00
Chris Dodge
9056b096c6 add back removed space 2013-07-20 11:10:01 -04:00
Calen Pennington
679b118ed3 Merge pull request #271 from edx/dhm/next-gen-modulestore 
Next gen modulestore
 2013-07-20 04:51:11 -07:00
Jason Bau
034de2cfd2 Allow session backend to be configurable and also add PLATFORM_NAME 
to cms settings (it was throwing 500s for Stanford when the CMS
calls render_from_lms)
 2013-07-19 17:43:37 -07:00
Will Daly
76a63a6ef0 Disabled test failing due to bug in Studio 2013-07-19 17:13:51 -04:00
Will Daly
17daa2a023 Fixed two other tests 2013-07-19 16:49:16 -04:00
Will Daly
27d51b3453 Attempt to fix video test 2013-07-19 16:49:15 -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
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