Commits · d9381eccf253369c043179e100b015797428262b · edx / edx-platform · GitLab

26 Apr, 2013 6 commits
- 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
- 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 2 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
- 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 24 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
- Merge pull request #1884 from MITx/feature/cale/histogram-rendering · 37621c26
```
Only render a histogram for modules that have scores associated with the...
```
  ichuang committed Apr 24, 2013
  37621c26 Browse Files
- Merge pull request #1882 from MITx/doc/showanswer · 9be7f8fc
```
Doc/showanswer
```
  Calen Pennington committed Apr 24, 2013
  9be7f8fc Browse Files
- Merge pull request #1858 from MITx/feature/ichuang/masquerade-v3 · 621a9355
```
Allow course staff to masquerade as students in viewing courseware
```
  Calen Pennington committed Apr 24, 2013
  621a9355 Browse Files
23 Apr, 2013 8 commits
- more showanswer possibilities -> doc · a307696d
  ichuang committed Apr 23, 2013
  
  a307696d Browse Files
- add more documentation about `showanswer` policy key · bcce4107
  ichuang committed Apr 23, 2013
  
  bcce4107 Browse Files
- use new API verbs · 67f57a71
  Your Name committed Apr 23, 2013
  
  67f57a71 Browse Files
- Merge pull request #1877 from MITx/feature/will/update_testing_docs · 57fde4ba
```
Feature/will/update testing docs
```
  Will Daly committed Apr 23, 2013
  57fde4ba Browse Files
- fix merge conflict · acfd0d9f
  Your Name committed Apr 23, 2013
  
  acfd0d9f Browse Files
- Merge branch 'master' of github.com:MITx/mitx · e4194c99
  Your Name committed Apr 23, 2013
  
  e4194c99 Browse Files
- Merge pull request #1731 from MITx/feature/kevin/pinning_inline · d6bc426e
```
Feature/kevin/pinning inline
```
  Kevin Chugh committed Apr 23, 2013
  d6bc426e Browse Files
- addressed comments from pull request · 6f103488
  Steve Strassmann committed Apr 23, 2013
  
  6f103488 Browse Files