Vik Paruchuri
|
1f34561cff
|
Update examples, fix parsing error, avoid collision with capa template
|
2013-05-21 00:22:33 -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 |
|
Brian Talbot
|
8bbbe992fe
|
studio - references new line-height() Sass mixin when declaring typography archetypes
|
2013-05-20 15:20:17 -04:00 |
|
Brian Talbot
|
31b5c4ab61
|
studio - adds back in older lh() Sass function/mixin and moves it to the inheritied/to-be-sunsetted mixins sheet
|
2013-05-20 15:20:17 -04:00 |
|
cahrens
|
4d7c7f866a
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-20 15:06:40 -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 |
|
Vik Paruchuri
|
7699c1794c
|
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
|
2013-05-20 14:16:04 -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 |
|
marco
|
c356904027
|
css styles for firefox input number fields
|
2013-05-20 12:06:30 -04:00 |
|
Vik Paruchuri
|
ed2c1cf0d1
|
Remove header from cheatsheet
|
2013-05-20 11:46:01 -04:00 |
|
Vik Paruchuri
|
55fda26fd8
|
Fix tests, fix xqueue error, minor polish
|
2013-05-20 11:29:19 -04:00 |
|
cahrens
|
3229aaf503
|
Call polyfill at right time.
|
2013-05-20 11:16:20 -04:00 |
|
Vik Paruchuri
|
d4b54ceca7
|
Update open ended editor to parse tasks properly
|
2013-05-20 10:49:04 -04:00 |
|
Chris Dodge
|
a44e816877
|
remove_open_ended_panel_tab() -> remove_extra_paneltab(). Also, update new forums test factors to use refactored Models.py
|
2013-05-20 10:33:52 -04:00 |
|
Chris Dodge
|
fbbae44988
|
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
Conflicts:
cms/djangoapps/contentstore/views/course.py
lms/djangoapps/django_comment_client/base/views.py
lms/djangoapps/django_comment_client/management/commands/show_permissions.py
lms/djangoapps/django_comment_client/models.py
lms/djangoapps/django_comment_client/tests/test_utils.py
lms/envs/common.py
|
2013-05-20 10:22:36 -04:00 |
|
Vik Paruchuri
|
986999c62e
|
Fix cheatsheet, start working on xml replacement
|
2013-05-20 09:50:15 -04:00 |
|
marco
|
aa41aed9d1
|
prototype for polyfill on number input fields, minimal styling to up down buttons
|
2013-05-20 09:45:33 -04:00 |
|
Vik Paruchuri
|
9a7006473e
|
Do basic work on a simple editor for combinedopenended
|
2013-05-20 09:07:03 -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
|
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 |
|
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 |
|
cahrens
|
b16e17a250
|
Some i18n work and other minor cleanup.
|
2013-05-17 14:57:25 -04: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 |
|
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 |
|
Carlos Andrés Rocha
|
35bd38d677
|
Add status app with simple view to check celery workers
|
2013-05-17 11:33:14 -04:00 |
|
Carlos Andrés Rocha
|
c05efbc31e
|
Added base Celery settings
|
2013-05-17 11:33:14 -04:00 |
|
cahrens
|
1c9ebbc9ef
|
Put colon on Visibility back in.
|
2013-05-17 11:02:25 -04:00 |
|
Brian Talbot
|
85f2be44b5
|
studio - resolves line-height issue that core typography settings creates with tooltip rendering
|
2013-05-17 10:46:58 -04:00 |
|
marco
|
1f43fa163a
|
internationalization stripped out
|
2013-05-17 10:29:24 -04:00 |
|
marco
|
29b7778461
|
initial i18n changes to unit.html, component.html, and the individual setting type template files
|
2013-05-16 17:17:43 -04:00 |
|
cahrens
|
944d2d61f1
|
Make sure to get the correct modulestore on delete (static tabs do not exist in draft modulestore).
#324
|
2013-05-16 17:15:53 -04:00 |
|
Diana Huang
|
1c2175304e
|
Merge branch 'master' into drupal-new
|
2013-05-16 16:27:36 -04:00 |
|
marco
|
f58deb4c3c
|
removed latex compiler buttom from settings tab
|
2013-05-16 15:42:29 -04:00 |
|
Arthur Barrett
|
1fbe43a650
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-05-16 13:23:12 -04:00 |
|
Arthur Barrett
|
430e009b5d
|
added TODO for open ended and notes tab advanced policy settings.
|
2013-05-16 13:22:40 -04:00 |
|
cahrens
|
01ff8396e3
|
Fix CodeMirror initialization problem.
|
2013-05-16 12:34:39 -04:00 |
|
Will Daly
|
1e1e6450df
|
Pep8 fixes
|
2013-05-16 11:33:50 -04:00 |
|
Will Daly
|
342b3bb0e9
|
Merge branch 'master' into feature/will/ci-lettuce-tests
Resolved conflict with changes to Rakefile in master
Conflicts:
rakefile
|
2013-05-16 11:21:59 -04:00 |
|
cahrens
|
235ecff28b
|
In progress.
|
2013-05-16 10:40:48 -04:00 |
|
marco
|
ef14155306
|
cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill
|
2013-05-16 09:50:16 -04:00 |
|
Will Daly
|
e78436db18
|
Merge branch 'feature/will/ci-lettuce-tests' of https://github.com/edx/edx-platform into feature/will/ci-lettuce-tests
|
2013-05-15 17:07:24 -04:00 |
|