Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,677 Commits 1 Branch 0 Tags
7ae534799b514bffdd588db45d65cd2e39c4f68e
Commit Graph

89 Commits

Author SHA1 Message Date
David Baumgold
c6c5e50d86 Hook up notification framework to default AJAX error callback 
And delete `CMS.ServerError`
 2013-05-22 15:55:49 -04:00
David Baumgold
e9a8f408bf Add {reset: true} to all collection.fetch() calls 
This is to fix a bug with the Backbone 1.0 upgrade; some views were listening to
reset events that were not longer getting fired
 2013-05-14 16:43:41 -04:00
cahrens
f36494e5dd Need to be able to access smoothScrollTop. This is a temporary change-- I'll come up with a proposal to namespace our helper functions in a nicer way. 2013-04-09 09:41:52 -04:00
Brian Talbot
3f22826e26 studio - alerts: adding some ARIA-centric accessibility information to example prompts/notifications and advanced settings save notification 2013-04-08 16:28:31 -04:00
Brian Talbot
bcf4775610 studio - alerts: removed banners as a design pattern (not using them) and corrected advanced setting links and smoothscrolling 2013-04-08 13:47:01 -04:00
cahrens
cea0f9252c Make sure we don't mark the message bar as hiding if it is not shown. 2013-04-08 11:02:06 -04:00
cahrens
7f1c89b492 Merge branch 'master' into feature/btalbot/studio-alerts 2013-04-08 10:28:52 -04:00
Brian Talbot
1a68d516fb resolving local merge with master 2013-04-05 15:27:08 -04:00
Brian Talbot
512e4fe3bd resolving local merge with master and sprucing style and templates for merge with master 2013-04-05 15:13:21 -04:00
Brian Talbot
52a2fc7114 changing timeFormat for settings views 2013-04-04 17:45:40 -04:00
Mark L. Chang
7b5ec1bc41 instrumented advanced settings 2013-04-04 01:51:14 -04:00
Brian Talbot
d87c4e3866 resolving local merge with master 2013-04-03 15:01:55 -04:00
cahrens
fa63bcce94 Allow clearing of dates (except for course start date). 
https://edx.lighthouseapp.com/projects/102637/tickets/231
 2013-03-25 17:25:49 -04:00
Brian Talbot
cdcdfd49e0 studio - alerts: resolving local master merge conflcits 2013-03-18 10:58:16 -04:00
Brian Talbot
36746fb729 Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-12 16:05:54 -04:00
cahrens
7e8fcb85ff Updated Selenium test, deleted dead code related to Advanced Settings. 2013-03-11 16:56:24 -04:00
cahrens
f5dd5d35e9 Need to trigger invalid instead of error, after changes for new version of Backbone. 2013-03-08 14:51:29 -05:00
cahrens
98e410816e New version of Backbone has separate invalid event. 2013-03-07 13:52:55 -05:00
cahrens
9ec33928ce New version of Backbone has separate invalid event. 2013-03-07 13:37:10 -05:00
Brian Talbot
62514d85a3 studio - alerts: loosely wired advanced settings with new notification and alert messages 2013-03-06 15:36:38 -05:00
Brian Talbot
ec90d349e2 studio - alerts: revisited advanced editor notification UI to marry new styles/behavior - WIP 2013-03-04 12:47:07 -05:00
cahrens
d7c28bfa11 Don't usurp ValidatingView's error handling. 
#219
 2013-03-01 15:24:56 -05:00
Don Mitchell
c11d627c88 Chrome/Safari don't use keypress for backspace and delete. 2013-02-22 11:00:27 -05:00
Don Mitchell
e5efcf65d3 remove console.log 2013-02-21 13:34:11 -05:00
Don Mitchell
851a99cb13 remove commented out code 2013-02-21 13:32:29 -05:00
Don Mitchell
116c74c075 Highlighting of field labels and smarter decision as to when to show the 
save cancel bar.
 2013-02-21 13:27:36 -05:00
cahrens
cc63f9c2db Unique IDs, other cleanup. 2013-02-20 17:11:34 -05:00
Brian Talbot
ad770a5ec8 studio - manual policy editor: converting to new page layout - WIP 2013-02-20 14:24:13 -05:00
cahrens
305f0b2a54 Add number of spaces for formatting of JSON. 2013-02-20 10:56:49 -05:00
cahrens
167d07037d Merged, delete Ace. 2013-02-19 14:56:37 -05:00
cahrens
f91060d197 Merge branch 'master' into feature/cas/manual-policy 
Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/settings/course_grading_policy.js
	cms/static/js/views/settings/main_settings_view.js
	cms/static/sass/_settings.scss
	cms/templates/settings.html
	cms/urls.py
 2013-02-19 13:27:35 -05:00
Brian Talbot
6c95460761 studio - resolving merge from master 2013-02-15 09:15:06 -05:00
cahrens
4ae691e88a Convert JSON that doesn't parse to String (unless object, array, or single quote). 2013-02-13 17:41:52 -05:00
Don Mitchell
d569c559ca Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/js/views/settings/main_settings_view.js
	cms/templates/index.html
	cms/templates/settings.html
 2013-02-12 16:57:00 -05:00
cahrens
f56729dbdb Turn off line wrapping. 2013-02-12 15:27:38 -05:00
Don Mitchell
76d675ba16 fix npe for time (bug 185) 2013-02-12 15:20:02 -05:00
Don Mitchell
40668133f7 Fix bug which I know I fixed before (perhaps on another branch?) to 
ensure old time had a value before comparing it to new time.
 2013-02-12 15:11:35 -05:00
cahrens
75ceed7f69 Show "successful save" message when a new edit is made. 2013-02-12 10:29:47 -05:00
cahrens
e9bb5eb1d0 Minor updates. 2013-02-11 17:27:39 -05:00
cahrens
98920e7e05 Switch to new notification/Save/Cancel mechanism (attached to bottom of viewport). 2013-02-11 16:17:32 -05:00
cahrens
437c806fce Enable/disable new entry button. 2013-02-11 14:16:04 -05:00
cahrens
67a557d59a Update Save/Cancel button state on typing events. 2013-02-11 14:07:11 -05:00
cahrens
044a8a5cf6 CodeMirror. 2013-02-11 12:37:31 -05:00
Don Mitchell
773dfce68d Try to make server and validation errors work together. Getting double 
errors when there are parent and child views both defining on error
handlers still.
 2013-02-11 12:04:45 -05:00
cahrens
039160f50c Beginning of CodeMirror. 2013-02-11 11:20:14 -05:00
cahrens
ac732f6b07 Beginnings of feedback regarding unsaved and saved changes. 2013-02-08 17:19:19 -05:00
Don Mitchell
09e8628037 add editor to new entries and when key changes 2013-02-08 16:58:50 -05:00
Don Mitchell
5254af2918 Letting render do its thing. The wrap confused the this pointer. 2013-02-08 15:36:42 -05:00
cahrens
4718c9a51a Forgot to define self when I moved code. 2013-02-08 11:17:02 -05:00
cahrens
950f5de3ca Move getSession() call out of render method to avoid crash on Chrome. 2013-02-08 08:26:24 -05:00