Arjun Singh
098b90ebac
Top level discussions
2012-09-03 23:02:14 -07:00
Rocky Duan
d9e7c5d962
fixed wmd editor / tag for new post
2012-09-03 17:01:19 -07:00
ichuang
02d58a7ca2
display course load error messages on modulestore reload by instructor
2012-09-03 16:49:34 -04:00
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
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
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
Matthew Mongeau
99ad4c0b55
Temporary fix for topictext issues.
2012-09-03 10:39:19 -04: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
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
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
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
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
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
David Ormsbee
877ae91b7f
Don't show View Courseware buttons if they don't have access to load the courseware
2012-08-31 21:50:33 -04:00
kimth
de9c981aea
Merge branch 'master' into kimth/mark-graded
2012-08-31 21:25:53 -04:00
Ibrahim Awwal
ecc65d6ebc
Moved some templates into separate files.
2012-08-31 18:01:33 -07:00
Arjun Singh
9eecd43a4a
Fix jump to courseware test to expect a redirect
2012-08-31 17:49:15 -07:00
kimth
ae022b662a
Merge branch 'kimth/mark-graded' of https://github.com/MITx/mitx into kimth/mark-graded
2012-08-31 20:46:34 -04:00
kimth
56cc237eef
Merge branch 'master' into kimth/mark-graded
2012-08-31 20:41:39 -04:00
Ibrahim Awwal
4ce4c0c444
Fix the dropdown filtering so it actually ignores the unread messages count.
2012-08-31 17:15:31 -07:00
Ibrahim Awwal
f6ee08271d
Ensure that js files are returned in alphabetical order by django-pipeline.
...
On most systems this seems to be the default behavior, but glob2.glob's order isn't guaranteed and on my machine the order seems to be random, which causes javascript which depends on include order to fail.
2012-08-31 15:25:07 -07:00
Ibrahim Awwal
e600004b1f
Make the comment client not explode if it doesn't get a sort preference from the comment service.
2012-08-31 15:19:17 -07:00
Arjun Singh
26ca1f5f5b
Merge master
2012-08-31 15:13:50 -07:00
Arjun Singh
3a9542ebb1
Move function; stop shadowing map; add todo about caching for _DISCUSSIONINFO
2012-08-31 15:11:29 -07:00
kimth
8c0780bcdc
Adjust comments
2012-08-31 18:05:54 -04:00
kimth
e482a32d27
Accordion distinguishes items to be graded
2012-08-31 18:05:54 -04:00