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

7629 Commits

This Branch
This Branch
All Branches
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
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
chrisndodge
c3d7c466ef Merge pull request #1120 from MITx/feature/christina/misc 
Bug fix: Show error if organization name has invalid characters
 2012-12-10 13:08:52 -08:00
Christina Roberts
6acae5b440 Show error if organization name has invalid characters 2012-12-10 15:19:34 -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
3f5254adb0 Added tool tip text to several other UI controls in templates 2012-12-10 13:32:06 -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
Christina Roberts
495b58241c Remove 'name' property if it exists in an AssignmentFormatGrader. Don and I decided to do this instead of throwing an xlint warning and forcing authors to delete the name property. 2012-12-10 11:50:21 -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
Don Mitchell
457b4aa645 Merge pull request #1108 from MITx/feature/cdodge/course-info 
Feature/cdodge/course info
 2012-12-07 12:51:09 -08: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
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
Calen Pennington
1a89c14b62 Merge pull request #1087 from MITx/fix/cdodge/lms-runtime-bugs 
Fix/cdodge/lms runtime bugs
 2012-12-07 06:38:16 -08:00
Don Mitchell
50d7e6160e Move models from common to cms. 
Add unit tests.
 2012-12-03 12:20:15 -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
Don Mitchell
8379e3038d Moved settings models from common to cms 2012-11-30 10:42:23 -05:00
Tom Giannattasio
63e38822bd course handouts styled and basic view handling added 2012-11-30 10:41:10 -05:00
Don Mitchell
d943f44f10 Append screw up (naive python goof) 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
Tom Giannattasio
f32388f2af markup tweaks to fix content crunching 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
Don Mitchell
111e8521db Hopefully the course-info changes I had made w/o link destruction 2012-11-30 10:40:19 -05:00
Tom Giannattasio
b41ab37c4e fixed padding on a few buttons 2012-11-30 07:51:14 -05:00
Tom Giannattasio
fbbf9e9c0f key bindings and speed reworkings for the my courses and courseware pages 2012-11-29 16:21:51 -05:00
Don Mitchell
7ed0002bd2 Details now has validation except for youtube ids which cause 
crossdomain policy violations when i try to validate.
 2012-11-29 16:18:36 -05:00
Chris Dodge
2aceb2e44a make sure when defining the course namespace in the replace url methods that we explicitly state the parameter name. There are some optional parameters and if we don't define the parameter name, it'll end put being interpreted as a different parameter 2012-11-29 15:56:03 -05:00
Chris Dodge
46870f4391 be sure to always pass in a course namespace - which can be just the location of the module itself since it has the same org/course pair - when rewriting links. Also, allow for an option parameter in get_module() to disable the wrapping of the module's HTML with the xmodule_display.html. This is needed for ancillary course content such as 'about', 'course info', which are now stored as xmodules, but should not be wrapped in xmodule_display.html as it breaks some styling 2012-11-29 15:09:28 -05:00
Chris Dodge
050cb89cf7 fix crash with working with custom tags with XML filestore 2012-11-29 13:24:41 -05:00