Ned Batchelder
c6dae2f17f
Merge pull request #2145 from edx/ned/codejail-slug
...
Ned/codejail slug
2013-05-29 12:58:07 -07:00
cahrens
b77919a849
Remove unnecessary fields.
2013-05-29 15:53:30 -04:00
Peter Fogg
0332d22a02
Prevent autoplaying of videos in Studio.
2013-05-29 15:52:42 -04:00
cahrens
551a1c1516
pep8 and documentation cleanup.
2013-05-29 15:47:46 -04:00
Peter Fogg
e0d5118ca0
Add hidden HTML so that the video player knows whether or not we're in the LMS.
2013-05-29 15:45:36 -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
Ned Batchelder
34911f68a7
Pass safe_exec a slug, the problem or response id; Use the latest CodeJail, with slug support.
2013-05-29 14:25:24 -04:00
Ned Batchelder
1d5f32d065
Give all response types an id attribute. CustomResponse had one, with a silly name. Use it for all ResponseTypes.
2013-05-29 14:24:43 -04:00
Chris Dodge
25dae57226
add the new category which can act as a category
2013-05-29 11:16:33 -04:00
Jane Manning
c976fee2d9
Copy changes to make dup email or public-username messages more informative
2013-05-28 15:32:53 -07:00
Will Daly
9f48c44fb6
Merge pull request #2120 from edx/feature/will/capa-template-tests
...
Added tests for capa input templates (unescaped HTML)
2013-05-28 13:55:05 -07:00
James Tauber
d38f266153
updated mitxmako README to clarify license and origin
2013-05-28 15:14:47 -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
Will Daly
dcb95291a9
Merge branch 'master' into feature/will/capa-template-tests
2013-05-28 08:07:54 -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
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
David Baumgold
007a4e534f
Merge pull request #2110 from edx/fix/db/lettuce-tests
...
Fix lettuce tests
2013-05-23 09:55:56 -07:00
David Baumgold
cf1e906c13
Fix lettuce tests
2013-05-23 12:50:19 -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
Calen Pennington
257dae634b
Merge pull request #2090 from edx/fix/cale/amazon-ses-errors
...
Fix/cale/amazon ses errors
2013-05-23 09:17:51 -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
Will Daly
a4ad495bef
Merge pull request #2084 from edx/fix/will/lettuce-browser-size
...
Set the browser size on startup of acceptance tests.
2013-05-23 08:00:48 -07:00
Calen Pennington
f521b8e8c0
Handle errors while sending emails around changing user data
...
The most common error is Amazon SES having blacklisted an email address.
However, we handle any error being raised during user.email_user.
Fixes JIRA LMS-131
2013-05-23 10:27:34 -04:00
Peter Baratta
db261dc1c3
Add docstrings; test divsion by zero at Response level
2013-05-23 10:18:30 -04:00
