Chris Dodge
7efcd98135
fix up styles in header for this particular use case
2013-05-31 11:25:28 -04:00
Chris Dodge
62bacea371
use the right link to the login page in a particular use case: clicking activation email when not logged in
2013-05-31 11:10:14 -04:00
David Baumgold
4f1e6c484e
Put the advanced settings notifications back in
2013-05-30 15:08:40 -04:00
cahrens
aca5cbb215
Merge branch 'master' into bug/christina/preview_url
2013-05-28 12:13:19 -04:00
cahrens
e0bb4ad4dd
Preview url is read in from environment file.
2013-05-28 12:04:48 -04:00
Vik Paruchuri
cef401f246
Swap icon to icon-table
2013-05-24 16:20:59 -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
Frances Botsford
dfb623a29f
removed old icon css and js files and references that are no longer needed
2013-05-24 09:01:15 -04:00
cahrens
138ad3988f
Update test (and set PREVIEW_LMS_BASE to something different so we can actually test the method).
2013-05-23 17:06:02 -04:00
cahrens
a03a4fdd07
PREVIEW_LMS_BASE must now be set (default value does not work for both edge and edx). Make this work locally as well.
...
https://edx.lighthouseapp.com/projects/102637/tickets/331
2013-05-23 16:45:10 -04:00
cahrens
522b76e847
PREVIEW_LMS_BASE must now be set (default value does not work for both edge and edx).
...
https://edx.lighthouseapp.com/projects/102637/tickets/331
2013-05-23 16:27:05 -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
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
David Baumgold
082e24c634
Removed references to server_error.js
2013-05-23 12:09:12 -04:00
David Baumgold
c26edbd631
jasmine-jquery compatiblity post-backport
2013-05-23 10:14:47 -04:00
Calen Pennington
b2b6ca5f7b
Record junit reports of jasmine tests
2013-05-22 22:01:44 -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
Brian Talbot
02e022ec7b
studio - revises the min amount of time the saving notification appears on the outline view
2013-05-22 15:55:53 -04:00
Brian Talbot
52b10df805
studio - revises copy of server error notification to include a default message and removes associated actions from notifications
2013-05-22 15:55:53 -04:00
David Baumgold
a0a71c0df2
Internationalization for JS
2013-05-22 15:55:53 -04:00
David Baumgold
9cbfee9894
Fix Jasmine tests related to invalid messages for section model
2013-05-22 15:55:53 -04:00
David Baumgold
2b01273f7f
Added some Jasmine tests for section views in Backbone
2013-05-22 15:55:52 -04:00
David Baumgold
6ed5a2aa01
Added tests for Backbone section models
2013-05-22 15:55:52 -04:00
