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
Don Mitchell
2fc7d3308c
Customtags can't be inserted by studio
2013-07-01 12:33:08 -04:00
Don Mitchell
a2524c517f
Force locations to be Location objects earlier
2013-07-01 12:33:08 -04:00
Don Mitchell
2ef4d82959
Standardize on get_default_time_display
2013-06-28 14:19:10 -04:00
Don Mitchell
e9bd1c5602
Fix SessionKeyValueStore.has to use the correct indexing value when looking up data
2013-06-28 14:19:10 -04:00
Calen Pennington
6e357db24c
Merge pull request #268 from edx/dhm/cosmetic-cleanup
...
Cosmetic Cleanups Incidental to Next Gen Modulestore Implementaton
2013-06-27 05:44:49 -07:00
Don Mitchell
1344b1e521
Make SessionKeyValueStore variable names clearer
2013-06-26 14:19:33 -04:00
Don Mitchell
65b3bcdba6
Clean up variable naming
2013-06-26 14:19:33 -04:00
cahrens
318372f2c0
Introduce course creator group.
2013-06-26 10:48:31 -04:00
cahrens
d601cee8e5
Merge branch 'master' into christina/course-settings-drupal
2013-06-20 11:00:12 -04:00
cahrens
6e96b88518
On marketing site, disable course settings options that do not work.
...
When on the marketing site (edx.org) disable portions of the course settings page in Studio that do not actually work in that environment.
2013-06-19 11:28:16 -04:00
Don Mitchell
1ff022e181
Incidental pep8 changes
2013-06-18 17:25:06 -04:00
Chris Dodge
70ee4b8060
add unit tests for asset delete/restore
2013-06-17 11:10:35 -04:00
Chris Dodge
85b904f176
fix sizing of the delete column
2013-06-17 11:09:52 -04:00
Chris Dodge
9b749c4201
add ajax callback entry point to remove the asset
2013-06-17 11:09:52 -04:00
cahrens
fae8fd3841
Merge branch 'master' into feature/christina/unify-fields
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/fields.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/test_fields.py
requirements/edx/github.txt
2013-06-13 10:55:13 -04:00
cahrens
6e92ddf3dd
Cannot set String field to a dict anymore!
2013-06-12 17:07:41 -04:00
chrisndodge
e685ff7125
Merge pull request #129 from edx/fix/cdodge/cancel-asset-upload-crash
...
[STUD-256] Seems like on chrome when cancel is hit in the file chooser, the 'change...
2013-06-11 12:52:56 -07:00
Chris Dodge
fa8ae228bf
Seems like on chrome when cancel is hit in the file chooser, the 'changed' event is fired and startUpload() was being called. We need to check to see if the upload file is blank and - if so - just return immediately out of the function
2013-06-11 13:38:01 -04:00
Don Mitchell
855433341d
Minor code review fixes (removing commented code).
2013-06-10 17:16:34 -04:00
Don Mitchell
d7194e6bec
struct_time to datetime conversion.
2013-06-10 17:16:34 -04:00
Chris Dodge
d9ce3162e0
partial fix for STUD-145, catch invalid location errors and return a HTTP 400 error to client
2013-06-10 11:47:37 -04:00
chrisndodge
7735e37585
Merge pull request #8 from edx/valera/fix_videoalpha_studio_integration
...
Added videoalpha to advanced components in component.py file.
2013-06-02 13:04:33 -07:00
Valera Rozuvan
37cffd0835
Added videoalpha to advanced components in component.py file.
2013-05-31 13:48:17 +03:00
cahrens
14eb9c9a3b
Merge branch 'master' into feature/christina/metadata-ui
2013-05-30 12:27:03 -04:00
cahrens
aca5cbb215
Merge branch 'master' into bug/christina/preview_url
2013-05-28 12:13:19 -04:00
cahrens
87d904cb35
Merge branch 'master' into feature/christina/metadata-ui
...
Conflicts:
cms/templates/base.html
2013-05-24 16:10:34 -04:00
