Valera Rozuvan
|
6794b73d99
|
Added videoalpha version 1 to the advanced components in studio.
|
2013-05-24 10:14:18 +03:00 |
|
Chris Dodge
|
b6090952da
|
randomize_module.py was missing 'import lxml' to support definition_to_xml(). Also, fix serialization of show_timezone to expect a bool
|
2013-05-23 14:24:36 -04:00 |
|
Brian Talbot
|
1371c8d0da
|
revises alignment of advanced editor and cheatsheet toggle
|
2013-05-23 13:27:23 -04:00 |
|
chrisndodge
|
a8084628e1
|
Merge pull request #1956 from edx/feature/cdodge/autoprovision-forums-master
Feature/cdodge/autoprovision forums master
|
2013-05-23 09:27:36 -07:00 |
|
cahrens
|
48703af234
|
Merge.
|
2013-05-23 11:41:26 -04:00 |
|
cahrens
|
c95b44d851
|
Merge branch 'master' into feature/christina/metadata-ui
Conflicts:
cms/envs/common.py
cms/templates/base.html
common/lib/xmodule/xmodule/combined_open_ended_module.py
|
2013-05-23 11:41:12 -04:00 |
|
Vik Paruchuri
|
39663ce947
|
Add in newlines at end of files
|
2013-05-22 17:01:49 -04:00 |
|
David Baumgold
|
0a7222b123
|
Allow an AJAX call to specify that it should not notify on error
Because there are some cases where it's OK to fail, and it's not the user's fault
|
2013-05-22 15:55:56 -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 |
|
Vik Paruchuri
|
e5dd1a935c
|
Update rubric template
|
2013-05-22 12:49:49 -04: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 |
|
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 |
|
cahrens
|
4d7c7f866a
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-20 15:06:40 -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 |
|
Vik Paruchuri
|
55fda26fd8
|
Fix tests, fix xqueue error, minor polish
|
2013-05-20 11:29:19 -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 |
|
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 |
|
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 |
|
cahrens
|
5920ea91ee
|
One minor update.
|
2013-05-17 11:00:00 -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 |
|
Ned Batchelder
|
e947218285
|
Merge master to here.
|
2013-05-16 14:21:51 -04:00 |
|
cahrens
|
a6c5e699ea
|
Update combined open ended and peer grading per conversation with Vik.
|
2013-05-16 13:28:48 -04:00 |
|
Jay Zoldak
|
ed3df10638
|
Set up rake task for jasmine tests for discussion forums code.
|
2013-05-16 10:56:57 -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 |
|
Ned Batchelder
|
8f3c1db1ef
|
Add some notes for the future maintainer.
|
2013-05-15 17:00:39 -04:00 |
|
marco
|
bbb6a3c60d
|
resolved metadata-edit conflict, adding in latex item into settings
|
2013-05-15 16:27:04 -04:00 |
|
marco
|
12dae84a07
|
commented out firefox polyfill ad well as xmodule css editor changes
|
2013-05-15 16:07:45 -04:00 |
|
cahrens
|
d72b6b05bf
|
Merge branch 'master' into feature/christina/metadata-ui
Conflicts:
cms/static/sass/views/_static-pages.scss
|
2013-05-15 15:29:27 -04:00 |
|
cahrens
|
fa1dfd716a
|
Update unit test for editable_metadata_fields.
|
2013-05-15 15:25:36 -04:00 |
|
Calen Pennington
|
14bf719538
|
Merge pull request #2019 from edx/fix/cale/xmodule-template-docs
Add documentation of xmodule template files
|
2013-05-15 12:20:10 -07:00 |
|
cahrens
|
d35b29031f
|
Clean up editable_metadata_fields.
|
2013-05-15 14:01:18 -04:00 |
|
marco
|
b3e41d19f6
|
styling for static pages updated
|
2013-05-15 13:29:35 -04:00 |
|
marco
|
0422350e8c
|
final changes to codemirror styling, and clean up style for settings button clearing
|
2013-05-15 12:05:43 -04:00 |
|
marco
|
d264c943a4
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-15 10:54:15 -04:00 |
|
marco
|
e157173c11
|
styling adjustments to codemirror and wrapped polyfill into a function
|
2013-05-15 10:53:54 -04:00 |
|
cahrens
|
d4d38827b4
|
Updates for showanswer.
|
2013-05-15 10:35:40 -04:00 |
|
Chris Dodge
|
ce52be1e57
|
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
|
2013-05-15 09:59:26 -04:00 |
|