Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

2914 Commits

Author SHA1 Message Date
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
Chris Dodge
79e48dde97 move the underscore tempaltes to /static/client-templates and update the references 2012-12-10 10:01:08 -05:00
chrisndodge
a4ed3a7ba9 Merge pull request #1088 from MITx/feature/dhm/course-info 
Course info style and implementation
 2012-12-10 05:59:59 -08:00
Tom Giannattasio
299b28007b clean up of users page 2012-12-07 15:37:22 -05:00
Chris Dodge
402e031ecc forgot to add a if {} guard on the CodeMirror instantiation on one use case 2012-12-07 15:27:00 -05:00
Chris Dodge
b81f802b1d get CodeMirror to work - set the right background in the .scss, make sure the textarea is visible before binding it to CodeMirror 2012-12-07 14:38:03 -05:00
Tom Giannattasio
c8b4e8852f added modal cover for editors 2012-12-07 14:31:48 -05:00
Chris Dodge
130de49b49 support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed 2012-12-07 09:45:12 -05:00
Tom Giannattasio
75b413b5ac reworked add component steps 2012-12-07 09:35:34 -05:00
Tom Giannattasio
22a61cdfb7 pulled out component types from behind add component button 2012-12-06 17:00:16 -05:00
Tom Giannattasio
6c75a71e8c cleaned up subsection and unit page 2012-12-06 16:34:13 -05:00
Tom Giannattasio
1a40209082 cleaned up editor styles; cleaned up static tabs page 2012-12-06 14:25:30 -05:00
Tom Giannattasio
6d89835245 more defined header, new icons, cleaner static tabs page 2012-12-05 17:01:29 -05:00
Tom Giannattasio
ad84a961da new header styles; collapse all button added to courseware 2012-12-05 12:05:14 -05:00
Tom Giannattasio
72ebf4c862 style tweaks to tabs and static pages; key bindings for new user form 2012-12-04 14:54:02 -05:00
Tom Giannattasio
7cba7c9b41 tweaked body color and window styles; adjusting new buttons 2012-12-04 13:49:07 -05:00
Tom Giannattasio
4e7d931d7e removed new course button on click to prevent multiple instantiations 2012-12-04 11:00:28 -05:00
Brian Talbot
63637579f4 added in additional tool tips for icon/graphic-based controls on overview 2012-12-04 10:55:08 -05:00
Brian Talbot
c60aa6789a grading - added in tooltips for graded toggle on overview UI and moved icon libraries and tooltip asset references to base template 2012-12-04 09:59:44 -05:00
Tom Giannattasio
1845fc7211 headers still funky, absolutely positioned to avoid bugs for now; removed public tag and grey style 2012-12-03 16:29:27 -05:00
Tom Giannattasio
731cfe5bb5 fixed long header bug 2012-12-03 16:15:00 -05:00
Brian Talbot
fc26edb156 grading - added in sub section controls 2012-12-03 16:13:18 -05:00
Brian Talbot
874a12aa4a grading - added in gradable by type menu to sub section editing 2012-12-03 10:47:56 -05:00
Brian Talbot
12a4bafdbc grading - finalized style/states for grading UI on courseware overview 2012-12-03 09:53:06 -05:00
Brian Talbot
ea91f65780 assignments - wip 2012-11-30 13:59:48 -05:00
Tom Giannattasio
7294e978d9 fixed firefox bug 2012-11-30 13:14:52 -05:00
chrisndodge
2d866418ad Merge pull request #1089 from MITx/feature/studio/tom/speedups 
some quick speedups
 2012-11-30 08:55:31 -08:00
Tom Giannattasio
63e38822bd course handouts styled and basic view handling added 2012-11-30 10:41:10 -05:00
Tom Giannattasio
b75bca2583 new styles for the handouts sidebar 2012-11-30 10:41:10 -05:00
Tom Giannattasio
a25d6b0862 wrapped up data syncing and date format issues 2012-11-30 10:41:10 -05:00
Tom Giannattasio
335c6949f8 started consolidating editor functions 2012-11-30 10:41:10 -05:00
Tom Giannattasio
5dd90aa9cb working on date picker; conflicts with ids 2012-11-30 10:41:10 -05:00
Tom Giannattasio
3d9961f874 started adding date picker 2012-11-30 10:41:10 -05:00
Tom Giannattasio
46d4e27cdc update styles fixed; tweaks to white button mixins; add update to top of list; render updates upon save 2012-11-30 10:41:10 -05:00
Tom Giannattasio
261c43aade add sidebar column; fixed main column float bug 2012-11-30 10:40:19 -05:00
Don Mitchell
0b7bff4c3f Everything tested and ready for Tom to fix 2012-11-30 10:40:19 -05:00