Sarina Canelake
f95331dcc1
fix more pep8 violations
2013-04-29 15:01:11 -04:00
Sarina Canelake
6993daf116
Fix pep8 violations
2013-04-29 15:01:05 -04:00
Sarina Canelake
46792c82de
Remove debugging print statements
2013-04-29 15:00:54 -04:00
Sarina Canelake
ed43afb08f
Add additional unit test comment
2013-04-29 15:00:45 -04:00
Sarina Canelake
696879bd26
Add unit tests for formularesponse type
2013-04-29 15:00:36 -04:00
Sarina Canelake
c79843c541
Add factorial as a default function for formula response
2013-04-29 15:00:26 -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
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
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
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
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
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
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
Kevin Chugh
57427f9ac5
Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs
...
use new API verbs
2013-04-24 06:47:38 -07:00
