Peter Fogg
512269f842
Add descriptor for modules with empty XML data.
...
This allows a more general approach to modules such as word_cloud and
video which have no XML data (it's all store in metadata), but use
XmlDescriptor for backwards compatibility. They now generate an empty
tag on export, and clear out empty tags on import.
Also a small change to the video module as a result -- if it's asked
to parse empty XML data, it won't try to parse anything.
2013-07-30 13:53:38 -04:00
David Baumgold
fba50589ff
Add a lettuce test for course team admins granting admin status
2013-07-30 13:48:43 -04:00
Brian Talbot
c82ad6cdaa
Studio: revises badge and create call to action design
2013-07-30 13:19:39 -04:00
Brian Talbot
2161961f64
Studio: corrects legend element copy on new user form
2013-07-30 13:18:56 -04:00
Don Mitchell
6a7fa41e03
Merge pull request #526 from edx/dhm/yacibug
...
Yet another Course Info bug
2013-07-30 09:54:16 -07:00
JonahStanley
dd0f7bc310
Fixed indenting and cleaned up if clause
2013-07-30 12:46:42 -04:00
Your Name
21f1e58ce7
fix for underscore template issue for xmodules
2013-07-30 12:12:17 -04:00
Carlos Andrés Rocha
5b30c06b75
Merge pull request #480 from edx/rocha/show-dates-in-instructor-analytics
...
Show dates when the data was collected in the instructor dashboard panel
2013-07-30 09:11:58 -07:00
Don Mitchell
1fb4354a12
Wrap malformed course_update rather than silently failing update
2013-07-30 12:08:57 -04:00
Don Mitchell
27d32f1932
Test reproducing the error: malformed course_update silently failing update
2013-07-30 12:01:15 -04:00
Calen Pennington
487c9a4f10
Merge pull request #524 from edx/cale/external_discussion_tab
...
Cale/external discussion tab
2013-07-30 08:59:09 -07:00
Kevin Chugh
4de1ab2de8
Merge pull request #523 from edx/feature/kevin/notifications_panel_xmodule_workaround
...
fix for underscore template issue for xmodules
2013-07-30 08:46:40 -07:00
Julian Arni
6ee5eb2e4b
Cherry-pick and fix Toddi's commit.
...
Which was giving git endless confusion on merge.
2013-07-30 11:45:43 -04:00
Calen Pennington
5e4cf50086
Make sure that all tab types used by the default for the course.tabs field work correctly
2013-07-30 11:32:31 -04:00
David Baumgold
71bb527022
Merge pull request #515 from edx/db/template-improvements
...
Studio: Improvements for loading JS templates on Advanced Settings and Course Updates pages
2013-07-30 08:24:54 -07:00
David Baumgold
4f5c2cce75
Re-added missing render() call
2013-07-30 11:22:13 -04:00
Carlos Andrés Rocha
b8d1a138ae
Show dates when the data was collected in the instructor dashboard panel
2013-07-30 11:16:27 -04:00
Your Name
56c8057ed0
fix for underscore template issue for xmodules
2013-07-30 10:34:36 -04:00
Julian Arni
21fcdc7f3d
Rename data docs straggler
2013-07-30 10:30:44 -04:00
Peter Fogg
f355e4a8f4
More general solution to word cloud export problems.
2013-07-30 10:29:12 -04:00
Peter Fogg
0967cb0d9d
Fix word cloud modules not exporting correctly.
2013-07-30 10:29:12 -04:00
Julian Arni
c0f6ec6cf5
Merge branch 'master' into jkarni/docs-merge
...
Conflicts:
docs/source/conf.py
2013-07-30 10:23:35 -04:00
David Ormsbee
b65200c2a8
Merge branch 'master' into rc/2013-07-30
2013-07-30 08:34:21 -04:00
Jim Abramson
77a796e2c7
Merge pull request #520 from edx/feature/kevin/email_notifications_panel
...
Feature/kevin/email notifications panel
2013-07-30 05:30:56 -07:00
Diana Huang
0d10a872c8
Merge pull request #499 from edx/diana/login-redirect
...
Only redirect when redirect url is an internal page.
2013-07-30 05:29:39 -07:00
Jim Abramson
98fe2d495a
Merge pull request #517 from edx/bug/jsa/edx_api_key
...
add EDX_API_KEY to aws.py
2013-07-30 04:05:39 -07:00
Vasyl Nakvasiuk
d6f794c4d7
gst module: add configuration and render properties
2013-07-30 11:59:41 +03:00
jsa
05f31f8bf1
Merge branch 'feature/kevin/email_notifications_panel' of https://github.com/edx/edx-platform into feature/kevin/email_notifications_panel
2013-07-30 02:31:05 -04:00
jsa
7a7c070999
notification_prefs/views: correct docstring
2013-07-30 02:30:45 -04:00
Kevin Chugh
e1e591f8bf
address code review comments
2013-07-30 01:55:20 -04:00
Kevin Chugh
4f7edbf67d
fix notifications URL
2013-07-30 01:50:33 -04:00
Kevin Chugh
c3e609fe40
fix merge conflict
2013-07-30 01:44:40 -04:00
Kevin Chugh
5c91edd4a5
update coffeescript to use new status url
2013-07-30 01:43:49 -04:00
jsa
908fd46f4d
notification_prefs: add ajax endpoint to get preference status
2013-07-30 01:43:01 -04:00
Kevin Chugh
986a2cdec2
Merge branch 'feature/kevin/email_notifications_panel' of github.com:edx/edx-platform into feature/kevin/email_notifications_panel
2013-07-30 01:19:31 -04:00
Kevin Chugh
803b92fc9a
add ajax endpoint for getting notifications status
2013-07-30 01:19:15 -04:00
jsa
79994b5d69
Merge branch 'feature/kevin/email_notifications_panel' of https://github.com/edx/edx-platform into feature/kevin/email_notifications_panel
2013-07-30 00:56:06 -04:00
Kevin Chugh
8f98a1c2be
remove failing jasmine tests and print statements
2013-07-30 00:46:47 -04:00
Mark L. Chang
8b6c2787f6
copy changes
2013-07-30 00:14:44 -04:00
jsa
0207255e1f
fix strange comment typo
2013-07-30 00:14:10 -04:00
Kevin Chugh
99f235ec56
first pass at jasmine tests
2013-07-30 00:13:03 -04:00
Kevin Chugh
62f6e2d52b
home button working, default to home when no thread selected
2013-07-29 23:33:50 -04:00
Your Name
47dbf2e6cb
updates but getting status and setting status not working
2013-07-29 18:33:19 -04:00
jsa
06eb5cdd93
Merge branch 'feature/kevin/email_notifications_panel' of https://github.com/edx/edx-platform into feature/kevin/email_notifications_panel
2013-07-29 18:13:46 -04:00
jsa
33d4ae69dd
add feature flag to enable/disable discussion home panel
2013-07-29 18:13:12 -04:00
marco
b7d6d77464
visual cleanup for email icon and discussion context label post branch merge
2013-07-29 17:49:34 -04:00
Brian Talbot
611dab077f
Studio: places 'add team member' call to course team view
2013-07-29 17:29:15 -04:00
David Ormsbee
3d8b32bb69
Reverting 89c48f4a30 to unbreak codejail for this release.
2013-07-29 17:18:52 -04:00
David Ormsbee
629b3d4d9d
Merge branch 'master' into rc/2013-07-30
2013-07-29 17:15:35 -04:00
Christina Roberts
f2a9d6fb8e
Merge pull request #519 from edx/christina/course_creators
...
Change in signature for add_user_with_status_unrequested.
2013-07-29 14:14:35 -07:00
