cahrens
401dc82c46
Don't mention edge in the subject line; use same message for edx and edge.
2013-06-25 15:35:47 -04:00
Peter Fogg
72e08456a8
Refactor Advanced Settings page to use Backbone notifications.
2013-06-24 09:48:37 -04:00
cahrens
5f0a89bc27
Don't mention edge in the e-mail; same text used for edge and edx.
2013-06-20 13:16:13 -04:00
cahrens
d601cee8e5
Merge branch 'master' into christina/course-settings-drupal
2013-06-20 11:00:12 -04:00
Brian Talbot
485b5b2d6d
studio - unconditionalizes course summary info in settings
2013-06-20 10:50:15 -04:00
Brian Talbot
419c5e7a5c
studio - removes course settings promo link and notice icons
2013-06-20 09:23:16 -04:00
Brian Talbot
4ddca36bbe
Studio - adds minor UI/content changes to settings notices
2013-06-19 18:13:54 -04:00
Brian Talbot
7904464975
studio - revises notice headings to use icons
2013-06-19 18:09:09 -04:00
Brian Talbot
2c72fa9e8b
studio - revises markup/content for course about mgmt notices
2013-06-19 18:09:09 -04:00
cahrens
51fc6280b6
Don't concatenate together multiple strings.
2013-06-19 16:23:00 -04:00
David Baumgold
687779ba34
Clean up assets page notifications
...
Remove hack to work around multiple notification click issues -- and actually resolve
the issue so that the hack isn't necessary
2013-06-19 12:01:44 -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
David Baumgold
cb3d46d815
Merge pull request #199 from edx/db/notifications-refactor
...
Refactor Backbone notifications
2013-06-19 08:04:18 -07:00
Chris Dodge
54cb64a2c6
actually, seems like if we remove it from PIPELINE_JS then it doesn't work in production
2013-06-18 11:37:50 -04:00
David Baumgold
aa24508024
Add underscore.string library
...
http://epeli.github.io/underscore.string/
2013-06-18 10:23:18 -04:00
David Baumgold
b6e3b0ee03
Refactor Backbone Notifications
...
Models are extraneous for something as temporary as a notifaction -- this change
moves all the configuration into the views, and removes the models entirely.
2013-06-18 10:20:31 -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
ab94b8618c
forgot to internationalize one string
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
85b904f176
fix sizing of the delete column
2013-06-17 11:09:52 -04:00
Don Mitchell
b7cfbe0ce6
Add safety check for start dates unbound
2013-06-10 17:16:34 -04:00
Don Mitchell
d7194e6bec
struct_time to datetime conversion.
2013-06-10 17:16:34 -04:00
Peter Fogg
70736c1da8
Remove tabs from unit.html for the third time.
2013-06-04 13:23:09 -04:00
Peter Fogg
bf88e5ce6a
Be more explicit about template location.
2013-06-03 15:48:07 -04:00
Peter Fogg
8a67454f98
Prevent creation of unnecessary template divs, and rename .single_templates to .single-templates for convention.
2013-06-03 15:36:55 -04:00
Peter Fogg
ff0c56b7fb
Cleaning up code -- removed unnecessary lines, fixed indentation, renamed method.
2013-06-03 14:21:50 -04:00
Peter Fogg
457bd30c68
Make sure advanced component creation shows even a single template.
2013-06-03 10:26:52 -04:00
Peter Fogg
cce65ce9ae
Merge branch 'master' of github.com:edx/edx-platform into peter-fogg/single-click-video-creation
2013-06-03 09:15:52 -04:00
Peter Fogg
8c5f9e6e41
Fix merge conflict.
2013-06-03 08:49:52 -04:00
chrisndodge
cd0f4b8194
Merge pull request #18 from edx/fix/cdodge/bad-link-in-activation-email
...
[STUD-177] Fix/cdodge/bad link in activation page
2013-06-02 11:36:31 -07:00
Peter Fogg
68581610a4
Allow single-click creation of course components that only have one template.
2013-05-31 16:22:51 -04:00
Chris Dodge
7efcd98135
fix up styles in header for this particular use case
2013-05-31 11:25:28 -04:00
Chris Dodge
62bacea371
use the right link to the login page in a particular use case: clicking activation email when not logged in
2013-05-31 11:10:14 -04:00
cahrens
e6dfa8e81c
Merge branch 'master' into feature/christina/metadata-ui
2013-05-31 09:46:17 -04:00
David Baumgold
4f1e6c484e
Put the advanced settings notifications back in
2013-05-30 15:08:40 -04:00
cahrens
8fd15ce45d
Review feedback.
2013-05-30 14:13:10 -04:00
cahrens
5d41e2a952
Updates from code review.
2013-05-30 12:26:01 -04:00
Peter Fogg
6eeb12ad1c
Add Lettuce tests for autoplay in Studio.
2013-05-30 11:34:15 -04:00
cahrens
4920f08d2a
i18n
2013-05-29 15:15:31 -04:00
cahrens
7d07309f9d
Don't call setFixtures. Can stomp on other tests.
2013-05-29 14:03:16 -04:00
cahrens
625c6b518c
Cleanup, change how we load templates.
2013-05-28 14:07:35 -04:00
cahrens
6be9463eca
Cleanup.
2013-05-27 21:50:56 -04:00
cahrens
851ed6722a
Continue merge.
2013-05-27 20:28:56 -04:00
cahrens
17c710af83
Merge branch 'master' into feature/christina/metadata-ui
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
2013-05-27 20:08:09 -04:00
cahrens
599a215ad0
Move includes to right place.
2013-05-27 19:36:02 -04:00
Vik Paruchuri
cef401f246
Swap icon to icon-table
2013-05-24 16:20:59 -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
Vik Paruchuri
9cbb4e090d
Swap icons for font awesome
2013-05-24 14:40:33 -04:00
Vik Paruchuri
5050eab74a
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
2013-05-24 14:26:33 -04:00
Frances Botsford
dfb623a29f
removed old icon css and js files and references that are no longer needed
2013-05-24 09:01:15 -04:00
