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

7676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
e0849e8b5a Cache to debug other branch 2012-12-13 16:34:58 -05:00
Don Mitchell
a39d609eea more 2012-12-13 12:35:17 -05:00
Don Mitchell
595edac4c2 Caching changes to fix critical bug on other branch 2012-12-13 12:33: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
Christina Roberts
113c99e0b1 Merge pull request #1141 from MITx/feature/christina/misc 
Try running xmodule Jasmine tests on Jenkins (again!).
 2012-12-13 06:28:27 -08:00
Christina Roberts
c4e86140c1 Try running xmodule Jasmine tests on Jenkins (again!). 2012-12-13 09:26:46 -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
chrisndodge
aa2d376b88 Merge pull request #1140 from MITx/fix/cdodge/remove-xmodule-jasmine-tests 
trying backing out the addition of the xmodule jasmine tests and see if ...
 2012-12-12 18:15:19 -08:00
Chris Dodge
e0469c35ce trying backing out the addition of the xmodule jasmine tests and see if builds start passing again on Jenkins 2012-12-12 21:13:51 -05:00
chrisndodge
6e2159cb1a Merge pull request #1139 from MITx/fix/cdodge/code-mirror-on-course-info 
more tweeks on CodeMirror. Also do a re-ordering of operations when crea...
 2012-12-12 17:49:38 -08: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
chrisndodge
da73fc77d5 Merge pull request #1137 from MITx/fix/cdodge/code-mirror-on-course-info 
call remove() on CodeMirror
 2012-12-12 12:07:18 -08:00
Chris Dodge
84b08b5ef5 call remove() on CodeMirror 2012-12-12 15:03:49 -05:00
Calen Pennington
98b09a150c Merge pull request #1136 from MITx/feature/christina/misc 
Try running xmodule Jasmine tests on Jenkins.
 2012-12-12 11:26:30 -08:00
Christina Roberts
94ee5b887a Try running xmodule Jasmine tests on Jenkins. 2012-12-12 14:24:05 -05:00
chrisndodge
d3de52e649 Merge pull request #1134 from MITx/fix/cdodge/code-mirror-on-course-info 
dispose of  when we close the editor
 2012-12-12 11:10:43 -08:00
Chris Dodge
0c68ba8bfa dispose of when we close the editor 2012-12-12 14:09:09 -05:00
chrisndodge
710d73a938 Merge pull request #1133 from MITx/feature/christina/misc 
Feature/christina/misc
 2012-12-12 10:55:46 -08:00
Brian Talbot
833a58d626 grading - post- cms-master rebase CSS tweaks on overview template 2012-12-12 13:44:12 -05:00
Brian Talbot
df7de980b3 added in additional tool tips for icon/graphic-based controls on overview 2012-12-12 13:33:31 -05:00
Brian Talbot
25e730d0c3 grading - added in tooltips for graded toggle on overview UI and moved icon libraries and tooltip asset references to base template 2012-12-12 13:31:59 -05:00
Brian Talbot
85e937cb94 grading - tooltip for grading UI link wip 2012-12-12 13:30:24 -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
Christina Roberts
2f55583ee7 Merge remote-tracking branch 'origin/feature/cale/cms-master' into feature/christina/misc 2012-12-12 13:08:22 -05:00
Christina Roberts
c87eb08b1e Bug fix for Lighthouse #22. 
html names are automatically converted to the symbols they describe.
 2012-12-12 12:57:31 -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
cd23c8f8b6 Python path bug 2012-12-12 11:02:42 -05:00
Don Mitchell
d1c0eb8fc2 Somehow linked file disappeared again. 2012-12-12 10:55:57 -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
Don Mitchell
c4f4da5e46 Giving up for now on unit tests which mock http posts 2012-12-11 17:10:04 -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
70e2e04814 Remove not yet wired tabs 2012-12-10 18:57:48 -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