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 |
|
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 |
|
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 |
|
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 |
|
Ibrahim Awwal
|
e7e0c2c141
|
Merge pull request #748 from MITx/hotfix/arjun/discussion_trailing_slash
New URLs require a trailing slash
|
2012-09-21 05:22:32 -07:00 |
|
Arjun Singh
|
663e38aa1f
|
New URLs require a trailing slash
|
2012-09-21 05:19:23 -07:00 |
|
Calen Pennington
|
b799d9b73f
|
Merge pull request #744 from MITx/bug/tomg/collapsible-hint
Bug/tomg/collapsible hint
|
2012-09-21 05:13:01 -07:00 |
|
arjun810
|
1a06efc50f
|
Merge pull request #716 from MITx/feature/ibrahim/followed-threads
Feature/ibrahim/followed threads
|
2012-09-21 04:39:43 -07:00 |
|
Ibrahim Awwal
|
57d5ba07c0
|
Remove commented out block and pull some stuff into a function to load the first page of results for a thread query.
|
2012-09-21 04:33:16 -07:00 |
|
Ibrahim Awwal
|
91de5633b5
|
DjDT redirect intercept is annoying, especially for tests, so disable it
|
2012-09-21 00:15:12 -07:00 |
|
Ibrahim Awwal
|
939b927fbd
|
Merge branch 'master' into feature/ibrahim/followed-threads
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
|
2012-09-20 23:55:13 -07:00 |
|
arjun810
|
40d25acf41
|
Merge pull request #747 from MITx/feature/ibrahim/fix-discussion-urls
Match custom static tabs after discussion URLs so that discussion can actually work.
|
2012-09-20 20:42:14 -07:00 |
|
Ibrahim Awwal
|
7727e9f2a2
|
Match custom static tabs after discussion URLs so that discussion can actually work.
|
2012-09-20 19:22:25 -07:00 |
|
Lyla Fischer
|
1dfb745751
|
removed line from optioninput field - it makes it look like the end of a question
|
2012-09-20 19:03:16 -04:00 |
|
Tom Giannattasio
|
4af134b28a
|
fixed large collapsible text and triple toggle
|
2012-09-20 17:49:36 -04:00 |
|
Bridger Maxwell
|
68ab19730f
|
Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading
Conflicts:
lms/djangoapps/courseware/views.py
|
2012-09-20 17:42:31 -04:00 |
|
Bridger Maxwell
|
188eeed3a3
|
Removed accidental symlink.
|
2012-09-20 17:41:02 -04:00 |
|
Bridger Maxwell
|
997c0ee1c6
|
Grading test now tries a weighted problem.
|
2012-09-20 17:38:07 -04:00 |
|
Victor Shnayder
|
26a63850b3
|
Merge pull request #733 from MITx/feature/victor/static-tabs
Feature/victor/static tabs
|
2012-09-20 14:37:35 -07:00 |
|
Bridger Maxwell
|
dfa977dbfa
|
Fixed problem weighting bug. Attribute is on descriptor, not module.
|
2012-09-20 17:37:34 -04:00 |
|
Bridger Maxwell
|
92171ea5da
|
Added course grading test.
|
2012-09-20 16:56:27 -04:00 |
|
Bridger Maxwell
|
9ec38176e0
|
Small cleanup tweaks in grading.
|
2012-09-20 16:56:09 -04:00 |
|
Tom Giannattasio
|
99a009abdf
|
tweaked sound lab styles
|
2012-09-20 15:54:09 -04:00 |
|
Bridger Maxwell
|
9ce3b83be3
|
Added a simple course for testing the grading functions.
|
2012-09-20 13:29:16 -04:00 |
|
Bridger Maxwell
|
a43b09c0a9
|
Fixed new implementation of abtest's displayable_items.
|
2012-09-20 13:23:47 -04:00 |
|
Chris Dodge
|
2d35e48b68
|
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-20 11:07:11 -04:00 |
|
Victor Shnayder
|
621acd20e3
|
broken tabs are important enough to count as an error, not a warning
|
2012-09-20 10:52:40 -04:00 |
|
Victor Shnayder
|
a19319f7fb
|
add some error handling
|
2012-09-20 10:36:22 -04:00 |
|
jarv
|
fc61a456b3
|
Merge pull request #740 from MITx/feature/jarv/add-pkg-config-to-dev-env
adding pkg-config
|
2012-09-20 07:19:44 -07:00 |
|
John Jarvis
|
b292519322
|
adding pkg-config
|
2012-09-20 09:46:14 -04:00 |
|
kimth
|
ec0352f05e
|
Merge pull request #736 from MITx/feature/arjun/fix_install
fix ubuntu graphviz lib install
|
2012-09-20 05:01:13 -07:00 |
|
arjun810
|
c6be3ff098
|
Merge pull request #739 from MITx/feature/ibrahim/unread_count
Properly puluralize comments tooltip and change "unread" to "new".
|
2012-09-20 04:55:59 -07:00 |
|
Ibrahim Awwal
|
d1e8f4c016
|
Properly puluralize comments tooltip and change "unread" to "new".
|
2012-09-20 04:53:02 -07:00 |
|
arjun810
|
2ccff10350
|
Merge pull request #738 from MITx/feature/arjun/unread_count
Show total comments instead of unread only, and use a tooltip to show th...
|
2012-09-20 04:31:19 -07:00 |
|
arjun810
|
53f524edfd
|
Merge pull request #737 from MITx/feature/tomg/discussion-read
darker background for read posts
|
2012-09-20 04:29:45 -07:00 |
|
Tom Giannattasio
|
2b14468667
|
darker background for read posts
|
2012-09-20 07:27:33 -04:00 |
|
Ibrahim Awwal
|
afdd11342e
|
Show total comments instead of unread only, and use a tooltip to show the unread count.
|
2012-09-20 04:26:58 -07:00 |
|
Arjun Singh
|
ed034ff103
|
fix ubuntu graphviz lib install
|
2012-09-20 04:23:31 -07:00 |
|
Ibrahim Awwal
|
d6cff4d563
|
Merge pull request #735 from MITx/feature/arjun/unread_count
Unread counts + tracking for discussion
|
2012-09-20 03:49:10 -07:00 |
|
Arjun Singh
|
55a9da933a
|
DRY things slightly
|
2012-09-20 02:15:51 -07:00 |
|
Arjun Singh
|
3567e23a9d
|
Unneeded imports
|
2012-09-20 02:13:35 -07:00 |
|