Steve Strassmann
39dd251b02
add "rake test_i18n" to rakefile; tests pass
2013-04-29 15:30:18 -04:00
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
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
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
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
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
Steve Strassmann
30b7f0ab09
undo adding .gitignore to itself
2013-04-26 15:40:53 -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
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
Calen Pennington
8c54d5d610
Fix accidental force push that reset master
...
Master went from 5d912b88616f05c5ec10e89b336bd1088042bba0 to
e43c2bd410
2013-04-26 10:50:53 -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
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
cahrens
e874de1249
Some cleanup TODOs.
2013-04-24 14:59:31 -04:00
cahrens
378b2ba7f7
Delete unused file.
2013-04-24 14:46:35 -04:00
cahrens
9d04908ad1
Remove duplicated StringyX definitions.
2013-04-24 14:40:55 -04:00
Calen Pennington
4d55f87ab1
Add comments on duplicate calls to compile_assets
2013-04-24 12:33:44 -04:00
Calen Pennington
980fb92eef
Merge pull request #1873 from MITx/feature/cale/faster-tests
...
Speed up testing by running pylint in fewer batches
2013-04-24 09:29:16 -07:00
Christina Roberts
7315855d18
Merge pull request #1868 from MITx/feature/i18n
...
Feature/i18n
2013-04-24 08:55:55 -07:00
Steve Strassmann
dd71ae818a
ModuleStoreTestCase moved to new location
2013-04-24 11:33:47 -04:00
Steve Strassmann
8ab467a9fc
add config files for PyBabel and update.py
2013-04-24 11:17:02 -04:00
cahrens
cd2fa7104a
Refer to inherited field.
2013-04-24 11:04:45 -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
cahrens
f69d38bb4c
Merge branch 'master' into feature/christina/metadata
2013-04-24 09:48:39 -04:00
