Steve Strassmann
8358e866cf
more robust cleanup of default po files
2013-04-29 12:45:07 -04:00
Steve Strassmann
e287244151
rm test dir (replaced by tests dir)
2013-04-29 11:49:51 -04:00
cahrens
cd53dd222b
Merge branch 'master' into feature/christina/fields
2013-04-29 11:48:41 -04:00
Steve Strassmann
d63a37c252
rename test dir to tests; add SkipTest for test_extract.py
2013-04-29 11:47:56 -04:00
Steve Strassmann
393e6ffc23
added test cases for converter and dummy
2013-04-29 11:35:01 -04:00
Steve Strassmann
c00d71d422
integrate dummy string tools; added rake tasks and unit tests
2013-04-29 11:32:22 -04:00
marco
80d46401bf
Merge branch 'master' into ux/marco/studio-componentsettings
2013-04-29 10:19:22 -04:00
marco
45a665c7c7
added mode bar up top
2013-04-29 10:18:56 -04:00
Steve Strassmann
2e81fc5152
sync with master
2013-04-29 09:55:12 -04:00
Steve Strassmann
d55d5c9351
addressed Don\'s comments on pull request
2013-04-29 09:54:32 -04:00
Christina Roberts
143ad0ca4b
Merge pull request #1893 from MITx/fix/cale/assets-order
...
Sort the css and js assets by numerical index
2013-04-29 06:46:45 -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
8c4526ed07
Fix coffeescript error in video spec file
2013-04-29 07:32:16 -04:00
Calen Pennington
436d95bfab
Make tests install coffee locally
2013-04-29 07:32:16 -04:00
Calen Pennington
b4e9de67e0
Add docs to the prereqs rake commands
2013-04-29 07:32:16 -04:00
Calen Pennington
a2aacce244
Fail hard if one of the asset compilation steps fails
2013-04-29 07:32:16 -04:00
Calen Pennington
8dc0df3e6b
Don't ignore the old directories for xmodule sass and coffeescript
2013-04-29 07:32:16 -04:00
Calen Pennington
7e07b951b0
Ignore the node_modules directory
2013-04-29 07:32:16 -04:00
Calen Pennington
fb28384de7
Use local install of coffee
2013-04-29 07:31:48 -04:00
Calen Pennington
4a397972fa
Sort the css and js assets by numerical index
2013-04-29 07:31:48 -04:00
Steve Strassmann
3fd004e2fe
rake tasks
2013-04-26 16:54:23 -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
Steve Strassmann
36a2f337bf
pull from master
2013-04-26 15:50:56 -04:00
Steve Strassmann
fdaa708f80
Merge pull request #1895 from MITx/bug/straz/gitignore
...
undo adding .gitignore to itself
2013-04-26 12:48:18 -07:00
cahrens
38e232f56f
Merge branch 'master' into feature/christina/fields
2013-04-26 15:42:05 -04:00
Steve Strassmann
30b7f0ab09
undo adding .gitignore to itself
2013-04-26 15:40:53 -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
Steve Strassmann
1ca763844b
testing
2013-04-26 15:25:00 -04:00
Steve Strassmann
d9381eccf2
test_generate and test_extract
...
both tests work
2013-04-26 15:01:59 -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
Steve Strassmann
87205e23da
git pull master
2013-04-26 13:29:14 -04:00
Steve Strassmann
87e0b85363
implement extract and generate
...
ran tests successfully with
$cd i18n; python -m unittest test
2013-04-26 13:20:29 -04:00
Diana Huang
2df3fe9344
Revert "fix merge conflict"
...
This reverts commit acfd0d9fd6e4194c99d8
2013-04-26 12:40:35 -04:00
Diana Huang
5560a4add4
Revert "Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs"
...
This reverts commit 57427f9ac537621c26cd
2013-04-26 12:40:02 -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
Diana Huang
1b344ff06e
Merge pull request #1889 from MITx/diana/clean-login-methods
...
Move Pearson login to external_auth
2013-04-25 12:51:21 -07: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
cahrens
4d2ebdce8f
Upgrade version of xblocks to get Field display_name property.
2013-04-25 11:44:52 -04:00
Diana Huang
886e74342d
Move the testcenter login to external_auth
...
* hide the login behind a setting that is turned off by default
* clean out some of the outdated settings and hardcoded test strings
2013-04-25 11:12:19 -04:00
cahrens
a7ccbb174b
merge
2013-04-24 17:05:08 -04:00
cahrens
c7962cf07b
Don't explicitly declare display_name.
2013-04-24 16:41:58 -04:00
Calen Pennington
e43c2bd410
Merge pull request #1886 from MITx/fix/cale/pre-test-tasks
...
Make sure to run :predjango before gather_assets so that the xmodule_ass...
2013-04-24 13:13:51 -07:00
Calen Pennington
1371fe0308
Make sure to run :predjango before gather_assets so that the xmodule_assets command is set up
2013-04-24 15:30:16 -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
45f86b662a
Delete unused file.
2013-04-24 14:59:32 -04:00
cahrens
cc2d06975e
Remove duplicated StringyX definitions.
2013-04-24 14:59:32 -04:00
cahrens
9e9886339a
Refer to inherited field.
2013-04-24 14:59:31 -04:00
