cahrens
|
bb699f482d
|
Update xblock, start Selenium.
|
2013-05-21 09:37:55 -04:00 |
|
cahrens
|
c8eeea240b
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-20 16:27:11 -04:00 |
|
cahrens
|
4facd262bd
|
Jasmine test for metadata model.
|
2013-05-20 16:26:48 -04:00 |
|
marco
|
3cf915005b
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-20 15:22:31 -04:00 |
|
marco
|
79c78cbccd
|
made firefox input number increment objects positioned as % to respond to page size accordingly
|
2013-05-20 15:22:21 -04:00 |
|
cahrens
|
4d7c7f866a
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-20 15:06:40 -04:00 |
|
e0d
|
c94f8d6f56
|
Merge pull request #2089 from edx/bugfix/e0d/resize-notes-uri
actually needs to be 255 given unicode requirements
|
2013-05-20 11:49:59 -07:00 |
|
e0d
|
a7b02e0029
|
actually needs to be 255 given unicode requirements
|
2013-05-20 14:40:05 -04:00 |
|
marco
|
7641e128de
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-20 14:39:50 -04:00 |
|
marco
|
c0cff81e5e
|
styled firefox number buttons
|
2013-05-20 14:39:37 -04:00 |
|
cahrens
|
25388dec96
|
Minor cleanup.
|
2013-05-20 13:31:55 -04:00 |
|
cahrens
|
2020923f2d
|
Prevent invalid numeric entries.
|
2013-05-20 13:26:27 -04:00 |
|
e0d
|
f63a4432d0
|
Merge pull request #2086 from edx/bugfix/e0d/resize-notes-uri
Bugfix/e0d/resize notes uri
|
2013-05-20 10:24:27 -07:00 |
|
marco
|
c356904027
|
css styles for firefox input number fields
|
2013-05-20 12:06:30 -04:00 |
|
e0d
|
0e37564490
|
pep8 fixes
|
2013-05-20 12:01:25 -04:00 |
|
e0d
|
a54ecb98c6
|
resizing uri column
|
2013-05-20 11:59:56 -04:00 |
|
marco
|
32f7691040
|
minor style changes for increment and decrement buttons on firefox number fields
|
2013-05-20 11:39:13 -04:00 |
|
cahrens
|
3229aaf503
|
Call polyfill at right time.
|
2013-05-20 11:16:20 -04:00 |
|
Brian Talbot
|
3671c7a7fd
|
Merge pull request #2075 from edx/fix/btalbot/studio-navLineHeight
Studio - Revised Course Nav Line Heights
|
2013-05-20 07:29:19 -07:00 |
|
marco
|
aa41aed9d1
|
prototype for polyfill on number input fields, minimal styling to up down buttons
|
2013-05-20 09:45:33 -04:00 |
|
Brian Talbot
|
bf8df49728
|
studio - revising line height between course nav titles and prefixes
|
2013-05-20 08:40:28 -04:00 |
|
Brian Talbot
|
0947329fc4
|
Merge pull request #2076 from edx/fix/btalbot/studio-fontrefs
Studio - Font Import Method Revert/Fix
|
2013-05-20 05:39:50 -07:00 |
|
Brian Talbot
|
098a5dda48
|
studio - reverts google web font import method back to original @font-face syntax since Sass doesn't like google's original method when processing
|
2013-05-20 08:39:18 -04:00 |
|
e0d
|
f8e9c4d4d1
|
Merge pull request #2078 from edx/hotfix/rocha/celery-default-queue-name
Set the default celery queue name in addition to the default routing key
|
2013-05-17 15:02:31 -07:00 |
|
Carlos Andrés Rocha
|
34d39dde9a
|
Set the default celery queue name in addition to the default routing key
|
2013-05-17 17:59:51 -04:00 |
|
Greg Price
|
372084e0b6
|
Merge branch 'drupal-new'
Conflicts:
lms/envs/common.py
|
2013-05-17 16:17:35 -04:00 |
|
Greg Price
|
de5b4d7d27
|
Merge branch 'master' into drupal-new
|
2013-05-17 16:10:56 -04:00 |
|
Ned Batchelder
|
5f7e856cf3
|
Merge pull request #2073 from edx/ned/message-if-no-install-needed
Print a message if the requirements files haven't changed.
|
2013-05-17 13:08:51 -07:00 |
|
Ned Batchelder
|
5555d41d80
|
OK, all the phases should have messages.
|
2013-05-17 16:04:24 -04:00 |
|
Calen Pennington
|
340d39f322
|
Merge pull request #2069 from edx/fix/cale/coffee-watch-on-osx
Batched coffee --watch compilation in smaller batches
|
2013-05-17 13:02:08 -07:00 |
|
Greg Price
|
5268d982ce
|
Merge pull request #2067 from edx/fix/gprice/mktg-button-closed-registration
Disable marketing registration button for courses that user cannot enrol...
|
2013-05-17 12:40:54 -07:00 |
|
Sarina
|
39456f98b5
|
Merge pull request #2072 from edx/fix/sarina/add-frances
Add Frances Botsford as one of our authors
|
2013-05-17 12:38:47 -07:00 |
|
Carlos Andrés Rocha
|
0042988ea7
|
Merge pull request #2063 from edx/feature/rocha/lets-use-celery
Add Celery configuration to LMS and CMS
|
2013-05-17 12:36:23 -07:00 |
|
Diana Huang
|
00378add25
|
Merge pull request #2065 from edx/diana/drupal/fix-link-test
Drupal: Fix test so that it works with both CMS and LMS settings
|
2013-05-17 12:08:46 -07:00 |
|
cahrens
|
b16e17a250
|
Some i18n work and other minor cleanup.
|
2013-05-17 14:57:25 -04:00 |
|
Greg Price
|
bc650887c9
|
Merge pull request #2070 from edx/fix/gprice/moar-cookies
Ensure CSRF cookie is present for login and registration pages
|
2013-05-17 11:56:59 -07:00 |
|
Ned Batchelder
|
61f135944d
|
Print a message if the requirements files haven't changed.
|
2013-05-17 14:56:44 -04:00 |
|
Sarina Canelake
|
73e05b3e67
|
Add Frances Botsford as one of our authors
|
2013-05-17 14:48:11 -04:00 |
|
Sarina
|
036be2a692
|
Merge pull request #2001 from edx/jtauber/intial-authors
added initial AUTHORS file
|
2013-05-17 11:37:51 -07:00 |
|
Greg Price
|
d4cee365e6
|
Ensure CSRF cookie is present for login and registration pages
|
2013-05-17 14:23:28 -04:00 |
|
Calen Pennington
|
280f09739f
|
Batched coffee --watch compilation in smaller batches
This is to work around an OSx issue that causes EMFILE errors in the
default configuration.
Ref: https://github.com/joyent/node/issues/2479
|
2013-05-17 14:22:01 -04:00 |
|
Greg Price
|
f200bca6f8
|
Merge pull request #2066 from edx/fix/gprice/mktg-access-courseware
Make "access courseware" buttons for marketing site break out of iframes
|
2013-05-17 11:13:40 -07:00 |
|
Greg Price
|
db3189d5ad
|
Disable marketing registration button for courses that user cannot enroll in
|
2013-05-17 14:10:04 -04:00 |
|
frances botsford
|
cb9d2c8879
|
Merge pull request #2064 from edx/bug/frances/studio-ffnavwrap
Bug fix for Studio nav in FF on PC
|
2013-05-17 11:08:03 -07:00 |
|
Frances Botsford
|
e69b5c4792
|
adjusted width of header nav to prevent wrapping in PC FF, also put max-width on Org name and Course number in header to prevent the nav from getting bumped way over
|
2013-05-17 14:07:06 -04:00 |
|
Greg Price
|
e4509ae3ad
|
Make "access courseware" buttons for marketing site break out of iframes
|
2013-05-17 13:31:22 -04:00 |
|
Diana Huang
|
15a5e6c1ac
|
Fix test so that it works with both CMS and LMS settings
|
2013-05-17 13:18:10 -04:00 |
|
Kevin Chugh
|
ef3204da69
|
Merge pull request #2059 from edx/feature/zoldak/forum-testing
Feature/zoldak/forum testing
|
2013-05-17 10:10:55 -07:00 |
|
Christina Roberts
|
f4044ed1e8
|
Merge pull request #2061 from edx/bug/christina/static-pages
Make sure to get the correct modulestore on delete (static tabs do not e...
|
2013-05-17 09:59:59 -07:00 |
|
Diana Huang
|
ba983d5f49
|
Merge pull request #2062 from edx/diana/drupal/lettuce-tests
Fix Lettuce Tests for Drupal site
|
2013-05-17 08:56:11 -07:00 |
|