Commit Graph

1858 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
David Baumgold
a6f349dab9 Studio i18n 2013-07-12 16:25:39 -04:00
cahrens
d417a78c74 Tests for course creator status as returned in index page. 2013-07-12 11:25:12 -04:00
cahrens
9b2c384666 Add post callback to request course creator status. 2013-07-11 13:53:56 -04:00
cahrens
3715d6c429 Only send a single variable to index.html about authorship rights. 2013-07-11 12:39:51 -04:00
David Baumgold
17bef565f1 Added another test 2013-07-09 19:16:44 -04:00
David Baumgold
4155f9fe8c Removed unused user_author_string function 2013-07-09 19:16:44 -04:00
David Baumgold
437e658f98 pylint fixes 2013-07-09 19:16:44 -04:00
David Baumgold
32a902ca57 Remove create_json_response in favor of JsonResponse class 2013-07-09 19:16:43 -04:00
David Baumgold
628dff5398 pylint fixing 2013-07-09 19:16:43 -04:00
David Baumgold
7506562f50 Another lettuce test, and fixes to make it work 2013-07-09 19:16:11 -04:00
David Baumgold
e1ed5c3d2d docstrings 2013-07-09 19:16:10 -04:00
David Baumgold
2a92a14054 Wrote simple lettuce tests for pdf textbooks 2013-07-09 19:16:09 -04:00
David Baumgold
4bc109708f Use django-method-override module
Replacing the get_request_method function everywhere
2013-07-09 19:16:09 -04:00
David Baumgold
bc3a67ec89 Fix reference error 2013-07-09 19:16:09 -04:00
David Baumgold
ef81556cc5 Use JsonResponse when it makes sense 2013-07-09 19:16:08 -04:00
David Baumgold
090d0d4464 Fix up unit tests 2013-07-09 19:16:08 -04:00
David Baumgold
77ae9a6a78 PDF Textbooks: fetch/save individual textbooks
Created a few RESTful API endpoints, which required creating and assigning
arbitrary IDs to PDF textbooks. Changed the Backbone views to save individual
models, instead of saving a whole collection.
2013-07-09 19:16:07 -04:00
David Baumgold
27e895393c Added generic JsonResponse class
Based on http://djangosnippets.org/snippets/154/
2013-07-09 19:16:07 -04:00
David Baumgold
404c36b8f4 PDF textbooks: namespace JS variables for URLs 2013-07-09 19:16:07 -04:00
David Baumgold
05cb13b171 Adding and fixing tests 2013-07-09 19:16:04 -04:00
David Baumgold
8934cf35ba Add pdf_textbooks tab when textbooks are created 2013-07-09 19:16:04 -04:00
David Baumgold
0d415d814b Remove unused imports 2013-07-09 19:16:03 -04:00
David Baumgold
4509dc03b0 Pull and save pdf textbook information to/from the correct modulestore 2013-07-09 19:16:02 -04:00
David Baumgold
6a3360cefa Full front-end/back-end connection via Backbone.sync. No data validation whatsoever. 2013-07-09 19:16:02 -04:00
David Baumgold
00b885deaa Update pdf textbooks backend to respond to AJAX requests with JSON 2013-07-09 19:16:01 -04:00
David Baumgold
e607bc70ad Pull assets into Mako template for PDF textbooks 2013-07-09 19:16:01 -04:00
Chris Dodge
d4b1d4c60c return right mimetype from upload method. 2013-07-09 19:15:59 -04:00
David Baumgold
e0eec89e09 Truncate AJAX error messages in notification 2013-07-09 19:15:59 -04:00
David Baumgold
a84f66cd51 Pass asset upload URL to Javascript 2013-07-09 19:15:58 -04:00
David Baumgold
3d61c6294c Stubbed out textbooks index page 2013-07-09 19:15:58 -04:00
David Baumgold
cc4e01b4c6 Removed obsolete active_tab template variable 2013-07-09 19:15:58 -04:00
Chris Dodge
6642cdddae support uploading and referencing assets as streams rather than having to read everything into memory first 2013-07-09 19:15:58 -04:00
Jean Manuel Nater
18861e4ef9 Removed some pep8 violations. 2013-07-09 19:15:57 -04:00
Chris Dodge
7962ad7dd0 remove incorrect comment 2013-07-03 13:46:31 -04:00
Chris Dodge
bf3a7287f0 do some lamda magic to refactor out the whitelist checking code to be shared between LMS and CMS 2013-07-03 13:46:31 -04:00
Chris Dodge
63ed16e118 add a 'can_execute_unsafe_code' callback method (ala LMS) to allow for whitelisting of courses with respect to codejailing 2013-07-03 13:46:31 -04:00
Calen Pennington
1a7b833146 Merge pull request #269 from edx/dhm/incidental-functionality-improvements
Incidental functionality improvements from Next Gen Modulestore work
2013-07-01 13:04:20 -07:00
David Baumgold
923bcc555c Make CMS errors JSON-able if requested via AJAX 2013-07-01 15:09:41 -04:00
Don Mitchell
ef9c299413 Work around XBlock limitations to force persistance of field mutation 2013-07-01 12:33:08 -04:00