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
Calen Pennington
b2b6ca5f7b
Record junit reports of jasmine tests
2013-05-22 22:01:44 -04:00
Calen Pennington
7ef6132194
Make factories return unicode data
...
Django always returns string data from the database as unicode objects
(ref: https://docs.djangoproject.com/en/1.4/ref/unicode/#models ).
Therefor, our factories should do the same
2013-05-22 21:38:07 -04:00
Calen Pennington
2add58bb5a
Create sequences for names, emails, and usernames in UserFactory
2013-05-22 21:35:49 -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
David Baumgold
350c5460af
Revert "Update jasmine-jquery to 1.5.1"
...
This reverts commit 90a9c386eb
2013-05-22 17:29:52 -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
David Baumgold
525fe2d581
Expose a dummy gettext function in the Jasmine test env
2013-05-22 15:55:53 -04:00
David Baumgold
90a9c386eb
Update jasmine-jquery to 1.5.1
2013-05-22 15:55:52 -04:00
David Baumgold
d10e644c6e
Added sinon.js to project
2013-05-22 15:55:52 -04:00
David Baumgold
0c368011da
Move underscore templates into separate files, included in Mako templates
2013-05-22 15:55:50 -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
Chris Dodge
470569545d
add a migrations to the new django_comment_common to keep things a bit more consistent with our normal useage.
2013-05-22 13:32:32 -04:00
