Commit Graph

10188 Commits

Author SHA1 Message Date
David Ormsbee
999343d641 Merge pull request #618 from MITx/feature/victor/hide-progress-tab
Feature/victor/hide progress tab
2012-09-03 11:40:35 -07:00
Victor Shnayder
f926925ca6 Add a hide_progress_tab course policy flag
- for internal cs50 until we have grade integration set up (only really needed for external version)
2012-09-03 14:12:43 -04:00
Victor Shnayder
79109a6244 Apply attr_map translation to metadata loaded from policy file as well as from xml. 2012-09-03 13:51:20 -04:00
David Ormsbee
bce4e0f1bc Merge pull request #595 from MITx/feature/ibrahim/discussion_sort_preferences
Feature/ibrahim/discussion sort preferences
2012-09-03 10:25:04 -07:00
ichuang
b0397ab0b5 fix to be compatible with jenkins test 2012-09-03 12:43:48 -04:00
ichuang
4e2ddd578a unit tests for instructor dashboard (grades CSV download) 2012-09-03 12:32:41 -04:00
kimth
c26126d8d6 Merge pull request #617 from MITx/feature/kfiedler/detailed-answer
Added styles for detailed solution
2012-09-03 08:14:03 -07:00
David Ormsbee
df85ac5762 Merge pull request #616 from MITx/feature/dave/external_forum
Add support for external forum link. Reviewed by Victor.
2012-09-03 07:54:38 -07:00
David Ormsbee
ea78559ad3 Changed FIXME -> TODO in response to comments 2012-09-03 10:47:15 -04:00
Kyle Fiedler
e50f622915 Added styles for detailed solution 2012-09-03 10:40:38 -04:00
Matthew Mongeau
99ad4c0b55 Temporary fix for topictext issues. 2012-09-03 10:39:19 -04:00
David Ormsbee
7f121a3b7c Merge pull request #611 from MITx/kimth/mark-graded
Tweaks to the LMS from 6.002x preparation
2012-09-03 07:38:50 -07:00
David Ormsbee
f0ef50ef7c Merge pull request #613 from MITx/feature/ichuang/add-gitreload-docs
add docs for gitreload
2012-09-03 07:33:59 -07:00
ichuang
9b056b284d add tracking logging of instructor dashboard actions 2012-09-02 23:17:45 -04:00
ichuang
91dcef7fd0 add gitreload to instructor dashboard 2012-09-02 22:41:27 -04:00
ichuang
4341ea7689 fix bug in modulestore reload: etree parser must be specified explicitly 2012-09-02 22:40:50 -04:00
David Ormsbee
5194dc3177 Add support for discussion_link attribute in course policy files as a kludge to support CS50's external forums 2012-09-02 22:22:01 -04:00
ichuang
9e8ec09b4d pep8 fixes 2012-09-02 20:15:57 -04:00
ichuang
0ddd8949ba re-add rakefile which was deleted by mistake 2012-09-02 19:17:19 -04:00
ichuang
4d5ca284b2 add fix to histogram (so 6.00x codemirror is not broken) 2012-09-02 19:10:47 -04:00
ichuang
2efe481237 move instructor dashboard into its own lms djangoapp; add new
functionality - grade dump and download as csv, manage staff list,
force reload of course from xml
2012-09-02 19:05:34 -04:00
ichuang
7664f910b1 add is_released 2012-09-02 19:04:55 -04:00
Ibrahim Awwal
722ce53e61 Pull out discussion-thread-list-template into its own file. 2012-09-02 15:14:54 -07:00
Arjun Singh
81bfdddccc Fix discussions in xmodules
Conflicts:

	lms/static/coffee/src/discussion/main.coffee
2012-09-02 15:14:54 -07:00
Rocky Duan
644fb9c13c commented out unnecessary code 2012-09-02 14:07:35 -07:00
Rocky Duan
cae338a46c dropdown filter 2012-09-02 14:00:25 -07:00
David Ormsbee
1a1c5edab4 Completely cosmetic fix to make the indentation clearer. 2012-09-02 16:56:17 -04:00
Arjun Singh
08693a1b41 Make customresponse respect point values on input fields 2012-09-02 02:52:59 -07:00
Arjun Singh
b64696dbd0 Allowing customresponse messages to be passed to the inputtype 2012-09-02 02:05:50 -07:00
Rocky Duan
fd31ab3057 make markdown & latex work for response / comments (not perfect) 2012-09-02 01:11:25 -07:00
Rocky Duan
77e0ef3fe3 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-02 00:29:59 -07:00
Rocky Duan
d22feb1b8b escape html 2012-09-02 00:29:48 -07:00
Ibrahim Awwal
1405cf97fd Create a new template that inherits from course_navigation.html to avoid repeating the course navigation template and augment it with the new post button. 2012-09-01 21:17:23 -07:00
ichuang
9433e89710 add docs for gitreload 2012-09-01 10:16:38 -04:00
kimth
ea4019c0a0 Add comment to sequence/display.coffee 2012-09-01 09:01:19 -04:00
kimth
90bcb00e58 Allow ckt editor to be embedded in sequence 2012-09-01 08:56:16 -04:00
kimth
6f03ebb198 Add message for student in CustomResponse error 2012-09-01 08:26:54 -04:00
Arjun Singh
d82534bc23 improving new post 2012-09-01 05:10:29 -07:00
kimth
3de7c3a322 Merge branch 'master' into kimth/mark-graded 2012-09-01 08:05:29 -04:00
Arjun Singh
95cfbcc8c7 new post 'works' 2012-09-01 03:41:49 -07:00
Arjun Singh
b913c93f46 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-01 02:01:01 -07:00
Arjun Singh
f6ee6f2a0f working on newpost 2012-09-01 02:00:55 -07:00
Rocky Duan
7007814638 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-01 01:07:09 -07:00
Rocky Duan
09dade0802 clear comment input after submit & not submit empty comment 2012-09-01 01:06:56 -07:00
Ibrahim Awwal
49f0dbd9e6 Make the index page not stupid, but not particularly useful either. 2012-09-01 00:03:23 -07:00
Rocky Duan
a67b76ae27 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-08-31 23:46:33 -07:00
Rocky Duan
fde77b7a89 fixed user link and back button 2012-08-31 23:46:13 -07:00
Ibrahim Awwal
8d3a70df46 Remove empty script tag. 2012-08-31 23:44:32 -07:00
Ibrahim Awwal
f6ca91a504 Refactor some things more and make the forum index sort of work, although the sticky sidebar is broken, probably because there's no content in the thread view pane. 2012-08-31 23:43:13 -07:00
Arjun Singh
e3728f6898 fix new post dropdown 2012-08-31 21:07:36 -07:00