Christina Roberts
42f286b325
Merge pull request #1069 from edx/christina/lock-assets
...
Add asset locking to the Studio asset page.
2013-09-26 07:54:29 -07:00
Don Mitchell
190b418387
Merge pull request #1121 from edx/dhm/timezone_display
...
Replace date lib w/ simpler tzAbbr
2013-09-26 07:43:22 -07:00
cahrens
2cbdaaee7d
Updates based on switching to checkbox for locking.
2013-09-25 17:29:47 -04:00
Frances Botsford
79c2cdc7ba
switching studio assets lock to use checkbox instead of link
2013-09-25 17:29:47 -04:00
cahrens
c64e04d8c2
Add the ability to lock assets.
2013-09-25 17:29:27 -04:00
Greg Price
7275f85232
Merge branch 'release'
2013-09-24 15:27:18 -04:00
Christina Roberts
908371ea0b
Merge pull request #1113 from edx/christina/fix-asset-index
...
Put the non-Backboned assets JavaScript back into its own file.
2013-09-24 09:18:54 -07:00
cahrens
ab6af2b586
Put assets JavaScript code back in something that goes through pipelining.
2013-09-24 11:49:54 -04:00
cahrens
3f23b82a05
Back out USER_ID help text.
2013-09-24 10:20:58 -04:00
Don Mitchell
f8cd482621
Replace date lib w/ simpler tzAbbr
2013-09-23 16:56:30 -04:00
jkarni
97cd5a8555
Merge pull request #1013 from edx/jkarni/fix/import-warnings
...
Jkarni/fix/import warnings
2013-09-23 13:15:55 -07:00
cahrens
9b076464f4
Moving unregistration of change listener into asset_index.html.
...
Fixes broken integration test on master.
2013-09-23 10:25:06 -04:00
Julian Arni
c196d1895a
i18n fix
2013-09-23 10:13:33 -04:00
Nick Parlante
43c73b2df9
Merge pull request #1049 from edx/nick/html-help
...
Mention in studio UI that %%USER_ID%% works
2013-09-20 09:48:21 -07:00
cahrens
d11c92d799
Set the URL on the collection instead of the model.
2013-09-20 10:44:55 -04:00
cahrens
01d7d48f8f
Create backbone models/views for assets.
...
cleanup
Updates.
Testing changes.
Testing changes.
asset-index progress state cleanjup.
cleanup
2013-09-20 10:44:54 -04:00
Nick Parlante
357156b58a
Mention in studio UI that %%USER_ID%% works
2013-09-19 14:28:10 -07:00
Julian Arni
4fdf7a4849
Prompt before leaving page
2013-09-17 15:55:30 -04:00
Julian Arni
0f81bdcefd
Properly handle error responses
2013-09-17 09:46:10 -04:00
Julian Arni
cdf0eef5ca
Consider redirect code as succcesful
2013-09-16 15:06:51 -04:00
Julian Arni
0acaaa8859
Fix element name conflict
2013-09-09 18:32:01 -04:00
jkarni
b53d55543d
Merge pull request #823 from edx/jkarni/feature/multiple-assets-upload
...
Add support for multiple file uploads
2013-09-09 06:47:58 -07:00
chrisndodge
9c6987d010
Merge pull request #873 from edx/fix/cdodge/enable-course-image-setting
...
also even when we have a marketing site, we still need a course image fo...
2013-09-06 16:58:54 -07:00
David Baumgold
3b627e8c80
Merge pull request #879 from edx/db/remove-template-loader
...
Remove Studio JS template loader
2013-09-06 12:26:50 -07:00
David Baumgold
d984311b2e
Remove references to template loader JS library
2013-09-06 09:59:56 -04:00
Calen Pennington
8201b1412e
Use XBlock 0.3
2013-09-06 09:45:59 -04:00
Chris Dodge
0a6565b882
also even when we have a marketing site, we still need a course image for the dashboard
2013-09-05 21:07:22 -04:00
cahrens
4e67783644
Don't show course about page link when we have the marketing site.
...
STUD-733
2013-09-05 14:26:08 -04:00
Chris Dodge
4a12cb60c9
due to the MixedModuleStore pending release, we need to make enrollment start/end dates editable in Studio
2013-09-05 12:43:24 -04:00
Julian Arni
07014e8eb2
Reset modal when closed by clicking outside of it
2013-09-04 16:25:23 -04:00
Adam Palay
67890b3c66
resolve merge conflict with hotfix branch
2013-09-03 16:00:24 -04:00
Julian Arni
b797118811
review fixes
2013-08-29 17:22:07 -04:00
cahrens
a061c7ece7
Rewriting of links for Course Updates and Course Handouts.
...
STUD-669.
2013-08-29 14:35:16 -04:00
Julian Arni
e0ab75fb84
Add support for multiple file uploads
2013-08-29 09:55:40 -04:00
Julian Arni
6cb2e0b206
Check extension rather than mimetype
2013-08-28 11:13:20 -04:00
Julian Arni
fcd11d93d5
Handle nginx 499s and double requests
2013-08-25 22:40:11 -04:00
Julian Arni
8a8bcf289f
remove repeated warnings
2013-08-25 22:40:10 -04:00
Julian Arni
ef0828fc66
Behave properly on non-tar-gz files
2013-08-25 22:40:10 -04:00
Julian Arni
513b6cab3e
Small review fixes.
...
Comments, httpresponse -> jsonresponse; make sure errors get relayed.
2013-08-25 22:40:09 -04:00
Julian Arni
798d07a8d9
Fix confusing message
2013-08-25 22:40:09 -04:00
Julian Arni
50934d4d45
Make client-side use jquery-file-upload
2013-08-25 22:40:09 -04:00
Peter Fogg
7fc8fcde7b
Merge pull request #752 from edx/peter-fogg/unlimited-graceperiod
...
Allow grace periods of > 24 hours.
2013-08-21 13:00:15 -07:00
Peter Fogg
eb5b6cc6ea
Allow grace periods of > 24 hours.
2013-08-21 14:37:12 -04:00
Peter Fogg
32de5aa09f
Fix up some SASS issues.
2013-08-21 11:03:40 -04:00
Peter Fogg
b539a4cb94
Update copy to include PNGs, add tests, remove default MIME type.
2013-08-21 09:42:01 -04:00
Brian Talbot
c626c773d8
Studio: revises styling/copy around course image management in settings
2013-08-21 09:42:00 -04:00
Peter Fogg
9632f4fed8
Address PR comments:
...
- Internationalize upload errors.
- Move upload tests into their own files.
- Refactor upload dialog acceptance tests.
2013-08-21 09:42:00 -04:00
Peter Fogg
e4302e62d2
Allow course image uploads in the settings page.
...
Authors can upload an image (or choose an existing one) from the
settings page, using the in-context uploader from PDF
textbooks. Includes tests for backwards compatibility with XML courses
-- they used a magic filename (images/course_image.jpg) which is
mapped to a location in the Mongo contentstore.
Still needs some UX work, though the backend plumbing is there.
2013-08-21 09:42:00 -04:00
Peter Fogg
ce1a13f32c
Generalize file uploader.
...
Previously the file upload dialog was PDF- and textbook-specific. The
changes are adding parameters to the FileUpload model for the file
type, and adding an onSuccess callback to the UploadDialog view. Also
moved upload-specific SASS into its own file.
2013-08-21 09:42:00 -04:00
James Tauber
97083d0f69
fixed typo in faculty member settings
...
This was confusing translators as didn't make sense in English
2013-08-16 11:49:20 -04:00
