Calen Pennington
|
dfd369b9e9
|
Make ordering of js bundles during jasmine tests consistant
|
2013-04-30 14:09:17 -04:00 |
|
Christina Roberts
|
4c97f92245
|
Merge pull request #1916 from MITx/fix/cdodge/more-broken-template-images
add more images to support templates
|
2013-04-30 09:50:41 -07:00 |
|
Chris Dodge
|
c5d520574d
|
also move the MIT dome image in Latex to be in our source pack
|
2013-04-30 12:02:58 -04:00 |
|
Chris Dodge
|
1f1a6e3ec5
|
add more images to support templates
|
2013-04-30 11:46:49 -04:00 |
|
Christina Roberts
|
1e8619288a
|
Merge pull request #1912 from MITx/fix/cdodge/broken-template-image
add dependent image for the image response template
|
2013-04-30 08:11:11 -07:00 |
|
Chris Dodge
|
02ed9f26c4
|
add dependent image for the image response template
|
2013-04-30 10:07:42 -04:00 |
|
Steve Strassmann
|
d4ec592a58
|
Merge pull request #1910 from MITx/bug/straz/i18n
fix bad url for jsi18n
|
2013-04-29 14:19:08 -07:00 |
|
Steve Strassmann
|
cdfd7c807f
|
fix bad url for jsi18n
|
2013-04-29 17:13:24 -04:00 |
|
Diana Huang
|
32b30cef92
|
Merge pull request #1909 from MITx/diana/accessibility-update
Add accessibility text to the Contact page.
|
2013-04-29 13:58:43 -07:00 |
|
Diana Huang
|
85ebdff7c2
|
Merge pull request #1905 from MITx/fix/sarina/new_formularesponse_defaults
Fix/sarina/new formularesponse defaults
|
2013-04-29 13:56:43 -07:00 |
|
Diana Huang
|
befe7beccb
|
Add accessibility text to the Contact page.
|
2013-04-29 16:55:29 -04:00 |
|
Don Mitchell
|
cbf9acfefb
|
Merge pull request #1896 from MITx/feature/straz/i18n
Feature/straz/i18n - rake tasks to generate strings
|
2013-04-29 13:32:44 -07:00 |
|
Steve Strassmann
|
39dd251b02
|
add "rake test_i18n" to rakefile; tests pass
|
2013-04-29 15:30:18 -04:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 acfd0d9fd6, reversing
changes made to e4194c99d8.
|
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 57427f9ac5, reversing
changes made to 37621c26cd.
|
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 |
|