Commit Graph

204 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
David Baumgold
df1252901f Misc improvements to make lettuce testing a bit saner 2013-07-25 13:19: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
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
Brian Talbot
ec02a4f39f Studio: changed the copy and prompt type for unit + outline deletions 2013-07-22 11:37:09 -04:00
Peter Fogg
9fe4cb734c Use Backbone notifications for course section delete. 2013-07-22 11:37:08 -04:00
Chris Dodge
9056b096c6 add back removed space 2013-07-20 11:10:01 -04:00
Calen Pennington
2a3dd7323f CMS i18n changes from Tsinghua 2013-07-19 11:40:47 -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
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
Peter Fogg
60d151497f Fix section release acceptance test failure. 2013-07-15 09:21:25 -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
Peter Fogg
8b13ff3dff Merge pull request #376 from edx/peter-fogg/rename-notification-save
Rename CMS.Views.Notification.Saving to Mini.
2013-07-11 14:25:44 -07:00
Brian Talbot
c360faed58 Studio: revises dashboard course creation button and form interaction 2013-07-11 16:30:30 -04:00
Peter Fogg
7c9648babd Hide saving notification only when AJAX request completes. 2013-07-11 13:27:15 -04:00
Peter Fogg
9c8f63726f Rename CMS.Views.Notification.Saving to Mini, in line with its more diverse modern usage. 2013-07-11 13:13:08 -04:00
Brian Talbot
59850cb4a3 Studio: cleans up new course form and course listings display 2013-07-11 12:44:26 -04:00
Peter Fogg
f3837009af Remove ellipsis from internationalized notifications. 2013-07-11 11:26:17 -04:00
Peter Fogg
66b73c861f Use new feedback notification when changing section release dates. 2013-07-10 16:07:25 -04:00
Brian Talbot
ab0cada683 studio - revises main nav dropdown jquery selectors 2013-07-01 17:32:16 -04:00
cahrens
ad6e745762 Forgot to remove registration of onKeyUp function. 2013-06-24 09:09:05 -04:00
cahrens
250de3fcb6 Remove keybinding for work in progress (WIP).
STUD-329
2013-06-21 17:13:06 -04:00
Chris Dodge
16e476e8e4 refactored asset page related JS into it's own page 2013-06-17 11:10:36 -04:00
Chris Dodge
cd0087ca53 use the new notification tools for the confirmation dialog 2013-06-17 11:10:35 -04:00
Chris Dodge
274d8997a2 update warning message 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
be6fbf913e make local variable 2013-06-11 14:36:04 -04:00
Chris Dodge
1602f592b4 use better API 2013-06-11 14:32:33 -04: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
David Baumgold
e2f5acef46 Turn course sections into Backbone models
Hook up course name edit interaction, with notification framework
2013-05-22 15:55:49 -04:00
Frances Botsford
571ebb1fcd removed symbolset, replaced with fontawesome for view live, expand collape, zoom buttons 2013-05-22 15:55:48 -04:00
David Baumgold
7f69e45b9e whitespace changes 2013-05-08 09:29:20 -04:00
Steve Strassmann
c9a80ded25 formatted using sublime/formatjs 2013-05-02 10:59:02 -04:00
Steve Strassmann
485d07a722 tabbing 2013-05-02 09:31:53 -04:00
Steve Strassmann
7c972ebf6e fix date interpolation 2013-05-02 09:29:27 -04:00
Steve Strassmann
8baddc0645 Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n 2013-04-24 10:41:09 -04:00
Steve Strassmann
6f10348836 addressed comments from pull request 2013-04-23 10:07:51 -04:00
Steve Strassmann
6e34c668bb introduce i18n 2013-04-17 11:30:29 -04:00
cahrens
40adfa950d Get the "Edit High Level Source" link back in. Broken with xblock work.
https://edx.lighthouseapp.com/projects/102637-studio/tickets/273
2013-04-10 14:53:26 -04:00
cahrens
f36494e5dd Need to be able to access smoothScrollTop. This is a temporary change-- I'll come up with a proposal to namespace our helper functions in a nicer way. 2013-04-09 09:41:52 -04:00
Brian Talbot
3f22826e26 studio - alerts: adding some ARIA-centric accessibility information to example prompts/notifications and advanced settings save notification 2013-04-08 16:28:31 -04:00
Brian Talbot
4d0d3d3ad4 studio - alerts: refactored some alert and notification show/hide js added back to base.js 2013-04-08 11:35:27 -04:00
Brian Talbot
4f71f53826 studio - alerts: adding back in manual close behavior to base.js (needed across app) 2013-04-08 11:18:10 -04:00
cahrens
7f1c89b492 Merge branch 'master' into feature/btalbot/studio-alerts 2013-04-08 10:28:52 -04:00
Brian Talbot
a6c35fb2ce studio - addressing pull request to merge to master feedback 2013-04-08 09:30:09 -04:00
Brian Talbot
1a68d516fb resolving local merge with master 2013-04-05 15:27:08 -04:00
Brian Talbot
512e4fe3bd resolving local merge with master and sprucing style and templates for merge with master 2013-04-05 15:13:21 -04:00
Christina Roberts
33d39a85a9 Merge pull request #1809 from MITx/feature/btalbot/studio-helpsock
Studio Help Sock
2013-04-05 11:37:57 -07:00
Brian Talbot
275826d4ff studio - resolving help sock PR comments 2013-04-05 11:29:46 -04:00