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
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
Chris Dodge
094e396556
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
2013-05-21 09:47:11 -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
Peter Baratta
5e8d2ce4f7
Start making comprehensive calc tests
2013-05-20 15:30:16 -04:00
marco
3cf915005b
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
2013-05-20 15:22:31 -04:00
marco
79c78cbccd
made firefox input number increment objects positioned as % to respond to page size accordingly
2013-05-20 15:22:21 -04:00
Brian Talbot
31b5c4ab61
studio - adds back in older lh() Sass function/mixin and moves it to the inheritied/to-be-sunsetted mixins sheet
2013-05-20 15:20:17 -04:00
cahrens
4d7c7f866a
Merge branch 'master' into feature/christina/metadata-ui
2013-05-20 15:06:40 -04:00
marco
7641e128de
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
2013-05-20 14:39:50 -04:00
