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
cahrens
c8d6d5d283
Selenium tests.
2013-05-23 11:34:02 -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
David Baumgold
a15a283674
Merge pull request #2087 from edx/backbone-notifications-font-awesome
...
Backbone notifications & font awesome integration
oh thank god this is finally getting merged
2013-05-23 07:31:43 -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
Jay Zoldak
e6a1a9faaf
Merge branch 'master' into feature/cdodge/autoprovision-forums-master
2013-05-23 10:19:39 -04:00
Peter Baratta
db261dc1c3
Add docstrings; test divsion by zero at Response level
2013-05-23 10:18:30 -04:00
David Baumgold
c26edbd631
jasmine-jquery compatiblity post-backport
2013-05-23 10:14:47 -04:00
Jay Zoldak
af8b509e2d
Merge pull request #2106 from edx/fix/nate/application-mako-crash
...
Use .get instead of [] to access env hash
2013-05-23 06:31:51 -07:00
Nate Hardison
daa0ac2f01
Capture Mako exit code and fail fast if necessary
...
Capture the exit code of the Mako template engine invocation on
asset preprocessing and abort from the Rake task on failure. This
will prevent the LMS from continuing its attempt to start up,
preventing further configuration errors.
2013-05-22 19:42:22 -07:00
Nate Hardison
f826198214
Use "is not None" convention
2013-05-22 19:34:14 -07:00
Calen Pennington
b2b6ca5f7b
Record junit reports of jasmine tests
2013-05-22 22:01:44 -04:00
Chris Dodge
293d0a8645
special case the db setup for the cms acceptance tests. We need the comment client database tables to be created since we're creating the DB from scratch
2013-05-22 21:58:29 -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
a282153337
Cleaned up whitespace in docs
2013-05-22 21:38:03 -04:00
Calen Pennington
dcefd9e991
Taught rake test_lms and test_cms to run specific tests by passing a single argument
2013-05-22 21:37:48 -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
Nate Hardison
a0b6a176f2
Use .get instead of [] to access env hash
...
If the `THEME_NAME` environment token isn't defined, then the
application.scss.mako file will crash during preprocessing. Use
.get to avoid a crash.
2013-05-22 14:49:22 -07:00
David Baumgold
350c5460af
Revert "Update jasmine-jquery to 1.5.1"
...
This reverts commit 90a9c386eb
2013-05-22 17:29:52 -04:00
Ned Batchelder
4a92949218
scipy can go back into base. MySQL-python really does have to be installed after distribute has been updated by base.txt, I tested it.
2013-05-22 17:05:41 -04:00
Vik Paruchuri
39663ce947
Add in newlines at end of files
2013-05-22 17:01:49 -04:00
David Baumgold
4736527952
Add Jasmine tests to cover AJAX error notifications
2013-05-22 15:55:56 -04:00
David Baumgold
be8daf7468
/event was returning invalid JSON: fix it
2013-05-22 15:55:56 -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
Brian Talbot
2359c43855
studio - revises z-index/element depth levels for modals, notifications, prompts, and alerts to use universal .depth Sass extends
2013-05-22 15:55:56 -04:00
David Baumgold
3738078ce9
Load system feedback template for SectionEdit tests
2013-05-22 15:55:56 -04:00
David Baumgold
a5cc3a9ff9
Revert "Load *.js files more generically for Jasmine tests"
...
This reverts commit e13556b8b6b54b2791fe7bb1ba2ae5cde10114ce. This is because the
JS files need to be loaded in a specific order for the tests to run properly, and
we don't yet have a way to declare that.
2013-05-22 15:55:56 -04:00
Brian Talbot
bc6e480103
studio - corrects some errand new icon-based typography rules to use the line-height() mixin
2013-05-22 15:55:55 -04:00
David Baumgold
3cfadb8ae8
Migrated internationalization text into template for section name
2013-05-22 15:55:55 -04:00
Frances Botsford
fa330784d3
removed symbolset, replaced with fontawesome for gradable status; added transform-origin for saving notification animation to remove wobble
2013-05-22 15:55:55 -04:00
David Baumgold
dc2acb18ee
Moved global AJAX Error handler definition to main.coffee
2013-05-22 15:55:55 -04:00
David Baumgold
f3523d805f
Escape section name in Backbone to prevent XSS
2013-05-22 15:55:55 -04:00
Brian Talbot
bb0460cc0d
studio - changes all specific ss-icon-based selectors to use Font Awesome/generic icon- class name in notifications/prompts/alerts Sass
2013-05-22 15:55:55 -04:00
Frances Botsford
4e79d064a0
removed symbolset, replaced with fontawesome for alerts, notifications, and all references in js files
2013-05-22 15:55:55 -04:00
David Baumgold
9a61663dce
Restore HTML escaping in Mako template
2013-05-22 15:55:55 -04:00
David Baumgold
9e864834bd
Unify system feedback templates
...
Also, a SystemFeedback model no longer has a `type`, it has an `intent`. This is
because SystemFeedback views have `type`, as well, and this prevents a naming
collision.
2013-05-22 15:55:55 -04:00
David Baumgold
1e7e38824a
Shorten secondary action detection code
2013-05-22 15:55:54 -04:00
David Baumgold
5a06c69289
Add toBeShown and toBeHiding matchers for Jasmine
...
To reduce redundancy in tests
2013-05-22 15:55:54 -04:00
David Baumgold
af51d6483a
Load *.js files more generically for Jasmine tests
2013-05-22 15:55:54 -04:00
David Baumgold
0052eaacbc
Backbone section: don't save name on validation error
2013-05-22 15:55:54 -04:00
David Baumgold
55cd8afe34
Fixing copy for default server error message on notification
2013-05-22 15:55:54 -04:00
Brian Talbot
7ae534799b
studio - revises error message copy when section name is left blank on outline view
2013-05-22 15:55:54 -04:00
David Baumgold
c628a8a360
Fix test
2013-05-22 15:55:53 -04:00
David Baumgold
a8431eeae2
Section model shouldn't react to AJAX errors
...
Doing so overrides the AJAX error popup
2013-05-22 15:55:53 -04:00
David Baumgold
525fe2d581
Expose a dummy gettext function in the Jasmine test env
2013-05-22 15:55:53 -04:00
Brian Talbot
0fd3bb6079
studio - removes the .is-fleeting class/animation that is handled by backbone's min/max time for notifications
2013-05-22 15:55:53 -04:00
