David Baumgold
d632ffe9cd
Make Course Team lettuce tests gender-neutral
...
Because it bothers me, although I don't expect anyone else to care.
2013-06-21 14:52:31 -04:00
JonahStanley
a52d0beb41
Got rid of leftover set_trace
2013-06-20 17:00:46 -04:00
JonahStanley
ec4547b51e
Merge branch 'master' into jonahstanley/add-courseteam-tests
2013-06-20 16:55:37 -04:00
JonahStanley
70d48e2e9f
Now referencing css element
2013-06-20 16:40:13 -04:00
Christina Roberts
e84ee873d0
Merge pull request #230 from edx/christina/pep8-again
...
Pep8 cleaning.
2013-06-20 13:34:50 -07:00
cahrens
34f8c044b8
Pep8 cleaning.
2013-06-20 16:06:00 -04:00
JonahStanley
b9d79aea60
A bunch of pylint fixes and explicit use case for uploads/test
2013-06-20 15:55:53 -04:00
Peter Fogg
0ef4390aff
Merge pull request #132 from edx/peter-fogg/remove-video-xml
...
Peter fogg/remove video xml
2013-06-20 12:40:13 -07: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
Peter Fogg
1d8d507f49
Merge in master (again).
2013-06-20 12:21:16 -04:00
Christina Roberts
1a5b58acd6
Merge pull request #210 from edx/christina/course-settings-drupal
...
On marketing site, disable course settings options that do not work.
2013-06-20 09:15:18 -07:00
Jonah Stanley
9b478ff3e3
Merge pull request #115 from edx/jonahstanley/add-gradingsettings-tests
...
Added testing for grading settings
2013-06-20 08:31:31 -07:00
cahrens
a498fa52ba
Modify after UX text changes.
2013-06-20 11:29:31 -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
cahrens
9e69586bb3
pep8 fixes.
2013-06-20 10:31:44 -04:00
Peter Fogg
9c7be8b1dc
Fix merge conflict in CHANGELOG.rst.
2013-06-20 09:58:22 -04:00
Brian Talbot
604e820211
studio - revises styling of in-context notices UI
2013-06-20 09:23:56 -04:00
Brian Talbot
419c5e7a5c
studio - removes course settings promo link and notice icons
2013-06-20 09:23:16 -04:00
Christina Roberts
6fe56ac9f7
Merge pull request #205 from edx/christina/advanced-settings-test
...
Sometimes the first click doesn't actually work, so call click up to 5 t...
2013-06-20 05:48:13 -07: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
d2f0d85085
studio - adds in basic rules for notices UI
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
29d93aff89
pep8 fixes.
2013-06-19 16:34:23 -04:00
cahrens
51fc6280b6
Don't concatenate together multiple strings.
2013-06-19 16:23:00 -04:00
cahrens
6643994348
Add an optional success lambda to css_click.
2013-06-19 13:51:40 -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
JonahStanley
0524ff53cc
Merge branch 'master' into jonahstanley/add-courseteam-tests
...
Conflicts:
cms/djangoapps/contentstore/features/common.py
2013-06-19 11:29:43 -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
Don Mitchell
1ff022e181
Incidental pep8 changes
2013-06-18 17:25:06 -04:00
cahrens
9878c75b7a
Sometimes the first click doesn't actually work, so call click up to 5 times.
...
This seems to fix the sporadic failure (at least on my machine).
2013-06-18 15:22:25 -04:00
Peter Fogg
7633968701
Merge branch 'master' into peter-fogg/remove-video-xml
2013-06-18 15:07:58 -04:00
JonahStanley
9dc1262719
This was causing some failures in the unit tests for some reason
2013-06-18 13:58:58 -04:00
chrisndodge
c74220779e
Merge pull request #201 from edx/fix/cdodge/fix-busted-JS-pipeline
...
remove assets.js from the PIPELINE_JS since it seems to cause that file ...
2013-06-18 10:21:51 -07:00
JonahStanley
0b51f1bbba
Merge branch 'master' into jonahstanley/add-courseteam-tests
2013-06-18 13:20:13 -04:00
JonahStanley
85e3062225
Fixed click to comply to new css_click
2013-06-18 12:51:18 -04:00
JonahStanley
ce3bc1e1cb
Merge branch 'master' into jonahstanley/add-gradingsettings-tests
2013-06-18 12:47:30 -04:00
Don Mitchell
b151d6c155
Merge pull request #183 from edx/dhm/timeconv/bug0
...
Fix a few remaining tz naive dates
2013-06-18 09:09:24 -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
02626ffda7
Removed unused test code
2013-06-18 11:27:13 -04:00
JonahStanley
650a2ba423
Added deletion tests
2013-06-18 11:20:23 -04:00
Chris Dodge
c129fa4a77
remove assets.js from the PIPELINE_JS since it seems to cause that file to be loaded twice
2013-06-18 11:17:29 -04:00
David Baumgold
fb0d16afe2
Only show at most 300 chars in AJAX error notification
2013-06-18 10:23:44 -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
Peter Fogg
8ae22cf3ed
Fix merge conflict in CHANGELOG.rst.
2013-06-18 09:01:37 -04:00
pdehaye
c1dc2628a0
need to import os
2013-06-18 00:52:23 +02:00
John Jarvis
a3f45bd94a
moving segment io setting below auth.json
2013-06-17 17:45:22 -04:00
