Commits · a32a740c39b8ec51188c05d06d726543f3f02c53 · edx / edx-platform · GitLab

17 May, 2013 2 commits
- Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into… · a32a740c
```
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
```
  cahrens committed May 17, 2013
  a32a740c Browse Files
- internationalization stripped out · 1f43fa16
  marco committed May 17, 2013
  
  1f43fa16 Browse Files
16 May, 2013 6 commits
- initial i18n changes to unit.html, component.html, and the individual setting type template files · 29b77784
  marco committed May 16, 2013
  
  29b77784 Browse Files
- removed latex compiler buttom from settings tab · f58deb4c
  marco committed May 16, 2013
  
  f58deb4c Browse Files
- Update combined open ended and peer grading per conversation with Vik. · a6c5e699
  cahrens committed May 16, 2013
  
  a6c5e699 Browse Files
- Fix CodeMirror initialization problem. · 01ff8396
  cahrens committed May 16, 2013
  
  01ff8396 Browse Files
- In progress. · 235ecff2
  cahrens committed May 16, 2013
  
  235ecff2 Browse Files
- cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill · ef141553
  marco committed May 16, 2013
  
  ef141553 Browse Files
15 May, 2013 32 commits
- resolved metadata-edit conflict, adding in latex item into settings · bbb6a3c6
  marco committed May 15, 2013
  
  bbb6a3c6 Browse Files
- commented out firefox polyfill ad well as xmodule css editor changes · 12dae84a
  marco committed May 15, 2013
  
  12dae84a Browse Files
- Fix bad merge. · c85cc5a3
  cahrens committed May 15, 2013
  
  c85cc5a3 Browse Files
- Merge branch 'master' into feature/christina/metadata-ui · d72b6b05
```
Conflicts:
	cms/static/sass/views/_static-pages.scss
```
  cahrens committed May 15, 2013
  d72b6b05 Browse Files
- Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into… · 724678dd
```
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
```
  cahrens committed May 15, 2013
  724678dd Browse Files
- Update unit test for editable_metadata_fields. · fa1dfd71
  cahrens committed May 15, 2013
  
  fa1dfd71 Browse Files
- Merge pull request #2019 from edx/fix/cale/xmodule-template-docs · 14bf7195
```
Add documentation of xmodule template files
```
  Calen Pennington committed May 15, 2013
  14bf7195 Browse Files
- Merge pull request #2027 from edx/fix/cale/allow-liveserver-port-ranges · 1746c600
```
Allow django liveserver to use larger port range
```
  Calen Pennington committed May 15, 2013
  1746c600 Browse Files
- Merge pull request #2028 from edx/feature/cale/flexible-repo-jenkins · f499dec1
```
Make gcli commands flexible around org and repo name
```
  Calen Pennington committed May 15, 2013
  f499dec1 Browse Files
- Clean up editable_metadata_fields. · d35b2903
  cahrens committed May 15, 2013
  
  d35b2903 Browse Files
- clear button to match help icon visually · ba11d37b
  marco committed May 15, 2013
  
  ba11d37b Browse Files
- border around course introduction which was lost in code mirror styling for component editors · 2f8e8f48
  marco committed May 15, 2013
  
  2f8e8f48 Browse Files
- Merge pull request #1964 from edx/feature/cale/parallel-build-venvs · 96894452
```
Use one virtualenv for each parallel build process
```
  Calen Pennington committed May 15, 2013
  96894452 Browse Files
- updates moved slightly, will not use new styling · cbdadaee
  marco committed May 15, 2013
  
  cbdadaee Browse Files
- Use one virtualenv for each parallel build process · 8b797093
  Calen Pennington committed May 15, 2013
  
  8b797093 Browse Files
- Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into… · 305b555d
```
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
```
  cahrens committed May 15, 2013
  305b555d Browse Files
- styling for static pages updated · b3e41d19
  marco committed May 15, 2013
  
  b3e41d19 Browse Files
- Make gcli commands flexible around org and repo name · b3e8d597
  Calen Pennington committed May 15, 2013
  
  b3e8d597 Browse Files
- Allow django liveserver to use larger port range · 5cc15fcc
  Calen Pennington committed May 15, 2013
  
  5cc15fcc Browse Files
- final changes to codemirror styling, and clean up style for settings button clearing · 0422350e
  marco committed May 15, 2013
  
  0422350e Browse Files
- Set "editing" name. · 06d31548
  cahrens committed May 15, 2013
  
  06d31548 Browse Files
- Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into… · 5f4bded3
```
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
```
  marco committed May 15, 2013
  5f4bded3 Browse Files
- style changes to component header · 56df114e
  marco committed May 15, 2013
  
  56df114e Browse Files
- Minor update. · a1674069
  cahrens committed May 15, 2013
  
  a1674069 Browse Files
- Merge pull request #2044 from edx/fix/cdodge/fix-test-on-css-class · d7a6e58f
```
fix broken tests. Also drive by fix for the sporadic failure on tests wh...
```
  chrisndodge committed May 15, 2013
  d7a6e58f Browse Files
- Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into… · 4152e460
```
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui

Conflicts:
	cms/static/coffee/src/views/module_edit.coffee
```
  cahrens committed May 15, 2013
  4152e460 Browse Files
- Get toggling between Editor and Settings working. · faf31d97
  cahrens committed May 15, 2013
  
  faf31d97 Browse Files
- style change for is-set · 63960ee4
  marco committed May 15, 2013
  
  63960ee4 Browse Files
- fix broken tests. Also drive by fix for the sporadic failure on tests which may… · 6cec6697
```
fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test
```
  Chris Dodge committed May 15, 2013
  6cec6697 Browse Files
- Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into… · d264c943
```
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
```
  marco committed May 15, 2013
  d264c943 Browse Files
- styling adjustments to codemirror and wrapped polyfill into a function · e157173c
  marco committed May 15, 2013
  
  e157173c Browse Files
- Updates for showanswer. · d4d38827
  cahrens committed May 15, 2013
  
  d4d38827 Browse Files