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

757 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
chrisndodge
89ad8cc564 Merge pull request #1086 from MITx/feature/studio/tom/tabs-cleanup 
Static tabs cleanup
 2012-11-29 06:49:28 -08:00
Tom Giannattasio
6cfabb76c1 finished styling for static tabs; required some rework of global styles 2012-11-28 15:39:43 -05:00
Tom Giannattasio
6ad8a9aced most of the styling and function changes made 2012-11-28 15:10:46 -05:00
Chris Dodge
b3dcc140b7 made a special 'module preview' view for Static Tabs in the CMS. Per Tom, he'd like just the Display Name to show up in the static tab editor until the end-user clicks the Edit button 2012-11-26 14:22:13 -05:00
Calen Pennington
4e3da342d7 Merge pull request #1048 from MITx/feature/cdodge/xlint 
Feature/cdodge/xlint
 2012-11-26 08:11:34 -08:00
Chris Dodge
fff3782884 cleave xlint entry point in xml_importer.py to be separate from the import method 2012-11-26 11:05:57 -05:00
Tom Giannattasio
f2fec99efa fixed header float bug 2012-11-26 10:46:02 -05:00
Calen Pennington
ee618d4223 Merge pull request #1069 from MITx/feature/cas/tom/lms-styles 
added basic lms styles
 2012-11-26 06:57:57 -08:00
Calen Pennington
c6a9f722cc Merge pull request #1049 from MITx/feature/jzoldak/cms-unit-testing 
Add Studio integration with factory boy for creating XModule objects in the data store
 2012-11-26 06:54:50 -08:00
Tom Giannattasio
a98cead8ee added basic lms styles 2012-11-20 13:02:08 -05:00
Calen Pennington
650f537763 Merge pull request #1043 from MITx/feature/cale/quieter-jasmine-tests 
Make jasmine testing quieter
 2012-11-16 13:35:45 -08:00
Chris Dodge
9ae8558382 put htmlmixed.js and css.js includes in CMS base.html so that we can support html mode in CodeMirror 2012-11-15 20:35:45 -05:00
Chris Dodge
d21095367a Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint 2012-11-15 13:16:02 -05:00
Jay Zoldak
0654665b20 Enable XModule factories to work with the currently version of Factory Boy at PyPI (1.2.0) so that the code will work with 'pip install factory_boy' 2012-11-15 11:40:29 -05:00
Jay Zoldak
edb9f8ce40 Merge branch 'feature/cale/cms-master' into feature/jzoldak/cms-unit-testing 2012-11-14 15:16:17 -05:00
Jay Zoldak
6f5b3fa1bb Create factory for Xmodule items 2012-11-14 15:12:09 -05:00
Jay Zoldak
58fef4a32a Create factory for courses 2012-11-14 14:52:24 -05:00