Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

10211 Commits

Author SHA1 Message Date
Arjun Singh
890c5e50e1 fix up sidebar jitter 2012-09-04 02:29:28 -07:00
Rocky Duan
b2821c5354 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-04 01:54:59 -07:00
Rocky Duan
d39e3de51b fit permission into new discussion view structure; admin actions not working yet 2012-09-04 01:54:39 -07:00
Ibrahim Awwal
e8ac5860e1 Oops, this was needed for replies to be rendered in the main forum view. 2012-09-04 01:28:36 -07:00
Ibrahim Awwal
32ccf51e97 Embedded discussions displayed with the new style but without replying yet. 
Needs different CSS to make it more appropriate in the embedded view.
 2012-09-04 01:14:18 -07:00
Arjun Singh
dbfe3b35f0 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-03 23:29:30 -07:00
Arjun Singh
52e780e0b2 add all filter 2012-09-03 23:28:44 -07:00
Rocky Duan
6bae16098f Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-03 23:04:52 -07:00
Arjun Singh
629a8e7ed5 allowing for 0 top level topics 2012-09-03 23:04:30 -07:00
Rocky Duan
9a7afb5889 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-03 23:02:58 -07:00
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