Commit Graph

918 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
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
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
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
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
Ibrahim Awwal
722ce53e61 Pull out discussion-thread-list-template into its own file. 2012-09-02 15:14:54 -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
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
Tom Giannattasio
b167e0f70a added filter drop; tweaked sidebar coordinate settings to accommodate new post 2012-08-31 15:20:53 -04:00
Arjun Singh
795c116389 populate dropdown 2012-08-31 03:27:02 -07: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
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
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
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
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
d19dc6a9b0 added new post button to primary nav 2012-08-29 13:34:30 -04:00
Tom Giannattasio
d75bb87bdd started adding updated styles 2012-08-29 13:22:55 -04:00