Don Mitchell
1ff022e181
Incidental pep8 changes
2013-06-18 17:25:06 -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
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
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
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
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
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
cahrens
2cf71b7ff3
Add helper method for typing in CodeMirror, make it robust to Mac and Unix.
2013-06-14 15:12:25 -04:00
cahrens
21dc4d863e
Put back in some older code to save source_code property.
2013-06-14 14:10:40 -04:00
cahrens
fae8fd3841
Merge branch 'master' into feature/christina/unify-fields
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/fields.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/test_fields.py
requirements/edx/github.txt
2013-06-13 10:55:13 -04:00
cahrens
0f8d7c744c
Test cleanup.
2013-06-13 10:42:23 -04:00
Peter Fogg
d52329be23
Merge pull request #128 from edx/peter-fogg/fix-video-captions-setting
...
Make video captions respect course author's setting.
2013-06-13 06:32:33 -07:00
cahrens
6e92ddf3dd
Cannot set String field to a dict anymore!
2013-06-12 17:07:41 -04:00
cahrens
86d952bf91
Change to putting serialize/de-serialize directly in xml_module.
2013-06-12 13:34:38 -04:00
Brian Talbot
832da3ad48
syncs styling rules for buttons/inputs to ensure consistency
2013-06-12 11:43:59 -04:00
chrisndodge
e685ff7125
Merge pull request #129 from edx/fix/cdodge/cancel-asset-upload-crash
...
[STUD-256] Seems like on chrome when cancel is hit in the file chooser, the 'change...
2013-06-11 12:52:56 -07:00
Peter Fogg
45527bf921
Reword acceptance test.
2013-06-11 15:07:01 -04:00
Chris Dodge
be6fbf913e
make local variable
2013-06-11 14:36:04 -04:00
Chris Dodge
1602f592b4
use better API
2013-06-11 14:32:33 -04:00
Peter Fogg
0149766710
Add acceptance test to ensure that show_captions has the right effect.
2013-06-11 14:07:40 -04:00
Chris Dodge
fa8ae228bf
Seems like on chrome when cancel is hit in the file chooser, the 'changed' event is fired and startUpload() was being called. We need to check to see if the upload file is blank and - if so - just return immediately out of the function
2013-06-11 13:38:01 -04:00
Don Mitchell
44061f9c04
Revert bad merge
2013-06-10 17:16:35 -04:00
Don Mitchell
e4757452f0
Partial implementation of means to get xmodule from descriptor and
...
attempt to test xmodule_modified (see fixme)
Removed obsolete else clause from before conversion
Ensure factories use datetime not struct_time for start date
Added more unit tests for settings encoder
2013-06-10 17:16:35 -04:00
Don Mitchell
e7c4e5f4d3
Fixed use_tz not being effective in cms
2013-06-10 17:16:35 -04:00
Don Mitchell
168cb306d3
Move tz_aware into connection config rather than settings.
...
Make django use_tz
2013-06-10 17:16:35 -04:00
