Peter Baratta
5e8d2ce4f7
Start making comprehensive calc tests
2013-05-20 15:30:16 -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
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
cahrens
2020923f2d
Prevent invalid numeric entries.
2013-05-20 13:26:27 -04:00
Vik Paruchuri
16e1ecf686
fix some pylint violations
2013-05-20 12:46:12 -04:00
marco
c356904027
css styles for firefox input number fields
2013-05-20 12:06:30 -04:00
marco
32f7691040
minor style changes for increment and decrement buttons on firefox number fields
2013-05-20 11:39:13 -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
6bdbbb62d5
Polish up editor, fix issues
2013-05-20 11:09:35 -04:00
Vik Paruchuri
d4b54ceca7
Update open ended editor to parse tasks properly
2013-05-20 10:49:04 -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
3a15f93564
Render proper templates when user clicks on editor buttons
2013-05-20 09:20:46 -04:00
Vik Paruchuri
9a7006473e
Do basic work on a simple editor for combinedopenended
2013-05-20 09:07:03 -04:00
Vik Paruchuri
4c80325db3
Start working on COE editor, fix name checking in module_render
2013-05-20 08:11:54 -04:00
Will Daly
bab4b18647
Set the browser size on startup of acceptance tests.
...
This resolves an issue on Mac OS X in which the login dropdown
arrow couldn't be clicked because it was off-screen.
It should make the test suite more stable.
2013-05-17 17:21:44 -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
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
Will Daly
a28aed5803
Added tests for capa input templates. This includes tests
...
for HTML we expect to be unescaped.
2013-05-17 14:38:59 -04:00
Greg Price
d4cee365e6
Ensure CSRF cookie is present for login and registration pages
2013-05-17 14:23:28 -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
Carlos Andrés Rocha
35bd38d677
Add status app with simple view to check celery workers
2013-05-17 11:33:14 -04:00
cahrens
5920ea91ee
One minor update.
2013-05-17 11:00:00 -04:00
Diana Huang
2b80b358ed
Add in a test for the marketing_link function in mitxmako
2013-05-17 10:51:37 -04:00
Ned Batchelder
f856b69ab5
Merge branch 'feature/ned/sandboxed-python'
2013-05-17 10:28:06 -04:00
Your Name
6fb8adaa50
add flagging and unflagging tests to response show view
2013-05-17 09:52:02 -04:00
Your Name
ad5b71deae
format content view test for readability
2013-05-17 09:34:41 -04:00
Your Name
296a878169
add flagging tests to DiscussionContentView
2013-05-17 09:31:12 -04:00
Your Name
ce2308b5bb
add flagging tests to DiscussionContentView
2013-05-17 09:28:12 -04:00
Greg Price
362736c4d1
Merge pull request #2060 from edx/fix/gprice/marketing-links
...
Fix marketing links in password reset pages
2013-05-16 14:24:13 -07: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
Ned Batchelder
d0c4afb32f
More info in the capa/safe_exec/README
2013-05-16 17:02:45 -04:00
Greg Price
4e95aa053f
Fix marketing links in password reset pages
2013-05-16 16:57:56 -04:00
Diana Huang
b6c0081064
Look for the existence of the links, not for
...
the actual urls
2013-05-16 16:30:29 -04:00
Diana Huang
22cf0dfa97
Fix bug in lettuce tests where the unregister dialog wasn't
...
getting closed fast enough.
2013-05-16 16:30:29 -04:00
Diana Huang
1c2175304e
Merge branch 'master' into drupal-new
2013-05-16 16:27:36 -04:00
Arthur Barrett
52e5fe223c
update annotator.js library and fix the annotator-adder button hover state in courseware.
2013-05-16 14:27:21 -04:00
Ned Batchelder
e947218285
Merge master to here.
2013-05-16 14:21:51 -04:00
Ned Batchelder
bbd1d8d09e
From code review: the hash was shallow, so nested objects could have hashed differently when they didn't need to.
2013-05-16 13:58:05 -04:00
