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 |
|
chrisndodge
|
27c6816bac
|
Merge pull request #2113 from edx/fix/cdodge/few-xml-serialize-fixes
randomize_module.py was missing 'import lxml' to support definition_to_x...
|
2013-05-24 06:26:23 -07: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 |
|
Peter Baratta
|
2793bb4337
|
Add few more tests; fix a small bug with parallel resistors
|
2013-05-23 17:43:26 -04:00 |
|
Peter Baratta
|
2486f7c271
|
Fixed docstrings and other comments from PR review
|
2013-05-23 17:38:16 -04: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 |
|
Calen Pennington
|
69beea854c
|
Merge pull request #2045 from edx/feature/cale/jasmine-junit-reports
Record junit reports of jasmine tests
|
2013-05-23 11:06:34 -07: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 |
|
Peter Baratta
|
1de8c4d321
|
Merge branch 'master' into pbaratta/calc-tests
|
2013-05-23 11:11:08 -04:00 |
|
Peter Baratta
|
70898a06da
|
Pep8 fix
|
2013-05-23 11:09:23 -04:00 |
|
Peter Baratta
|
db261dc1c3
|
Add docstrings; test divsion by zero at Response level
|
2013-05-23 10:18:30 -04:00 |
|
Calen Pennington
|
b2b6ca5f7b
|
Record junit reports of jasmine tests
|
2013-05-22 22:01:44 -04:00 |
|
Chris Dodge
|
3fceb46953
|
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
|
2013-05-22 20:44:22 -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 |
|
Ned Batchelder
|
b9d134e3d1
|
Merge pull request #2101 from edx/ned/fix-code-import-for-check-functions
Check functions need access to course-local code also, so we need to sav...
|
2013-05-22 12:32:43 -07:00 |
|
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 |
|
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 |
|