cahrens
cd6946088e
Merge branch 'feature/cale/cms-master' into feature/christina/misc
2012-12-14 11:50:56 -05:00
cahrens
dd7ed956dd
Bug fix for Studio #55 .
2012-12-14 11:37:45 -05:00
chrisndodge
d965221ec7
Merge pull request #1135 from MITx/bug/btalbot/cms-tooltips
...
debugged tooltip latency/vanishing issue
2012-12-14 06:26:48 -08: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
Brian Talbot
caf143514c
debugged tooltip latency/vanishing issue
2012-12-12 14:11:30 -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
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
39024a7fee
Grading mostly working
2012-12-10 16:32:33 -05:00
Christina Roberts
6acae5b440
Show error if organization name has invalid characters
2012-12-10 15:19:34 -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
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
50d7e6160e
Move models from common to cms.
...
Add unit tests.
2012-12-03 12:20:15 -05:00
Don Mitchell
8379e3038d
Moved settings models from common to cms
2012-11-30 10:42:23 -05:00
Don Mitchell
0b7bff4c3f
Everything tested and ready for Tom to fix
2012-11-30 10:40:19 -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
Chris Dodge
021ed3bca6
fix crash with working with custom tags with XML filestore
2012-11-29 13:24:07 -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
Don Mitchell
c0da6e4249
Details done except for syllabus
2012-11-28 17:10:41 -05:00
Don Mitchell
a48a392eb2
Trying to get scss back
2012-11-28 10:02:01 -05:00
Don Mitchell
5331ae055f
Got time change hooked up but gained a spurious call to change on date
...
change.
2012-11-27 15:15:28 -05:00
Don Mitchell
2238019539
Details tab works except for file references
2012-11-27 11:32:03 -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
8e68573243
Merge pull request #1041 from MITx/fix/cdodge/video-captions
...
wire through course asset path information to the video playback module ...
2012-11-26 08:29:05 -08:00
Chris Dodge
6d45445aef
assume that users are putting caption information in /static/subs. We'll enforce this on the xlint utility
2012-11-26 11:19:51 -05:00
Chris Dodge
2d7f1b73d7
consolidate logic to compute caption path to server-side, we don't need to do this client-side
2012-11-26 11:19:51 -05:00
Chris Dodge
71f16d40e1
wire through course asset path information to the video playback module and corresponding .coffee files
2012-11-26 11:19:51 -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
Calen Pennington
2b6e2b5143
Merge pull request #1056 from MITx/bugfix/ichuang/xml_importer
...
xml_importer bugfix - when importing without policy override use course_location
2012-11-26 06:54:22 -08:00
Don Mitchell
f0c94a2c7e
Beginning test of details tab.
2012-11-21 15:17:18 -05:00
Don Mitchell
339949f934
Another checkpoint before pull/merge
2012-11-20 11:37:14 -05:00
Don Mitchell
241c9bb1ac
Checkpoint to rebase
2012-11-19 16:02:30 -05:00
Don Mitchell
a9233dfd44
Merge branch 'course-info' into feature/dhm/cms-settings
...
Conflicts:
cms/djangoapps/contentstore/views.py
2012-11-19 16:00:27 -05:00
Chris Dodge
ec6b1a12e9
insert the xmodule.coffee dependency into HTMLSnippet().get_javascript(). This allows us a single point to define this dependency.
2012-11-19 15:46:57 -05:00
Don Mitchell
8c8be3e82a
Cleaned up imports
2012-11-19 10:38:58 -05:00
Don Mitchell
88cc5a080b
Everything tested and ready for Tom to fix
2012-11-19 10:38:58 -05:00
David Ormsbee
336caa0feb
Batch together alter statements to minimize how long we lock the auth_users table
2012-11-19 10:30:22 -05:00
Victor Shnayder
956b704786
add migration to remove askbot columns
2012-11-19 10:19:31 -05:00
Calen Pennington
8525b898d7
Add migration to make columns added by askbot nullable, in preparation for eventually deleting them
2012-11-19 09:48:51 -05:00
ichuang
f84f08fae4
xml_importer bugfix - when importing without policy override use course_location
2012-11-17 21:38:15 -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
Calen Pennington
3b2b8ad4fa
Merge pull request #1053 from MITx/feature/jzoldak/common-jasmine-tests
...
Capa Problem jasmine tests running independently
2012-11-16 13:35:19 -08:00
Calen Pennington
719277876f
Merge pull request #1051 from MITx/fix/cdodge/code-mirror-crash-on-style-blocks
...
remove 'mode' property when creating a new CodeMirror control. This appe...
2012-11-16 12:52:33 -08:00
Jay Zoldak
8d0abcb974
Merge branch 'feature/cale/cms-master' into feature/jzoldak/common-jasmine-tests
2012-11-16 15:10:19 -05:00
Jay Zoldak
ea4c0ed86a
Refactor fixtures for capa problems.
2012-11-16 14:59:46 -05:00
