Commits · cd53dd222b466865145dbc269a26e72dc7898572 · edx / edx-platform · GitLab

29 Apr, 2013 10 commits
- Merge branch 'master' into feature/christina/fields · cd53dd22
  cahrens committed Apr 29, 2013
  
  cd53dd22 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
- 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 6 commits
- Merge pull request #1895 from MITx/bug/straz/gitignore · fdaa708f
```
undo adding .gitignore to itself
```
  Steve Strassmann committed Apr 26, 2013
  fdaa708f Browse Files
- Merge branch 'master' into feature/christina/fields · 38e232f5
  cahrens committed Apr 26, 2013
  
  38e232f5 Browse Files
- undo adding .gitignore to itself · 30b7f0ab
  Steve Strassmann committed Apr 26, 2013
  
  30b7f0ab 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
- 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
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
- Upgrade version of xblocks to get Field display_name property. · 4d2ebdce
  cahrens committed Apr 25, 2013
  
  4d2ebdce 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 21 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
- Merge pull request #1886 from MITx/fix/cale/pre-test-tasks · e43c2bd4
```
Make sure to run :predjango before gather_assets so that the xmodule_ass...
```
  Calen Pennington committed Apr 24, 2013
  e43c2bd4 Browse Files
- Make sure to run :predjango before gather_assets so that the xmodule_assets command is set up · 1371fe03
  Calen Pennington committed Apr 24, 2013
  
  1371fe03 Browse Files
- Merge pull request #1871 from MITx/feature/cale/fast-dev-server · 9d94adbd
```
Speed up local development
```
  Calen Pennington committed Apr 24, 2013
  9d94adbd Browse Files
- Delete unused file. · 45f86b66
  cahrens committed Apr 24, 2013
  
  45f86b66 Browse Files
- Remove duplicated StringyX definitions. · cc2d0697
  cahrens committed Apr 24, 2013
  
  cc2d0697 Browse Files
- Refer to inherited field. · 9e988633
  cahrens committed Apr 24, 2013
  
  9e988633 Browse Files
- Some cleanup TODOs. · e874de12
  cahrens committed Apr 24, 2013
  
  e874de12 Browse Files
- Delete unused file. · 378b2ba7
  cahrens committed Apr 24, 2013
  
  378b2ba7 Browse Files
- Remove duplicated StringyX definitions. · 9d04908a
  cahrens committed Apr 24, 2013
  
  9d04908a Browse Files
- Add comments on duplicate calls to compile_assets · 4d55f87a
  Calen Pennington committed Apr 24, 2013
  
  4d55f87a Browse Files
- Merge pull request #1873 from MITx/feature/cale/faster-tests · 980fb92e
```
Speed up testing by running pylint in fewer batches
```
  Calen Pennington committed Apr 24, 2013
  980fb92e Browse Files
- Merge pull request #1868 from MITx/feature/i18n · 7315855d
```
Feature/i18n
```
  Christina Roberts committed Apr 24, 2013
  7315855d Browse Files
- ModuleStoreTestCase moved to new location · dd71ae81
  Steve Strassmann committed Apr 24, 2013
  
  dd71ae81 Browse Files
- add config files for PyBabel and update.py · 8ab467a9
  Steve Strassmann committed Apr 24, 2013
  
  8ab467a9 Browse Files
- Refer to inherited field. · cd2fa710
  cahrens committed Apr 24, 2013
  
  cd2fa710 Browse Files
- merged from master · 111ec62b
  Steve Strassmann committed Apr 24, 2013
  
  111ec62b Browse Files
- Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n · 8baddc06
  Steve Strassmann committed Apr 24, 2013
  
  8baddc06 Browse Files
- Merge branch 'master' into feature/christina/metadata · f69d38bb
  cahrens committed Apr 24, 2013
  
  f69d38bb Browse Files
- Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs · 57427f9a
```
use new API verbs
```
  Kevin Chugh committed Apr 24, 2013
  57427f9a Browse Files