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 |
|
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
|
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 |
|
Don Mitchell
|
0b7bff4c3f
|
Everything tested and ready for Tom to fix
|
2012-11-30 10:40:19 -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 |
|
Don Mitchell
|
c0da6e4249
|
Details done except for syllabus
|
2012-11-28 17:10:41 -05:00 |
|
Don Mitchell
|
a68dee9743
|
Got rid of datepair as it was generating a jquery bug but also not
doing what we wanted.
|
2012-11-27 16:38:21 -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
|
5e2dba6bad
|
Minor cache to pull talbott's changes
|
2012-11-27 13:22:44 -05:00 |
|
Don Mitchell
|
2238019539
|
Details tab works except for file references
|
2012-11-27 11:32:03 -05:00 |
|
Don Mitchell
|
f0c94a2c7e
|
Beginning test of details tab.
|
2012-11-21 15:17:18 -05:00 |
|
Don Mitchell
|
f8ee5c2614
|
Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into
feature/dhm/cms-settings
Conflicts:
cms/templates/settings.html
|
2012-11-20 11:55:19 -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
|
88cc5a080b
|
Everything tested and ready for Tom to fix
|
2012-11-19 10:38:58 -05:00 |
|
chrisndodge
|
550114704e
|
Merge pull request #974 from MITx/feature/cale/cas-dont-delete-subsection-children
Only update data in modules that have been set when passing into save_it...
|
2012-10-25 11:04:45 -07:00 |
|
Calen Pennington
|
bd1233d38c
|
Only update data in modules that have been set when passing into save_item, and don't force callers to set everything
|
2012-10-25 13:56:24 -04:00 |
|
Tom Giannattasio
|
a0f4e67235
|
fixed fakepath on import
|
2012-10-25 12:51:21 -04:00 |
|
Calen Pennington
|
44bc1a06dd
|
Merge pull request #962 from MITx/bug/cas/tom/fakepath
fixed multiple file picker bug; removed 'fakepath' from uploading file n...
|
2012-10-24 13:00:22 -07:00 |
|
Tom Giannattasio
|
b4ce13af8e
|
more specific fakepath cut
|
2012-10-24 15:58:29 -04:00 |
|
Calen Pennington
|
9022c0d661
|
Merge pull request #964 from MITx/bug/cas/tom/section-name-alert
replaced section name alert with a spinner
|
2012-10-24 12:47:08 -07:00 |
|
Tom Giannattasio
|
4e3f7626be
|
replaced section name alert with a spinner
|
2012-10-24 15:43:02 -04:00 |
|
Tom Giannattasio
|
4afda98420
|
fixed multiple file picker bug; removed 'fakepath' from uploading file name
|
2012-10-24 15:22:23 -04:00 |
|
Calen Pennington
|
9dc6cdbda0
|
Remove vestigial save-subsection button
|
2012-10-24 15:18:03 -04:00 |
|
Tom Giannattasio
|
ddf3e2e39c
|
removed unused edit policy function
|
2012-10-24 14:56:30 -04:00 |
|
Tom Giannattasio
|
1e988c3f5e
|
disabled policy names always and removed edit button
|
2012-10-24 14:46:46 -04:00 |
|
Tom Giannattasio
|
ef5ce4e8f4
|
fixed policy editing workflow
|
2012-10-24 14:46:45 -04:00 |
|
Tom Giannattasio
|
b73ceb5642
|
show spinner more than once
|
2012-10-24 14:46:45 -04:00 |
|
Calen Pennington
|
6083ba1dc3
|
Merge pull request #945 from MITx/feature/cas/tom/section-details
Feature/cas/tom/section details
|
2012-10-23 10:20:08 -07:00 |
|
Tom Giannattasio
|
f84b603133
|
wrapped up section date setting; need help with already published sections
|
2012-10-22 16:43:44 -04:00 |
|
Tom Giannattasio
|
e3457fa230
|
started styling section date pickers
|
2012-10-22 16:43:44 -04:00 |
|