Commit Graph

58450 Commits

Author SHA1 Message Date
Calen Pennington
c7209a736e Add links from the editing page for the cms to the corresponding page in the lms 2012-09-25 09:18:54 -04:00
Calen Pennington
71f39bc4c0 Merge pull request #751 from MITx/cdodge/meta-data-cms-editing
Cdodge/meta data cms editing
2012-09-25 06:16:51 -07:00
Chris Dodge
a85b255271 Define 'system metadata' which should not be editable by the end user. When posting back metadata edits, we need to fetch a copy of the existing metadata and apply the changes. 2012-09-24 16:54:46 -04:00
arjun810
e50cc77adf Merge pull request #767 from MITx/feature/dave/progress_reverse_quickfix
Quick fix for scores within a homework/lab showing up in reverse order.
2012-09-24 13:30:28 -07:00
David Ormsbee
5f6cc6ef93 Quick fix for scores within a homework/lab showing up in reverse order.
The real fix would be to have yield_dynamic_descriptor_descendents return
things in the proper order, but I'm not entirely sure what's going on
there, and this is a bug on prod now.
2012-09-24 16:24:38 -04:00
Chris Dodge
e6445ceaa0 adjust implementation to reflect feedback from Calen. Also limit the jQuery selection to be within the metadata-edit region, just to avoid picking up other elements decorated with that attribute 2012-09-24 13:03:34 -04:00
Victor Shnayder
eae2ef1d74 Merge pull request #765 from MITx/feature/victor/fix-index-js-caching
optimize!
2012-09-24 06:24:33 -07:00
Victor Shnayder
ea762eabf1 optimize! 2012-09-24 09:22:35 -04:00
Calen Pennington
2edda935f7 Merge pull request #764 from MITx/feature/victor/fix-index-js-caching
Also make the actual ?next redirection work with caching
2012-09-24 06:20:52 -07:00
Victor Shnayder
a8aced9bba Also make the actual ?next redirection work with caching
- use js instead of django to do the redirection
2012-09-24 09:15:06 -04:00
Calen Pennington
a45fe4a651 Merge pull request #759 from MITx/feature/victor/fix-index-js-caching
Fix login-if-?next behavior
2012-09-24 05:24:13 -07:00
arjun810
93ca4a4112 Merge pull request #763 from MITx/feature/arjun/188_minor
fix up syllabus
2012-09-24 04:33:05 -07:00
Arjun Singh
95997a5e67 fix up syllabus 2012-09-24 04:32:36 -07:00
arjun810
3bbe8b195d Merge pull request #762 from MITx/arjun/fix_progress_label
make progress label wider
2012-09-24 01:48:44 -07:00
Arjun Singh
60ed7046bd make progress label wider 2012-09-24 00:33:26 -07:00
arjun810
df2b06f235 Merge pull request #760 from MITx/kimth/fix-gradebook
Kimth/fix gradebook
2012-09-23 22:17:43 -07:00
Arjun Singh
f86933de4f Increase height of progress graph; allows for more cutoffs to look reasonable 2012-09-23 20:53:38 -07:00
Victor Shnayder
0b40e75166 Fix login-if-?next behavior
* for more context, see https://basecamp.com/1892446/projects/631155-devops/messages/4719963-strange-caching
2012-09-23 22:33:20 -04:00
kimth
6f62408ed6 Add comments 2012-09-23 18:47:35 -07:00
kimth
b376bc09a3 Arbitrary progress bar coloring 2012-09-23 18:46:10 -07:00
arjun810
d9946cc336 Merge pull request #757 from MITx/feature/ibrahim/fix-discussions-ie
Fix forums in IE9; apparently it's just very strict about the charset be...
2012-09-23 01:38:28 -07:00
kimth
c1fc50437a Adjust comments 2012-09-22 23:11:26 -07:00
Ibrahim Awwal
ad7e84ad0e Fix forums in IE9; apparently it's just very strict about the charset being a valid identifier. utf8 is not a valid identifier, utf-8 is. 2012-09-22 23:01:34 -07:00
kimth
48b93fc985 Arbitrary grading markers 2012-09-22 23:01:04 -07:00
Arjun Singh
5e49871e93 cs188 styling 2012-09-22 22:54:41 -07:00
kimth
056eebf755 Merge pull request #756 from MITx/feature/arjun/minor_style_changes
Feature/arjun/minor style changes
2012-09-22 19:12:02 -07:00
Arjun Singh
38c0a034fb Add slides nowrap 2012-09-22 18:06:19 -07:00
Arjun Singh
eca21e7c18 Fix syllabus in static_tab_wrapper; don't wrap slides 2012-09-22 17:46:35 -07:00
kimth
31ff5f2888 Merge pull request #755 from MITx/feature/arjun/188_styling
Some 188-specific styling + default styling for static tabs
2012-09-22 17:28:31 -07:00
Arjun Singh
015328ed5c more 188 styling 2012-09-22 17:19:27 -07:00
Arjun Singh
987d8ea43b Some 188-specific styling + default styling for static tabs 2012-09-22 14:17:34 -07:00
Victor Shnayder
ae06f13b96 Fix broken submission in firefox
- apparently have to define functions before using them...
2012-09-21 18:35:00 -04:00
Victor Shnayder
0a4a523e44 Merge pull request #754 from MITx/feature/victor/add-request-debug-view
Add more info to debug view
2012-09-21 14:50:24 -07:00
Victor Shnayder
450a20228d more info 2012-09-21 17:49:10 -04:00
David Ormsbee
b4ae3abe4d Merge pull request #752 from MITx/feature/victor/less-greedy-urls
Make static tab url pattern less greedy
2012-09-21 14:42:03 -07:00
David Ormsbee
6cd2a14b8e Merge pull request #753 from MITx/feature/victor/add-request-debug-view
add a debug_request view that prints the request.
2012-09-21 14:41:21 -07:00
Victor Shnayder
8d0cc1007a add a debug_request view that prints the request. 2012-09-21 16:51:49 -04:00
Chris Dodge
a3bf3fb1ca Put SequenceDescriptor back as a subclass of MakeModuleDescriptor. THe previous change to have it derive from EditorDescriptor was not safe as EditorDescriptor presumes that there is a edit box in the JS save flows. So we need to edit get_context() on MakoModuleDescriptor to also pass along the metadata to the Mako rendering templates 2012-09-21 15:49:07 -04:00
Chris Dodge
03fbacd4e1 Merge branch 'cdodge/meta-data-cms-editing' of github.com:MITx/mitx into cdodge/meta-data-cms-editing
Conflicts:
	cms/static/coffee/src/models/module.coffee
