Diana Huang
182d69e36c
Add cookie name to the cms settings so we don't error out
...
while looking for it
2013-05-02 17:21:49 -04:00
Jay Zoldak
fc1a22de55
Merge pull request #1921 from edx/fix/zoldak/cms-jasmine-tests
...
Remove localization middleware from jasmine test execution
2013-05-02 09:45:58 -07:00
brianhw
3650316ff5
Merge pull request #1922 from MITx/fix/cdodge/jsi18n-include
...
add leading slash to the jsi18n include
2013-05-01 13:06:38 -07:00
Chris Dodge
d807b955f7
add leading slash to the jsi18n include
2013-05-01 15:27:36 -04:00
Jay Zoldak
bdfe1cff39
Remove localization middleware from jasmine test execution
2013-05-01 11:34:28 -04:00
Jay Zoldak
f2fd90bc61
Merge pull request #1917 from MITx/fix/cale/lms-jasmine-tests
...
Fix/cale/lms jasmine tests
2013-05-01 08:23:41 -07:00
Christina Roberts
a537bd7f05
Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo
...
Fix/btalbot/studio courseinfo
2013-04-30 13:34:52 -07:00
Jay Zoldak
aa4e29d2f1
Add leanModal vendor src to files.json for cms jasmine tests. Also .gitignore compiled js from coffee specs
2013-04-30 15:22:08 -04:00
Calen Pennington
dfd369b9e9
Make ordering of js bundles during jasmine tests consistant
2013-04-30 14:09:17 -04:00
Steve Strassmann
cdfd7c807f
fix bad url for jsi18n
2013-04-29 17:13:24 -04:00
Christina Roberts
72dfd4995e
Merge pull request #1903 from MITx/fix/cdodge/dangling-verticals-on-delete
...
Fix/cdodge/dangling verticals on delete
2013-04-29 11:58:22 -07:00
Chris Dodge
d7693d96b7
unit test should just use direct store. Also remove unused import and logging.
2013-04-29 09:18:49 -04:00
Calen Pennington
8dc0df3e6b
Don't ignore the old directories for xmodule sass and coffeescript
2013-04-29 07:32:16 -04:00
Chris Dodge
7d206e020d
remove comment which is no longer valid as well as debug log messages
2013-04-26 16:13:26 -04:00
Chris Dodge
bbea8eb9f3
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/dangling-verticals-on-delete
2013-04-26 15:25:47 -04:00
Chris Dodge
55266f6e96
add a overview.yaml template and also clone that template into a newly created course
2013-04-26 13:39:22 -04:00
Chris Dodge
2e64bc33ff
make sure delete_item always uses the draft store
2013-04-26 12:37:37 -04:00
Calen Pennington
8c54d5d610
Fix accidental force push that reset master
...
Master went from 5d912b88616f05c5ec10e89b336bd1088042bba0 to
e43c2bd410
2013-04-26 10:50:53 -04:00
Chris Dodge
ead18f9fbb
undo the unit test, as per Jeh, the tests really aren't supposed to run the CMS with 'draft
...
awareness'
2013-04-26 10:30:39 -04:00
Chris Dodge
f6417b4f71
add a delete-all-versions flag to the delete_item method in the modulestores. Extend tests to verify. Still wip
2013-04-25 15:24:31 -04:00
Mark L. Chang
05c5a9401a
changed class to course
2013-04-25 13:44:14 -04:00
Calen Pennington
9d94adbd1f
Merge pull request #1871 from MITx/feature/cale/fast-dev-server
...
Speed up local development
2013-04-24 12:12:05 -07:00
cahrens
cc2d06975e
Remove duplicated StringyX definitions.
2013-04-24 14:59:32 -04:00
Brian Talbot
5681f94a96
studio - commented in the static HTML boilerplate for the course overview field - needs wiring to CodeMirror with a setVal() method
2013-04-24 14:55:04 -04:00
Steve Strassmann
dd71ae818a
ModuleStoreTestCase moved to new location
2013-04-24 11:33:47 -04:00
Steve Strassmann
111ec62bb6
merged from master
2013-04-24 10:42:35 -04:00
Steve Strassmann
8baddc0645
Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n
2013-04-24 10:41:09 -04:00
Steve Strassmann
6f10348836
addressed comments from pull request
2013-04-23 10:07:51 -04:00
Christina Roberts
a1360a2710
Merge pull request #1879 from MITx/fix/cdodge/import-can-create-draft-sequences
...
when updating the list of children of sequentials, we must use the 'dire...
2013-04-22 12:17:30 -07:00
Chris Dodge
506a9a20aa
when updating the list of children of sequentials, we must use the 'direct' store otherwise we end up with draft revisions of sequentials, which is bad
2013-04-22 10:13:33 -04:00
Brian Talbot
ba4c0b6d53
studio - removing formatting suggestion from label
2013-04-22 09:43:57 -04:00
Brian Talbot
bcdf93fbc3
studio - fixing placeholder and label values for grace period on course grading settings
2013-04-22 09:42:47 -04:00
Calen Pennington
729daf5cbf
Move xmodule asset gathering out of server startup
...
This allows us to a) compile the coffeescript and sass from xmodules
using the new out-of-band method and b) reload xmodule static content
whenever it changes, which should make devs much happier.
2013-04-18 15:19:19 -04:00
Jay Zoldak
29ce700de6
Tag CMS lettuce tests with @skip-phantom if they aren't working under phantomjs right now.
2013-04-18 10:23:03 -04:00
Jay Zoldak
8a852f90cb
Fix or skip lettuce tests to run under phantomjs and firefox
2013-04-18 10:18:35 -04:00
Jay Zoldak
8a2d08bbd6
Refactor choosing the browser for lettuce tests to settings.py
2013-04-18 10:18:35 -04:00
Calen Pennington
346aee8863
Make django-pipeline only work with raw js and css
2013-04-18 07:18:36 -04:00
Christina Roberts
a3233b67e5
Merge pull request #1869 from MITx/fix/btalbot/studio-courseemail
...
Fix/btalbot/studio courseemail
2013-04-17 11:26:40 -07:00
Mark L. Chang
0f26be2f4d
quick fix to email copy
2013-04-17 14:12:16 -04:00
Mark L. Chang
44bf60d208
copy changes, link text change
2013-04-17 14:03:29 -04:00
Brian Talbot
423fa47811
studio - reverting back to https references in the course mailto link and url display
2013-04-17 13:47:54 -04:00
Brian Talbot
b115ad46bf
studio - changed https to http in course mailto link and added that prefix to link displayed
2013-04-17 13:44:23 -04:00
Brian Talbot
33ba38b8dd
studio - prefixed course URL with https: for individual share course mailto link on settings
2013-04-17 13:38:14 -04:00
Steve Strassmann
2f84b23047
disable i18n unit test - it wont run without creating dummy strings first
2013-04-17 13:20:20 -04:00
Brian Talbot
c4e4f73373
studio - adding in course name value in the share course mailto link
2013-04-17 13:19:42 -04:00
Calen Pennington
d4df9eebac
Merge pull request #1866 from MITx/feature/cale/enable-rednose
...
Enable test colors in nosetests
2013-04-17 10:15:25 -07:00
Steve Strassmann
e76419093d
uncommit unneeded files
2013-04-17 12:25:23 -04:00
Steve Strassmann
6e34c668bb
introduce i18n
2013-04-17 11:30:29 -04:00
Calen Pennington
3cd414afbb
Merge pull request #1825 from MITx/fix/cale/gradebook
...
Fix/cale/gradebook
2013-04-17 07:37:02 -07:00
Calen Pennington
f252c62f31
Enable test colors in nosetests
...
Use setup.cfg to set up default settings when running nose tests. Enable
the rednose library to color test output.
2013-04-17 09:58:52 -04:00
