Commits · f3bd9ab234a80a32c2b016451bcfd85c8bec72b6 · edx / edx-platform · GitLab

21 May, 2013 3 commits
- Get rid of empty, store ID. · f3bd9ab2
  cahrens committed May 21, 2013
  
  f3bd9ab2 Browse Files
- Update xblock, start Selenium. · 3dc97913
  cahrens committed May 21, 2013
  
  3dc97913 Browse Files
- Update xblock, start Selenium. · bb699f48
  cahrens committed May 21, 2013
  
  bb699f48 Browse Files
20 May, 2013 22 commits
- Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into… · c8eeea24
```
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
```
  cahrens committed May 20, 2013
  c8eeea24 Browse Files
- Jasmine test for metadata model. · 4facd262
  cahrens committed May 20, 2013
  
  4facd262 Browse Files
- Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into… · 3cf91500
```
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
```
  marco committed May 20, 2013
  3cf91500 Browse Files
- made firefox input number increment objects positioned as % to respond to page size accordingly · 79c78cbc
  marco committed May 20, 2013
  
  79c78cbc Browse Files
- Merge branch 'master' into feature/christina/metadata-ui · 4d7c7f86
  cahrens committed May 20, 2013
  
  4d7c7f86 Browse Files
- Merge pull request #2089 from edx/bugfix/e0d/resize-notes-uri · c94f8d6f
```
actually needs to be 255 given unicode requirements
```
  e0d committed May 20, 2013
  c94f8d6f Browse Files
- actually needs to be 255 given unicode requirements · a7b02e00
  e0d committed May 20, 2013
  
  a7b02e00 Browse Files
- Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into… · 7641e128
```
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
```
  marco committed May 20, 2013
  7641e128 Browse Files
- styled firefox number buttons · c0cff81e
  marco committed May 20, 2013
  
  c0cff81e Browse Files
- Minor cleanup. · 25388dec
  cahrens committed May 20, 2013
  
  25388dec Browse Files
- Prevent invalid numeric entries. · 2020923f
  cahrens committed May 20, 2013
  
  2020923f Browse Files
- Merge pull request #2086 from edx/bugfix/e0d/resize-notes-uri · f63a4432
```
Bugfix/e0d/resize notes uri
```
  e0d committed May 20, 2013
  f63a4432 Browse Files
- css styles for firefox input number fields · c3569040
  marco committed May 20, 2013
  
  c3569040 Browse Files
- pep8 fixes · 0e375644
  e0d committed May 20, 2013
  
  0e375644 Browse Files
- resizing uri column · a54ecb98
  e0d committed May 20, 2013
  
  a54ecb98 Browse Files
- minor style changes for increment and decrement buttons on firefox number fields · 32f76910
  marco committed May 20, 2013
  
  32f76910 Browse Files
- Call polyfill at right time. · 3229aaf5
  cahrens committed May 20, 2013
  
  3229aaf5 Browse Files
- Merge pull request #2075 from edx/fix/btalbot/studio-navLineHeight · 3671c7a7
```
Studio - Revised Course Nav Line Heights
```
  Brian Talbot committed May 20, 2013
  3671c7a7 Browse Files
- prototype for polyfill on number input fields, minimal styling to up down buttons · aa41aed9
  marco committed May 20, 2013
  
  aa41aed9 Browse Files
- studio - revising line height between course nav titles and prefixes · bf8df497
  Brian Talbot committed May 20, 2013
  
  bf8df497 Browse Files
- Merge pull request #2076 from edx/fix/btalbot/studio-fontrefs · 0947329f
```
Studio - Font Import Method Revert/Fix
```
  Brian Talbot committed May 20, 2013
  0947329f Browse Files
- studio - reverts google web font import method back to original @font-face… · 098a5dda
```
studio - reverts google web font import method back to original @font-face syntax since Sass doesn't like google's original method when processing
```
  Brian Talbot committed May 20, 2013
  098a5dda Browse Files
17 May, 2013 15 commits
- Merge pull request #2078 from edx/hotfix/rocha/celery-default-queue-name · f8e9c4d4
```
Set the default celery queue name in addition to the default routing key
```
  e0d committed May 17, 2013
  f8e9c4d4 Browse Files
- Set the default celery queue name in addition to the default routing key · 34d39dde
  Carlos Andrés Rocha committed May 17, 2013
  
  34d39dde Browse Files
- Merge branch 'drupal-new' · 372084e0
```
Conflicts:
	lms/envs/common.py
```
  Greg Price committed May 17, 2013
  372084e0 Browse Files
- Merge branch 'master' into drupal-new · de5b4d7d
  Greg Price committed May 17, 2013
  
  de5b4d7d Browse Files
- Merge pull request #2073 from edx/ned/message-if-no-install-needed · 5f7e856c
```
Print a message if the requirements files haven't changed.
```
  Ned Batchelder committed May 17, 2013
  5f7e856c Browse Files
- OK, all the phases should have messages. · 5555d41d
  Ned Batchelder committed May 17, 2013
  
  5555d41d Browse Files
- Merge pull request #2069 from edx/fix/cale/coffee-watch-on-osx · 340d39f3
```
Batched coffee --watch compilation in smaller batches
```
  Calen Pennington committed May 17, 2013
  340d39f3 Browse Files
- Merge pull request #2067 from edx/fix/gprice/mktg-button-closed-registration · 5268d982
```
Disable marketing registration button for courses that user cannot enrol...
```
  Greg Price committed May 17, 2013
  5268d982 Browse Files
- Merge pull request #2072 from edx/fix/sarina/add-frances · 39456f98
```
Add Frances Botsford as one of our authors
```
  Sarina committed May 17, 2013
  39456f98 Browse Files
- Merge pull request #2063 from edx/feature/rocha/lets-use-celery · 0042988e
```
Add Celery configuration to LMS and CMS 
```
  Carlos Andrés Rocha committed May 17, 2013
  0042988e Browse Files
- Merge pull request #2065 from edx/diana/drupal/fix-link-test · 00378add
```
Drupal: Fix test so that it works with both CMS and LMS settings
```
  Diana Huang committed May 17, 2013
  00378add Browse Files
- Some i18n work and other minor cleanup. · b16e17a2
  cahrens committed May 17, 2013
  
  b16e17a2 Browse Files
- Merge pull request #2070 from edx/fix/gprice/moar-cookies · bc650887
```
Ensure CSRF cookie is present for login and registration pages
```
  Greg Price committed May 17, 2013
  bc650887 Browse Files
- Print a message if the requirements files haven't changed. · 61f13594
  Ned Batchelder committed May 17, 2013
  
  61f13594 Browse Files
- Add Frances Botsford as one of our authors · 73e05b3e
  Sarina Canelake committed May 17, 2013
  
  73e05b3e Browse Files