Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

649 Commits

Author SHA1 Message Date
Don Mitchell
595edac4c2 Caching changes to fix critical bug on other branch 2012-12-13 12:33:22 -05:00
Brian Talbot
7d823d9ed9 resolving styling merge conflicts 2012-12-13 11:43:48 -05:00
Brian Talbot
9f863fd96e styling - adjusting collapse button CSS lost in cms-master rebase 2012-12-13 11:37:51 -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
66004aeb2d pulled out component types from behind add component button 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
Tom Giannattasio
39a882e278 more defined header, new icons, cleaner static tabs page 2012-12-13 11:25:15 -05:00
Tom Giannattasio
95dfc730dc new header styles; collapse all button added to courseware 2012-12-13 11:20:30 -05:00
Tom Giannattasio
8294b05802 style tweaks to tabs and static pages; key bindings for new user form 2012-12-13 11:20:30 -05:00
Tom Giannattasio
197ea33235 tweaked body color and window styles; adjusting new buttons 2012-12-13 11:20:30 -05:00
Tom Giannattasio
74ce3d225f removed new course button on click to prevent multiple instantiations 2012-12-13 11:19:22 -05:00
Tom Giannattasio
131f475156 headers still funky, absolutely positioned to avoid bugs for now; removed public tag and grey style 2012-12-13 11:19:22 -05:00
Tom Giannattasio
128a402b7f fixed long header bug 2012-12-13 11:19:22 -05:00
Don Mitchell
909fd93c80 Merge branch 'feature/btalbot/cms-gradable' of github.com:MITx/mitx into feature/btalbot/cms-gradable 
Conflicts:
	cms/static/sass/_variables.scss
 2012-12-13 10:40:49 -05:00
chrisndodge
6ab97b6fd9 Merge pull request #1125 from MITx/feature/dhm/cms-settings 
Feature/dhm/cms settings
 2012-12-13 06:52:49 -08:00
Don Mitchell
41ca47edfc Add flag to turn template caching on/off (default to off) 2012-12-13 09:47:51 -05:00
Brian Talbot
57385b8d3f grading - resolved rebase/merge conflicts 2012-12-13 09:45:11 -05:00
Chris Dodge
3421331f17 up the template caching version number to avoid stale caches since there's been a change to the underscore templates 2012-12-13 09:25:13 -05:00
Chris Dodge
fc8281d517 up the template caching version number to avoid stale caches since there's been a change to the underscore templates 2012-12-13 09:22:01 -05:00
Chris Dodge
35317b0679 more tweeks on CodeMirror. Also do a re-ordering of operations when creating a new Update, put the CodeMirror binding after the form has been inserted into the DOM. It appears to improve some rendering characteristics. 2012-12-12 20:47:37 -05:00
Don Mitchell
e75f63e957 More merge repairs. Hopefully done. 2012-12-12 17:13:55 -05:00
Don Mitchell
ea6532efd7 Fix screwed up merge 2012-12-12 16:51:05 -05:00
Chris Dodge
84b08b5ef5 call remove() on CodeMirror 2012-12-12 15:03:49 -05:00
Chris Dodge
0c68ba8bfa dispose of when we close the editor 2012-12-12 14:09:09 -05:00
Brian Talbot
833a58d626 grading - post- cms-master rebase CSS tweaks on overview template 2012-12-12 13:44:12 -05:00
Brian Talbot
fd41a2f6b1 grading - added in sub section controls 2012-12-12 13:30:24 -05:00
Brian Talbot
2b6bfc4f2b grading - added in gradable by type menu to sub section editing 2012-12-12 13:30:24 -05:00
Brian Talbot
4cd2114f3b grading - finalized style/states for grading UI on courseware overview 2012-12-12 13:30:24 -05:00
Brian Talbot
bdebc60266 assignments - wip 2012-12-12 13:30:24 -05:00
Brian Talbot
5239dcc9bd gradable sections - adding in assets and markup - wip 2012-12-12 13:23:02 -05:00
Don Mitchell
71455f760e Check for null dates before setting time in timepicker. 
Remove syllabus as it's not instrumented.
 2012-12-12 11:37:04 -05:00
Don Mitchell
bb31fb748f Somehow linked file disappeared again. 2012-12-12 10:49:22 -05:00
Don Mitchell
04ea2c8242 Merge remote-tracking branch 'origin/feature/cale/cms-master' into 
feature/dhm/cms-settings

Conflicts:
	cms/static/sass/_base.scss
 2012-12-12 10:23:06 -05:00
Don Mitchell
056bad4c66 Time zone prompt change and tooltip 
CodeMirror on overview entry
 2012-12-12 10:18:39 -05:00
Don Mitchell
d7591bc0c1 Show the timezone and current time (on tooltip) 2012-12-11 18:02:09 -05:00
chrisndodge
fbc0dfae74 Merge pull request #1116 from MITx/feature/btalbot/cms-tooltips 
Added Tool Tip UI Assets and References
 2012-12-11 12:33:19 -08:00
Don Mitchell
a46c1f4883 Updated underscore (using _.invert()) 
The scss junk comes from trying to sync w/ several branches. I believe
it's right but mostly unnecessary (surprised it showed up).
Debugged the merge w/ cms-master
Fixed grace period to be absolute time difference not a date on the
client side.
 2012-12-11 14:18:13 -05:00
Don Mitchell
0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into 
feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py
 2012-12-11 10:55:10 -05:00
Don Mitchell
5ea5a7c0a7 It works!!! 2012-12-10 18:55:35 -05:00
Don Mitchell
c43aa62fce Need to still add create and delete but otherwise done. 2012-12-10 18:01:28 -05:00
Don Mitchell
39024a7fee Grading mostly working 2012-12-10 16:32:33 -05:00
chrisndodge
c0ca573dcf Merge pull request #1117 from MITx/feature/dhm/course-info 
we also need to set  on window scope
 2012-12-10 10:56:30 -08:00
Chris Dodge
e2e5246853 we also need to set on window scope 2012-12-10 13:54:35 -05:00
Brian Talbot
a3579e3183 added in basic styles and plug-in reference for tool tip UI across Studio + Courseware Overview tool tip text 2012-12-10 13:02:55 -05:00
chrisndodge
e55d8fb21c Merge pull request #1115 from MITx/feature/dhm/course-info 
on AWS instances, base.js gets wrapped into a single JS file, but it's i...
 2012-12-10 08:26:08 -08:00
Chris Dodge
53f40e8d85 on AWS instances, base.js gets wrapped into a single JS file, but it's in a different scope. So to reference one of the globals in base.js, we have to reference it as window.XXXXXX. 2012-12-10 11:25:25 -05:00
chrisndodge
e1c452bc08 Merge pull request #1113 from MITx/feature/dhm/course-info 
move the underscore tempaltes to /static/client-templates and update the...
 2012-12-10 07:17:19 -08:00