Commits · 064d21c4e28e8832fa56131d91f4a5330b6ced86 · edx / edx-platform · GitLab

14 May, 2013 5 commits
- clean up of editor header styling · 064d21c4
  marco committed May 14, 2013
  
  064d21c4 Browse Files
- Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into… · 69832c57
```
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
```
  cahrens committed May 14, 2013
  69832c57 Browse Files
- Number view. · 82899d6d
  cahrens committed May 14, 2013
  
  82899d6d Browse Files
- updated unit styling, added polyfill js library, updated javascript handling for modes swap · 8d8c8d83
  marco committed May 14, 2013
  
  8d8c8d83 Browse Files
- added number metadata template, cleaned up editor theme ui bordering and settings styles · 0aaaf84f
  marco committed May 14, 2013
  
  0aaaf84f Browse Files
13 May, 2013 35 commits
- Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into… · f42850c8
```
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
```
  cahrens committed May 13, 2013
  f42850c8 Browse Files
- Initial cleanup of open_ended_module and peer_grading_module. · aaffee50
  cahrens committed May 13, 2013
  
  aaffee50 Browse Files
- cleaned up references to proper elements in settings header mode buttons · cb401930
  marco committed May 13, 2013
  
  cb401930 Browse Files
- Merge branch 'master' into feature/christina/metadata-ui · 2a8b8e20
  cahrens committed May 13, 2013
  
  2a8b8e20 Browse Files
- Support display names for choices. · 8c36918a
  cahrens committed May 13, 2013
  
  8c36918a Browse Files
- Merge pull request #2004 from edx/jarv/repo-rename · 4774a1e9
```
repo rename to edx-platform
```
  jarv committed May 13, 2013
  4774a1e9 Browse Files
- Merge pull request #2022 from edx/kill-submodules · f0bd73b2
```
Install phantom-jasmine via npm, rather than git submodules
```
  David Baumgold committed May 13, 2013
  f0bd73b2 Browse Files
- Merge pull request #2018 from edx/fix/peter/numerical_infinite_bug · 554d342f
```
Fix infinity bug for numericalresponse; add tests
```
  Peter Baratta committed May 13, 2013
  554d342f Browse Files
- Merge pull request #1991 from edx/feature/vik/oe-tests · e122efc5
```
Feature/vik/oe tests
```
  VikParuchuri committed May 13, 2013
  e122efc5 Browse Files
- Merge pull request #2013 from edx/feature/straz/views · 4e922778
```
Feature/straz/views - refactor views.py
```
  Steve Strassmann committed May 13, 2013
  4e922778 Browse Files
- whitespace for pep8 · 96c37089
  Steve Strassmann committed May 13, 2013
  
  96c37089 Browse Files
- Merge branch 'master' of https://github.com/edx/mitx into feature/straz/views · c49b1f09
```
pull from master
```
  Steve Strassmann committed May 13, 2013
  c49b1f09 Browse Files
- Merge pull request #1938 from edx/feature/straz/transifex · 8795fad9
```
Feature/straz/transifex
```
  Steve Strassmann committed May 13, 2013
  8795fad9 Browse Files
- Merge branch 'master' of https://github.com/edx/mitx into feature/straz/views · cdc2de7e
```
pull from master
```
  Steve Strassmann committed May 13, 2013
  cdc2de7e Browse Files
- Add display_names, update help, remove unnecessary things from templates. · e29c940e
  cahrens committed May 13, 2013
  
  e29c940e Browse Files
- Fix pep8 space issues · 451784dc
  Vik Paruchuri committed May 13, 2013
  
  451784dc Browse Files
- Merge pull request #2017 from edx/fix/cdodge/textbooks-not-exporting · 4191ebdb
```
Fix/cdodge/textbooks not exporting
```
  chrisndodge committed May 13, 2013
  4191ebdb Browse Files
- Json updates · 6dfc490f
  Vik Paruchuri committed May 13, 2013
  
  6dfc490f Browse Files
- Querydict comment. · df07192a
  Vik Paruchuri committed May 13, 2013
  
  df07192a Browse Files
- Pylint fixes · d8002447
  Peter Baratta committed May 13, 2013
  
  d8002447 Browse Files
- Add in some assert statements · a5549fd7
  Vik Paruchuri committed May 13, 2013
  
  a5549fd7 Browse Files
- pull from master · b0cc989b
  Steve Strassmann committed May 13, 2013
  
  b0cc989b Browse Files
- Install phantom-jasmine via npm, rather than git submodules · 7c989814
```
Because removing a step from our install process is a Good Thing™
```
  David Baumgold committed May 13, 2013
  7c989814 Browse Files
- relative imports · 8bb6ad36
  Steve Strassmann committed May 13, 2013
  
  8bb6ad36 Browse Files
- Comment capitalization · 06efd40b
  Peter Baratta committed May 13, 2013
  
  06efd40b Browse Files
- Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting · 0ef2944d
  Chris Dodge committed May 13, 2013
  
  0ef2944d Browse Files
- Merge pull request #2012 from edx/feature/markchang/500-copy-change · 85ae7b97
```
copy change
```
  Mark L. Chang committed May 13, 2013
  85ae7b97 Browse Files
- fix some violations. Build up karma · 4d197e10
  Chris Dodge committed May 13, 2013
  
  4d197e10 Browse Files
- pylint: refactor imports · e03585d8
  Steve Strassmann committed May 13, 2013
  
  e03585d8 Browse Files
- Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting · d32e7a5b
  Chris Dodge committed May 13, 2013
  
  d32e7a5b Browse Files
- Merge branch 'master' into feature/christina/metadata-ui · 5edbf3d8
  cahrens committed May 13, 2013
  
  5edbf3d8 Browse Files
- Merge pull request #1913 from edx/vaxxxa/word_cloud · cb775ffa
```
Word Cloud
```
  Victor Shnayder committed May 13, 2013
  cb775ffa Browse Files
- Checked JS files with linter, corrected a few minor issues. · c56d1b5e
  Valera Rozuvan committed May 13, 2013
  
  c56d1b5e Browse Files
- Pep8 fixes and changes to NaN tests · 2b9d78df
  Peter Baratta committed May 13, 2013
  
  2b9d78df Browse Files
- added another unit test check point for export/import of classic textbooks · 3cf865a8
  Chris Dodge committed May 13, 2013
  
  3cf865a8 Browse Files