Commit Graph

5337 Commits

Author SHA1 Message Date
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
Matthew Mongeau
6a27f6ddc4 Track comment 2012-08-30 17:01:57 -04:00
Tom Giannattasio
000a745c6e Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-08-30 16:52:55 -04:00
Tom Giannattasio
a728134129 merge conflict fixes 2012-08-30 16:52:34 -04:00
Matthew Mongeau
31f7d6f4f4 Keep active thread active 2012-08-30 16:50:46 -04:00
Matthew Mongeau
074ba9ce71 Sorting 2012-08-30 16:44:10 -04:00
Tom Giannattasio
da413f6de8 added sticky sidebar 2012-08-30 16:37:22 -04:00
Matthew Mongeau
6ee27d02e4 Searching and fixes. 2012-08-30 15:55:46 -04:00
Tom Giannattasio
7ece39f345 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-08-30 13:38:05 -04:00
Tom Giannattasio
757c817b95 tweaked comment styles 2012-08-30 13:37:50 -04:00
Matthew Mongeau
3cc3876b74 Add new post back in. 2012-08-30 13:32:14 -04:00
Matthew Mongeau
476f4fa7ea Fix liking. 2012-08-30 13:16:19 -04:00
Matthew Mongeau
1acb6185de Get math working. 2012-08-30 13:06:37 -04:00
Matthew Mongeau
afd6126e36 Fix some styles. 2012-08-30 12:43:02 -04:00
Matthew Mongeau
6287e43f55 Add ability to create replies. 2012-08-30 11:50:58 -04:00
Tom Giannattasio
5267f03b97 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-08-30 11:38:46 -04:00
Matthew Mongeau
362bbb1794 Close form 2012-08-30 11:38:34 -04:00
Tom Giannattasio
1559b86e27 added new post markup, style and basic interactions 2012-08-30 11:37:50 -04:00
Matthew Mongeau
abc0092fe1 Formatting around wmd 2012-08-30 11:23:06 -04:00
Matthew Mongeau
04e8e5378c Fix load order. 2012-08-30 11:12:16 -04:00
Matthew Mongeau
24c7632664 Start responses. 2012-08-30 10:17:47 -04:00
Matthew Mongeau
3a254380d5 Hook up comment counts 2012-08-29 17:26:18 -04:00
Matthew Mongeau
f683d3750c Show current following status in list view. 2012-08-29 16:52:39 -04:00
Matthew Mongeau
f23c8fa0d3 Comment details and comment voting. 2012-08-29 16:24:18 -04:00
Tom Giannattasio
30a42dd526 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-08-29 16:22:21 -04:00
Tom Giannattasio
5db29b87ee tweaked sidebar styles; added temp javascript functionality for sidebar 2012-08-29 16:22:14 -04:00
Matthew Mongeau
d6bece9bd2 Move user to window. Mark followed threads in list view. 2012-08-29 15:37:23 -04:00
Matthew Mongeau
4735ce0ab1 Display comments and active thread. 2012-08-29 15:22:01 -04:00
Matthew Mongeau
13ae85ac35 Navigating threads. 2012-08-29 14:20:03 -04:00
Tom Giannattasio
1026a17338 fixed sidebar styles 2012-08-29 14:02:09 -04:00
Tom Giannattasio
d19dc6a9b0 added new post button to primary nav 2012-08-29 13:34:30 -04:00
Tom Giannattasio
f12022b774 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-08-29 13:23:20 -04:00