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
Chris Dodge
7cebb873df
allow for an optional throw_on_not_found on contentstore().find() so we can clean up caller logic in the tests
2013-06-17 11:10:36 -04:00
Chris Dodge
dc94ea1041
add unit test for emptying the trashcan
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
b443629ee8
remove invalid comments
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
70ee4b8060
add unit tests for asset delete/restore
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
9b749c4201
add ajax callback entry point to remove the asset
2013-06-17 11:09:52 -04:00
Chris Dodge
3fa6e77dff
add new collection configuration to support a 'trashcan' for assets. Update class factory to allow callers to specify if they want the default set of assets or the trashcan
2013-06-17 11:09:52 -04:00
Renzo Lucioni
1e3efadc28
switch to using environment variables to get key for Segment.io
2013-06-17 10:58:37 -04:00
Peter Fogg
d8f307a50b
Merge branch 'master' into peter-fogg/remove-video-xml
2013-06-14 15:33:51 -04:00
cahrens
2cf71b7ff3
Add helper method for typing in CodeMirror, make it robust to Mac and Unix.
2013-06-14 15:12:25 -04:00
Peter Fogg
e0045499f3
Update acceptance test.
2013-06-14 14:41:33 -04:00
cahrens
21dc4d863e
Put back in some older code to save source_code property.
2013-06-14 14:10:40 -04:00
