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
Ned Batchelder
645d847bb1
Remove unused imports from cms, as detected by pylint.
2013-06-19 16:56:34 -04:00
Ned Batchelder
df6d3f9b2f
Fix strings that should be raw.
2013-06-19 16:56:34 -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
Peter Fogg
5cb456ba85
Fix merge conflict.
2013-06-17 16:49:22 -04:00
JonahStanley
15facf8fc0
Changed change_text to implement new type_in_codemirror function
2013-06-17 16:48:37 -04:00
Peter Fogg
56015e4b94
Update CHANGELOG.rst; move acceptance test methods into more appropriate files; docstring cleaning.
2013-06-17 16:47:15 -04:00
JonahStanley
46da897610
Merge branch 'master' into jonahstanley/add-courseteam-tests
...
Conflicts:
cms/envs/test.py
2013-06-17 16:43:56 -04:00
Renzo Lucioni
c05a06a885
Merge pull request #182 from edx/renzo/segment-io-auth-backport
...
Switch to using environment variables to get key for Segment.io
2013-06-17 13:40:24 -07:00
Christina Roberts
080c5e4bc1
Merge pull request #186 from edx/christina/latex_and_click
...
Bug fix for LaTeX source not saving
2013-06-17 13:36:49 -07:00
chrisndodge
c3105df9fc
Merge pull request #190 from edx/feature/cdodge/soft-delete-assets
...
need to comment out another thumbnail check due to build test environmen...
2013-06-17 13:23:56 -07:00
Chris Dodge
53f18f27b9
need to comment out another thumbnail check due to build test environment not having libjpeg installed
2013-06-17 15:59:14 -04:00
JonahStanley
25fe8e8070
Now using context files and os.path
2013-06-17 15:54:10 -04:00
Ned Batchelder
e78eb9aa66
Merge pull request #187 from edx/ned/remove-obsolete-changelogs
...
These CHANGELOGS were never used, and are now obsolete.
2013-06-17 12:46:32 -07:00
cahrens
73ba1e547e
Change code to use css_click in hopes that will make the test pass on Don's mac.
...
css_click will try clicking multiple times.
2013-06-17 15:46:10 -04:00
Renzo Lucioni
97f4291b2a
Add comment clarifying which Segment.io key is in use
2013-06-17 15:35:04 -04:00
Chris Dodge
a52f62a923
disable assertions on thumbnail generation as it puts a system requirement on libjpeg which may not be installed on the test machines
2013-06-17 14:59:48 -04:00
Don Mitchell
085a590bdd
timezone conversion: more unit tests
...
and code reorganization
2013-06-17 14:48:18 -04:00
cahrens
92fc452b34
Change the wording of problem steps to follow Given, When, Then... convention.
2013-06-17 14:30:37 -04:00
Ned Batchelder
77a9073655
These CHANGELOGS were never used, and are now obsolete.
2013-06-17 14:11:42 -04:00
cahrens
298417c732
Remove waits by adding code in click that will try the operation multiple times (thanks to Jonah).
2013-06-17 13:55:15 -04:00
Chris Dodge
0d6f213997
I think we need to add the new assets.js into the PIPELIE
2013-06-17 11:10:36 -04:00
Chris Dodge
16e476e8e4
refactored asset page related JS into it's own page
2013-06-17 11:10:36 -04:00
