Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,519 Commits 1 Branch 0 Tags
ffeabae069cd88e136b6bbfa66d3e5a9d6becd4d
Commit Graph

144 Commits

Author SHA1 Message Date
Peter Fogg
8a67454f98 Prevent creation of unnecessary template divs, and rename .single_templates to .single-templates for convention. 2013-06-03 15:36:55 -04:00
Peter Fogg
ff0c56b7fb Cleaning up code -- removed unnecessary lines, fixed indentation, renamed method. 2013-06-03 14:21:50 -04:00
Peter Fogg
cce65ce9ae Merge branch 'master' of github.com:edx/edx-platform into peter-fogg/single-click-video-creation 2013-06-03 09:15:52 -04:00
Peter Fogg
68581610a4 Allow single-click creation of course components that only have one template. 2013-05-31 16:22:51 -04:00
cahrens
a82daf0710 Change to Backbone collection. 2013-05-31 15:59:53 -04:00
Peter Fogg
56ed47b37f Allow single-click video creation. 2013-05-31 12:52:53 -04:00
cahrens
f0260757c5 Cleanup. 2013-05-29 16:50:22 -04:00
cahrens
625c6b518c Cleanup, change how we load templates. 2013-05-28 14:07:35 -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
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
dc2acb18ee Moved global AJAX Error handler definition to main.coffee 2013-05-22 15:55:55 -04:00
cahrens
3229aaf503 Call polyfill at right time. 2013-05-20 11:16:20 -04:00
marco
aa41aed9d1 prototype for polyfill on number input fields, minimal styling to up down buttons 2013-05-20 09:45:33 -04:00
cahrens
b16e17a250 Some i18n work and other minor cleanup. 2013-05-17 14:57:25 -04:00
cahrens
01ff8396e3 Fix CodeMirror initialization problem. 2013-05-16 12:34:39 -04:00
marco
bbb6a3c60d resolved metadata-edit conflict, adding in latex item into settings 2013-05-15 16:27:04 -04:00
marco
12dae84a07 commented out firefox polyfill ad well as xmodule css editor changes 2013-05-15 16:07:45 -04:00
cahrens
06d315484f Set "editing" name. 2013-05-15 11:52:38 -04:00
cahrens
a16740691f Minor update. 2013-05-15 11:39:07 -04:00
cahrens
faf31d9728 Get toggling between Editor and Settings working. 2013-05-15 11:34:49 -04:00
marco
98e692d15e fixed broken coffee script caused by errant pseudo code I checked in 2013-05-14 23:03:33 -04:00
marco
81e95f27db basic tab switching added 2013-05-14 22:31:11 -04:00
marco
8d8c8d83df updated unit styling, added polyfill js library, updated javascript handling for modes swap 2013-05-14 12:38:52 -04:00
marco
cb4019304a cleaned up references to proper elements in settings header mode buttons 2013-05-13 16:22:14 -04:00
marco
2360a111c8 attempt to trigger js event for mode button press, not breaking yet but nonfunctional 2013-05-12 12:08:04 -04:00
marco
04bb7335e7 removed extra section heading in settings DOM, placed settings after editor 2013-05-10 13:18:43 -04:00
cahrens
bfdbcc2f32 Beginnings of Backbone views/models. 2013-05-09 11:16:12 -04:00
cahrens
93f10ae8a0 Only save changed metadata fields. 2013-05-02 11:41:38 -04:00
cahrens
01ede40b03 Switching branches 2013-05-02 09:43:03 -04:00
Mark L. Chang
8fb6ce2eca added tracking to unit page and components 2013-04-04 01:51:15 -04:00
Mark L. Chang
22bd8da1f2 added event tracking to static pages 2013-04-04 01:51:14 -04:00
cahrens
eebef1e647 Don't save subsection and unit names until the change event. Fixes bugs #18 and #228. 2013-03-22 15:32:13 -04:00
Don Mitchell
3ea70eac9d Also clean up children after sort saved. 2013-03-20 17:59:24 -04:00
Don Mitchell
af136e75ca Fix bug 249 the ugly way (decerebrate the moronically impotent model) 2013-03-19 18:07:46 -04:00
cahrens
596de8ab2c Hook up "View Live" buttons and get "New Static Tab" working again. 2013-02-19 11:34:41 -05:00
Chris Dodge
7f32aae47d rename method to something that actually better reflects what it is doing. Also rename a variable to help with readability 2013-01-30 11:50:11 -05:00
Chris Dodge
28a2dd9a18 support reordering of static tabs in studio 2013-01-28 16:33:28 -05:00
Don Mitchell
c05d887904 Handle metadata from save being empty 2013-01-11 10:39:57 -05:00
cahrens
bcafc5fdfb Bug fix for modal cover not going way when click outside of edit (#106). 2013-01-10 11:07:11 -05:00
Brian Talbot
7921b32b63 studio - set viewport to scroll to bottom of component type list in component editor 2013-01-09 15:04:20 -05:00
cahrens
5daa6e7b73 Tom cruft to be deleted. 2013-01-09 10:49:59 -05:00
Don Mitchell
76f2ef6f7c Empty template now recognized as allowing markdown editing 
Save saves markdown and updates the xml
 2013-01-08 10:53:45 -05:00
cahrens
1c886b33cd Get buttons working again (with old behavior). 2013-01-03 12:24:17 -05:00
cahrens
b91e85c09f Remove tiny_mce. 2013-01-03 10:53:42 -05:00
Don Mitchell
4f32d5f34d Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor 
Conflicts:
	cms/static/sass/_assets.scss
	cms/static/sass/_base.scss
	cms/static/sass/_unit.scss
	cms/templates/unit.html
 2013-01-02 17:39:27 -05:00
Tom Giannattasio
2be1f852e7 clean up of users page 2012-12-13 11:28:59 -05:00
Tom Giannattasio
75c4909785 added modal cover for editors 2012-12-13 11:28:59 -05:00
Tom Giannattasio
d7b3f28d17 reworked add component steps 2012-12-13 11:28:59 -05:00
Tom Giannattasio
5b81d6b8cc cleaned up subsection and unit page 2012-12-13 11:28:59 -05:00
Tom Giannattasio
052b6f695a cleaned up editor styles; cleaned up static tabs page 2012-12-13 11:26:10 -05:00