Commits · eb843172ff5084397f53238ef51a6a474da31046 · edx / edx-platform · GitLab

13 May, 2013 40 commits
- Enable Delft and Georgetown to be handled by the dynamic path · eb843172
  e0d committed May 13, 2013
  
  eb843172 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
- 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
- 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
- relative imports · 8bb6ad36
  Steve Strassmann committed May 13, 2013
  
  8bb6ad36 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 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
- added another unit test check point for export/import of classic textbooks · 3cf865a8
  Chris Dodge committed May 13, 2013
  
  3cf865a8 Browse Files
- fix export from tabs.__all__ · b288a8e3
  Steve Strassmann committed May 13, 2013
  
  b288a8e3 Browse Files
- fix pep8: imports and blank lines · 979e3be1
  Steve Strassmann committed May 13, 2013
  
  979e3be1 Browse Files
- Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting · d98e726a
  Chris Dodge committed May 13, 2013
  
  d98e726a Browse Files
- pull from master · 5ab6d472
  Steve Strassmann committed May 13, 2013
  
  5ab6d472 Browse Files
- Move wordcloud template settings into metadata, and remove contents of… · b78e0440
```
Move wordcloud template settings into metadata, and remove contents of definition (since no fields edited by studio authors have scope.settings)
```
  Calen Pennington committed May 13, 2013
  b78e0440 Browse Files
- Added license information to d3 JS file and to the word cloud layout. · 1353ae3e
  Valera Rozuvan committed May 13, 2013
  
  1353ae3e Browse Files
- merge all word_cloud Xmodule fields to one `WordCloudFields` class · 4138c471
  Vasyl Nakvasiuk committed May 13, 2013
  
  4138c471 Browse Files
- fix word_cloud.rst typo · 29e9ff2c
  Vasyl Nakvasiuk committed May 13, 2013
  
  29e9ff2c Browse Files
- removes unnecesary images · 331e3551
  Alexander Kryklia committed May 13, 2013
  
  331e3551 Browse Files
- updated docstrings · 09f6d2a6
  Alexander Kryklia committed May 13, 2013
  
  09f6d2a6 Browse Files
- Word Cloud: docstrings + pep8 · 5e6f3601
  Vasyl Nakvasiuk committed May 13, 2013
  
  5e6f3601 Browse Files
- removes display_name from studio template · af8b9eca
  Alexander Kryklia committed May 13, 2013
  
  af8b9eca Browse Files
- separates xfields that descriptor use and module use · 7559cd90
  Alexander Kryklia committed May 13, 2013
  
  7559cd90 Browse Files
- adds mako_template string to desctiptor for studio integration · 36d2dd63
  Alexander Kryklia committed May 13, 2013
  
  36d2dd63 Browse Files
- word cloud studio integration · bdc62e7d
  Alexander Kryklia committed May 13, 2013
  
  bdc62e7d Browse Files
- PEPifying · 04b71251
  Alexander Kryklia committed May 13, 2013
  
  04b71251 Browse Files
- PEPifying · 2d68e4ee
  Alexander Kryklia committed May 13, 2013
  
  2d68e4ee Browse Files
- imports forgotter RawDescriptor · ecb9857b
  Alexander Kryklia committed May 13, 2013
  
  ecb9857b Browse Files