cahrens
|
14eb9c9a3b
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-30 12:27:03 -04:00 |
|
Diana Huang
|
5118b06ef2
|
Merge pull request #2147 from edx/diana/fix-error-descriptor
Fix XML Error Module so that it no longer shows the data to non-staff.
|
2013-05-30 08:52:41 -07:00 |
|
chrisndodge
|
5eaa6aea23
|
Merge pull request #2140 from edx/fix/cdodge/add-randomize-to-list-of-collections
add the new category which can act as a category
|
2013-05-30 06:20:21 -07:00 |
|
cahrens
|
b2fe7f5c01
|
Update documentation (per Toddi).
|
2013-05-29 17:19:33 -04:00 |
|
cahrens
|
f0260757c5
|
Cleanup.
|
2013-05-29 16:50:22 -04:00 |
|
Diana Huang
|
910324fb49
|
Fix XML Error Module so that it no longer shows the data to non-staff.
|
2013-05-29 16:31:11 -04:00 |
|
cahrens
|
d7a1dda937
|
Update display name.
|
2013-05-29 16:23:31 -04:00 |
|
cahrens
|
b77919a849
|
Remove unnecessary fields.
|
2013-05-29 15:53:30 -04:00 |
|
cahrens
|
551a1c1516
|
pep8 and documentation cleanup.
|
2013-05-29 15:47:46 -04:00 |
|
chrisndodge
|
42a55fafb2
|
Merge pull request #1714 from edx/feature/valera/videoalpha1_studio
Added videoalpha version 1 to the advanced components in studio.
|
2013-05-29 12:01:18 -07:00 |
|
cahrens
|
e3bc5e6bef
|
Update for metadata changes.
|
2013-05-29 14:43:31 -04:00 |
|
Chris Dodge
|
25dae57226
|
add the new category which can act as a category
|
2013-05-29 11:16:33 -04:00 |
|
cahrens
|
625c6b518c
|
Cleanup, change how we load templates.
|
2013-05-28 14:07:35 -04:00 |
|
cahrens
|
f3d4381fde
|
Minor cleanup.
|
2013-05-28 12:53:00 -04:00 |
|
cahrens
|
2c32200cce
|
Updated text per Alex's e-mail.
|
2013-05-28 11:12:22 -04:00 |
|
cahrens
|
6be9463eca
|
Cleanup.
|
2013-05-27 21:50:56 -04:00 |
|
cahrens
|
a195c4f55f
|
Continue merge.
|
2013-05-27 20:36:10 -04:00 |
|
cahrens
|
34082efad5
|
Merge branch 'master' into feature/christina/metadata-ui
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
|
2013-05-27 20:08:19 -04:00 |
|
cahrens
|
17c710af83
|
Merge branch 'master' into feature/christina/metadata-ui
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
|
2013-05-27 20:08:09 -04:00 |
|
Vik Paruchuri
|
e17276ade8
|
Fix some pep8 stuff
|
2013-05-24 16:43:29 -04:00 |
|
cahrens
|
87d904cb35
|
Merge branch 'master' into feature/christina/metadata-ui
Conflicts:
cms/templates/base.html
|
2013-05-24 16:10:34 -04:00 |
|
Vik Paruchuri
|
9cbb4e090d
|
Swap icons for font awesome
|
2013-05-24 14:40:33 -04:00 |
|
Vik Paruchuri
|
5050eab74a
|
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
|
2013-05-24 14:26:33 -04:00 |
|
Valera Rozuvan
|
587ac0ecf0
|
Removed is_graded attribute. In HTML yaml it is not used, and that is not graded.
|
2013-05-24 10:14:18 +03:00 |
|
Valera Rozuvan
|
1e8c4e9edf
|
Rebase + updated videoalpha template. Now no data_dir attribute and is_graded set to false.
|
2013-05-24 10:14:18 +03:00 |
|
Valera Rozuvan
|
aaeb3a862d
|
Added Python tests for start_time and end_time parameters.
|
2013-05-24 10:14:18 +03:00 |
|
Lyla Fischer
|
56f60e06e4
|
changed 'from' and 'to' to 'start_time' and 'end_time'
|
2013-05-24 10:14:18 +03:00 |
|
Lyla Fischer
|
d68162f9fa
|
removed from and to labels
|
2013-05-24 10:14:18 +03:00 |
|
Lyla Fischer
|
c238f76fe8
|
different default section
|
2013-05-24 10:14:18 +03:00 |
|
Lyla Fischer
|
53f80d3991
|
standard video introduction
|
2013-05-24 10:14:18 +03:00 |
|
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 |
|