Commits · cbf9acfefb89d52b2387f788b78baf8f180a7b18 · edx / edx-platform · GitLab

29 Apr, 2013 20 commits
- Merge pull request #1896 from MITx/feature/straz/i18n · cbf9acfe
```
Feature/straz/i18n - rake tasks to generate strings
```
  Don Mitchell committed Apr 29, 2013
  cbf9acfe Browse Files
- add "rake test_i18n" to rakefile; tests pass · 39dd251b
  Steve Strassmann committed Apr 29, 2013
  
  39dd251b Browse Files
- Merge pull request #1903 from MITx/fix/cdodge/dangling-verticals-on-delete · 72dfd499
```
Fix/cdodge/dangling verticals on delete
```
  Christina Roberts committed Apr 29, 2013
  72dfd499 Browse Files
- more robust cleanup of default po files · 8358e866
  Steve Strassmann committed Apr 29, 2013
  
  8358e866 Browse Files
- rm test dir (replaced by tests dir) · e2872441
  Steve Strassmann committed Apr 29, 2013
  
  e2872441 Browse Files
- rename test dir to tests; add SkipTest for test_extract.py · d63a37c2
  Steve Strassmann committed Apr 29, 2013
  
  d63a37c2 Browse Files
- added test cases for converter and dummy · 393e6ffc
  Steve Strassmann committed Apr 29, 2013
  
  393e6ffc Browse Files
- integrate dummy string tools; added rake tasks and unit tests · c00d71d4
  Steve Strassmann committed Apr 29, 2013
  
  c00d71d4 Browse Files
- sync with master · 2e81fc51
  Steve Strassmann committed Apr 29, 2013
  
  2e81fc51 Browse Files
- addressed Don\'s comments on pull request · d55d5c93
  Steve Strassmann committed Apr 29, 2013
  
  d55d5c93 Browse Files
- Merge pull request #1893 from MITx/fix/cale/assets-order · 143ad0ca
```
Sort the css and js assets by numerical index
```
  Christina Roberts committed Apr 29, 2013
  143ad0ca Browse Files
- unit test should just use direct store. Also remove unused import and logging. · d7693d96
  Chris Dodge committed Apr 29, 2013
  
  d7693d96 Browse Files
- Fix coffeescript error in video spec file · 8c4526ed
  Calen Pennington committed Apr 29, 2013
  
  8c4526ed Browse Files
- Make tests install coffee locally · 436d95bf
  Calen Pennington committed Apr 29, 2013
  
  436d95bf Browse Files
- Add docs to the prereqs rake commands · b4e9de67
  Calen Pennington committed Apr 29, 2013
  
  b4e9de67 Browse Files
- Fail hard if one of the asset compilation steps fails · a2aacce2
  Calen Pennington committed Apr 29, 2013
  
  a2aacce2 Browse Files
- Don't ignore the old directories for xmodule sass and coffeescript · 8dc0df3e
  Calen Pennington committed Apr 29, 2013
  
  8dc0df3e Browse Files
- Ignore the node_modules directory · 7e07b951
  Calen Pennington committed Apr 29, 2013
  
  7e07b951 Browse Files
- Use local install of coffee · fb28384d
  Calen Pennington committed Apr 29, 2013
  
  fb28384d Browse Files
- Sort the css and js assets by numerical index · 4a397972
  Calen Pennington committed Apr 29, 2013
  
  4a397972 Browse Files
26 Apr, 2013 15 commits
- rake tasks · 3fd004e2
  Steve Strassmann committed Apr 26, 2013
  
  3fd004e2 Browse Files
- remove comment which is no longer valid as well as debug log messages · 7d206e02
  Chris Dodge committed Apr 26, 2013
  
  7d206e02 Browse Files
- pull from master · 36a2f337
  Steve Strassmann committed Apr 26, 2013
  
  36a2f337 Browse Files
- Merge pull request #1895 from MITx/bug/straz/gitignore · fdaa708f
```
undo adding .gitignore to itself
```
  Steve Strassmann committed Apr 26, 2013
  fdaa708f Browse Files
- undo adding .gitignore to itself · 30b7f0ab
  Steve Strassmann committed Apr 26, 2013
  
  30b7f0ab Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/dangling-verticals-on-delete · bbea8eb9
  Chris Dodge committed Apr 26, 2013
  
  bbea8eb9 Browse Files
- testing · 1ca76384
  Steve Strassmann committed Apr 26, 2013
  
  1ca76384 Browse Files
- test_generate and test_extract · d9381ecc
```
both tests work
```
  Steve Strassmann committed Apr 26, 2013
  d9381ecc Browse Files
- git pull master · 87205e23
  Steve Strassmann committed Apr 26, 2013
  
  87205e23 Browse Files
- implement extract and generate · 87e0b853
```
ran tests successfully with
$cd i18n; python -m unittest test
```
  Steve Strassmann committed Apr 26, 2013
  87e0b853 Browse Files
- Revert "fix merge conflict" · 2df3fe93
```
This reverts commit acfd0d9f, reversing
changes made to e4194c99.
```
  Diana Huang committed Apr 26, 2013
  2df3fe93 Browse Files
- Revert "Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs" · 5560a4ad
```
This reverts commit 57427f9a, reversing
changes made to 37621c26.
```
  Diana Huang committed Apr 26, 2013
  5560a4ad Browse Files
- make sure delete_item always uses the draft store · 2e64bc33
  Chris Dodge committed Apr 26, 2013
  
  2e64bc33 Browse Files
- Fix accidental force push that reset master · 8c54d5d6
```
Master went from 5d912b88616f05c5ec10e89b336bd1088042bba0 to
e43c2bd4. 5d912b8a is a merge commit
that merged a branch onto master, so I am merging the same commit
back into master.
```
  Calen Pennington committed Apr 26, 2013
  8c54d5d6 Browse Files
- undo the unit test, as per Jeh, the tests really aren't supposed to run the CMS with 'draft · ead18f9f
```
awareness'
```
  Chris Dodge committed Apr 26, 2013
  ead18f9f Browse Files
25 Apr, 2013 3 commits
- Merge pull request #1889 from MITx/diana/clean-login-methods · 1b344ff0
```
Move Pearson login to external_auth
```
  Diana Huang committed Apr 25, 2013
  1b344ff0 Browse Files
- add a delete-all-versions flag to the delete_item method in the modulestores.… · f6417b4f
```
add a delete-all-versions flag to the delete_item method in the modulestores. Extend tests to verify. Still wip
```
  Chris Dodge committed Apr 25, 2013
  f6417b4f Browse Files
- Move the testcenter login to external_auth · 886e7434
```
* hide the login behind a setting that is turned off by default
* clean out some of the outdated settings and hardcoded test strings
```
  Diana Huang committed Apr 25, 2013
  886e7434 Browse Files
24 Apr, 2013 2 commits
- merge · a7ccbb17
  cahrens committed Apr 24, 2013
  
  a7ccbb17 Browse Files
- Don't explicitly declare display_name. · c7962cf0
  cahrens committed Apr 24, 2013
  
  c7962cf0 Browse Files