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

1211 Commits

Author SHA1 Message Date
cahrens
23894d20f8 E-mail notifications to users when course creator status changes. 2013-07-29 09:49:37 -04:00
Christina Roberts
166aea62bb Merge pull request #341 from edx/talbs/studio-authorship 
Studio: Authorship Rights Request UI + Dashboard Clean-up
 2013-07-26 03:59:07 -07:00
Sarina Canelake
50d35b30b1 Fix failing acceptance test 2013-07-25 14:56:22 -04:00
David Baumgold
df1252901f Misc improvements to make lettuce testing a bit saner 2013-07-25 13:19:39 -04:00
cahrens
60d60de2c4 Use format for strings instead of %. 2013-07-25 12:21:17 -04:00
Adam Palay
2efcb0cdca Change default names for various LMS components 
Embedded discussion component defaults to "Discussion"
Blank HTML page defaults to "Text"
Video component defaults to "Video"

These default names show up in tooltips.
 2013-07-25 10:38:47 -04:00
Chris Dodge
0b6932f4b8 add new test to assert that course creation will populate default tabs as expected. Also update factory to not override defaults on tabs array. Also simplfy self.tab test condition. 2013-07-23 16:15:39 -04:00
Peter Fogg
6eac259c08 Merge pull request #415 from edx/peter-fogg/notification-stories 
Peter fogg/notification stories
 2013-07-23 09:05:10 -07:00
Peter Fogg
69e8d4d32f Merge pull request #469 from edx/peter-fogg/fix-stud-486 
Trim whitespace when adding course authors.
 2013-07-23 09:01:25 -07:00
Peter Fogg
060b2e17e5 Trim whitespace when adding course authors. 2013-07-22 15:58:22 -04: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
cahrens
5168a080ff Don't add users marked with is_staff to course creation table. 2013-07-22 14:45:22 -04:00
cahrens
6629d5d3a3 Merge branch 'master' into talbs/studio-authorship 
Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/static/sass/elements/_controls.scss
	cms/templates/activation_active.html
	cms/templates/activation_complete.html
	cms/templates/activation_invalid.html
 2013-07-22 12:15:42 -04:00
Peter Fogg
fb0fcc310b Factor out common code between module editing and course overview. 2013-07-22 11:37:09 -04:00
Peter Fogg
75edc65748 Use Backbone notifications for setting graded status. 2013-07-22 11:37:09 -04:00
Peter Fogg
5029f460ec Use Backbone notifications for component delete. 2013-07-22 11:37:08 -04:00
Peter Fogg
9fe4cb734c Use Backbone notifications for course section delete. 2013-07-22 11:37:08 -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
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
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
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
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
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
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
David Baumgold
a6f349dab9 Studio i18n 2013-07-12 16:25:39 -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