Ned Batchelder
392de8d40e
Check functions need access to course-local code also, so we need to save the python path from the problem setup, and use it for the check function.
2013-05-22 13:27:24 -04:00
Chris Dodge
9b88528b04
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
2013-05-22 13:20:49 -04:00
VikParuchuri
f8e68216a7
Merge pull request #2096 from edx/fix/vik/oe-cache
...
Fix/vik/oe cache
2013-05-22 09:59:33 -07:00
Vik Paruchuri
e5dd1a935c
Update rubric template
2013-05-22 12:49:49 -04:00
Vik Paruchuri
2303500ce2
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
2013-05-22 12:18:28 -04:00
e0d
e4c3f92372
Merge pull request #2100 from edx/hotfix/e0d/code-jail
...
Sandbox-installed packages will be really installed instead of -e instal...
2013-05-22 09:05:03 -07:00
Vik Paruchuri
3bd04290f5
Add tests, address review comments
2013-05-22 11:58:03 -04:00
Vik Paruchuri
a44eacd474
Make fields stringy, remove false dict
2013-05-22 10:54:52 -04:00
Ned Batchelder
ce005072b0
Sandbox-installed packages will be really installed instead of -e installed.
2013-05-21 19:21:39 -04:00
Peter Baratta
43395b70b7
Enable coverage for calc module; split off tests
2013-05-21 15:20:51 -04:00
Vik Paruchuri
9a52a17aab
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
2013-05-21 14:54:45 -04:00
Ned Batchelder
e59d345917
Use a different arbitrary dotted module, which Christina doesn't already have imported
2013-05-21 14:27:50 -04:00
Peter Baratta
82482e89ea
Finish calc.py tests; add docstrings, etc
2013-05-21 11:07:19 -04:00
Chris Dodge
094e396556
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
2013-05-21 09:47:11 -04:00
cahrens
3dc9791382
Update xblock, start Selenium.
2013-05-21 09:38:56 -04:00
Vik Paruchuri
1f34561cff
Update examples, fix parsing error, avoid collision with capa template
2013-05-21 00:22:33 -04:00
Vik Paruchuri
4dab8f07b0
fix mocking issue
2013-05-20 17:29:11 -04:00
Vik Paruchuri
d0e8965a3c
Fix pep8/pylint issues
2013-05-20 16:42:27 -04:00
Vik Paruchuri
3b3cf19c47
Fix tests and add in jasmine test
2013-05-20 15:52:19 -04:00
Vik Paruchuri
23269359c1
Jasmine tests, fix some review issues
2013-05-20 15:31:56 -04:00
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
