Commit Graph

5368 Commits

Author SHA1 Message Date
Ibrahim Awwal
c4eec80e5e Somewhat compacted the embedded thread view, but it probably needs a more thorough redesign. 2012-09-04 02:34:27 -07:00
Arjun Singh
9064f81bc6 minor sidebar fix 2012-09-04 02:33:42 -07:00
Arjun Singh
2ca51f066b Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-04 02:29:38 -07:00
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
Matthew Mongeau
99ad4c0b55 Temporary fix for topictext issues. 2012-09-03 10:39:19 -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
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
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
Ibrahim Awwal
ecc65d6ebc Moved some templates into separate files. 2012-08-31 18:01:33 -07: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
Tom Giannattasio
d1238a277f tweaked sidebar bugs 2012-08-31 16:58:13 -04:00
Tom Giannattasio
d8591c286d basic discussion profile styles 2012-08-31 16:14:11 -04:00
Tom Giannattasio
b167e0f70a added filter drop; tweaked sidebar coordinate settings to accommodate new post 2012-08-31 15:20:53 -04:00
Tom Giannattasio
faabb01d42 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-08-31 09:17:12 -04:00
Tom Giannattasio
1515919f5e fixed posted details margin bug 2012-08-31 09:16:59 -04:00
Arjun Singh
795c116389 populate dropdown 2012-08-31 03:27:02 -07:00
Matthew Mongeau
5bfb51681a Display current topic and adjust font size. 2012-08-30 20:03:13 -04:00
Matthew Mongeau
28343b3afb Hide menu when clicking body. 2012-08-30 19:50:00 -04:00
Matthew Mongeau
dc9f49b6d2 Show dropdown on click. 2012-08-30 19:43:38 -04:00
Matthew Mongeau
3521d42175 Add highlighting back in 2012-08-30 17:46:23 -04:00
Matthew Mongeau
88100bf79f Remove loading icon. 2012-08-30 17:04:37 -04:00