2012-09-21 15:24:09 -04:00
Victor Shnayder
cc13b61e30 add a trailing slash to avoid conflicts with slash-appending redirects 2012-09-21 15:12:23 -04:00
Victor Shnayder
8a57093309 Make static tab url pattern less greedy
* should fix links without trailing slash
2012-09-21 15:05:50 -04:00
Chris Dodge
4b6eabec5f Support editing of metadata on Sequences 2012-09-21 14:29:19 -04:00
Chris Dodge
d51f127afa work-in-progress: As a problem author, I would like to be able to edit module metadata 2012-09-21 14:29:19 -04:00
Chris Dodge
0a7dfca0e4 Fix JSON postback error where the content-type header line can contain more info than just the application/json descriptor. Now we just to a compare on the start of the header value. 2012-09-21 14:25:48 -04:00
Chris Dodge
a7b7fd52d9 Support editing of metadata on Sequences 2012-09-21 13:56:53 -04:00
David Ormsbee
a4d4a3b022 Merge pull request #650 from MITx/feature/bridger/course_grading
Feature/bridger/course grading
2012-09-21 08:10:03 -07:00
Tom Giannattasio
68fe164b3b Merge pull request #745 from MITx/feature/lyla/optionresponseformatting
removed line from optioninput field formatting
2012-09-21 06:26:18 -07:00
Chris Dodge
1cd81a2a4f work-in-progress: As a problem author, I would like to be able to edit module metadata 2012-09-21 09:14:28 -04:00
Ibrahim Awwal
0ff14d7e00 Merge pull request #749 from MITx/hotfix/arjun/discussion_trailing_slash
Better fix for trailing slash
2012-09-21 05:43:48 -07:00
Arjun Singh
8fb6204073 Better fix for trailing slash 2012-09-21 05:42:51 -07:00