Commits · 06d315484f1773df05de86673db49283f6092e14 · edx / edx-platform · GitLab

15 May, 2013 11 commits
- Set "editing" name. · 06d31548
  cahrens committed May 15, 2013
  
  06d31548 Browse Files
- Minor update. · a1674069
  cahrens committed May 15, 2013
  
  a1674069 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
- 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
- updated styles for input type numbers · b9fc3f9e
  marco committed May 15, 2013
  
  b9fc3f9e Browse Files
- initial polyfill implementation and metadata number entry javascript validation · 47a4d6b6
  marco committed May 14, 2013
  
  47a4d6b6 Browse Files
- fixed broken coffee script caused by errant pseudo code I checked in · 98e692d1
  marco committed May 14, 2013
  
  98e692d1 Browse Files
- basic tab switching added · 81e95f27
  marco committed May 14, 2013
  
  81e95f27 Browse Files
14 May, 2013 14 commits
- Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into… · 6ec1a292
```
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
```
  marco committed May 14, 2013
  6ec1a292 Browse Files
- clean up of editor header styling · 064d21c4
  marco committed May 14, 2013
  
  064d21c4 Browse Files
- Use min, max, and step values from server. · 17750a7d
  cahrens committed May 14, 2013
  
  17750a7d Browse Files
- Merge branch 'master' into feature/christina/metadata-ui · 5bd0442f
  cahrens committed May 14, 2013
  
  5bd0442f 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
- Merge pull request #2032 from edx/fix/gprice/zendesk-log-error · 2c1b0c83
```
Add a prefix string to Zendesk errors to be more searchable in Splunk
```
  Greg Price committed May 14, 2013
  2c1b0c83 Browse Files
- Merge pull request #2035 from edx/fix/zoldak/phantom-jasmine-version · 3657fbe3
```
Specify version of phantom jasmine to use.
```
  Jay Zoldak committed May 14, 2013
  3657fbe3 Browse Files
- Specify version of phantom jasmine to use. · b590d344
  Jay Zoldak committed May 14, 2013
  
  b590d344 Browse Files
- Merge pull request #2034 from edx/fix/cale/advanced-modules · 465a2652
```
Fix advanced modules list
```
  Calen Pennington committed May 14, 2013
  465a2652 Browse Files
- Fix advanced modules list · bd6bb8e9
  Calen Pennington committed May 14, 2013
  
  bd6bb8e9 Browse Files
- Merge pull request #2033 from edx/fix-phantom-jasmine-lms · c69c69d2
```
Forgot to update phantom-jasmine location for LMS
```
  Jay Zoldak committed May 14, 2013
  c69c69d2 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 15 commits
- Forgot to update phantom-jasmine location for LMS · d376cb52
  David Baumgold committed May 13, 2013
  
  d376cb52 Browse Files
- 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
- Merge pull request #2031 from edx/fix/zoldak/repo-name · 38ee7bea
```
Update repo name in jenkins test shell script.
```
  Jay Zoldak committed May 13, 2013
  38ee7bea Browse Files
- Add a prefix string to Zendesk errors to be more searchable in Splunk · a5bb3179
  Greg Price committed May 13, 2013
  
  a5bb3179 Browse Files
- Merge pull request #2026 from edx/bug/straz/pep8 · b412dd57
```
pep8 cleanups
```
  Steve Strassmann committed May 13, 2013
  b412dd57 Browse Files
- Merge pull request #2030 from edx/victor/fix-word-cloud-rotation · c4c3b202
```
fix order of operations to make things rotate correctly
```
  Sarina committed May 13, 2013
  c4c3b202 Browse Files
- Update repo name in jenkins test shell script. · 30e8e2e2
  Jay Zoldak committed May 13, 2013
  
  30e8e2e2 Browse Files
- fix order of operations to make things rotate correctly · 4f2c3b78
  Victor Shnayder committed May 13, 2013
  
  4f2c3b78 Browse Files
- cleaned up references to proper elements in settings header mode buttons · cb401930
  marco committed May 13, 2013
  
  cb401930 Browse Files
- Merge pull request #1932 from edx/feature/e0d/flexible-base.sh · f8a72e5c
```
flexible org repos parsing tested locally
```
  Calen Pennington committed May 13, 2013
  f8a72e5c Browse Files
- Merge pull request #2024 from edx/bugfix/e0d/make-course-dynamic · 5e0afc63
```
Enable Delft and Georgetown to be handled by the dynamic path
```
  e0d committed May 13, 2013
  5e0afc63 Browse Files
- pull from master · d26dc957
  Steve Strassmann committed May 13, 2013
  
  d26dc957 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