Commit Graph

60 Commits

Author SHA1 Message Date
Brian Talbot
ef2218296f LMS: revises CSS reference/pipeline architecture to handle IE9 selector limits 2013-10-16 12:29:49 -04:00
Chris Dodge
93df9c4c30 resolve merge conflicts 2013-08-02 09:41:02 -04:00
Calen Pennington
0d3c44996a LMS i18n from Tsinghua 2013-07-31 19:39:15 -04:00
Kevin Chugh
63b2b47106 update to render home page 2013-07-19 07:33:50 -04:00
marco
84d505e8cc modified html for discussion home to use tables instead of lists, cleaned up styling as well 2013-06-26 10:41:49 -04:00
marco
0f84a52023 new post button using font-awesome 2013-06-25 13:28:55 -04:00
marco
98cd032ade cleaned up topic header to allow for multiple line titles still being visible 2013-06-25 13:28:55 -04:00
marco
b83d5aa42d removed icon stack from email area of helpgrid 2013-06-25 13:28:55 -04:00
marco
b870679673 basic shell for home page exists, along with start of color cleanup for the rest of _discussion.scss 2013-06-25 13:28:54 -04:00
marco
52403420fd cleaned up variables styling to sync up closer to studio, incorporated fontawesome icons into discusison home with basic positioning 2013-06-25 13:28:54 -04:00
marco
23f19423be cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references 2013-06-25 13:28:54 -04:00
marco
8ef258d465 addition of font-awesome to LMS sass vendor assets, in additio nto light organization for applicaiton.scss to match studio sass breakdown. 2013-06-25 13:19:54 -04:00
marco
46998bd702 basic shell for discussion home page with both profile information and email notification settings 2013-06-25 13:19:53 -04:00
marco
3df08dc1c4 blankslate edited, header bar now with home button 2013-06-25 13:19:53 -04:00
Jay Zoldak
ed5ad46192 Revert "Revert "fix merge conflict""
This reverts commit 2df3fe9344.

Conflicts:
	common/static/coffee/src/discussion/utils.coffee
2013-05-16 10:29:33 -04:00
Diana Huang
2df3fe9344 Revert "fix merge conflict"
This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.
2013-04-26 12:40:35 -04:00
Kevin Chugh
649578ea2f unify flag moderator permissions 2013-04-21 06:15:23 -04:00
Calen Pennington
93db5acc15 Make display_name defaulting explicit 2013-03-08 14:58:09 -05:00
Calen Pennington
e7900859b6 Remove the 'title' alias for lms.display_name 2013-03-06 15:11:08 -05:00
Ibrahim Awwal
151dbda242 Fix followed state not showing up on initial forum load in sidebar. 2012-09-18 04:09:38 -07:00
Ibrahim Awwal
bb6f4cdb2e Move dropdown filter into a more clearly named file, discussion-filter.js, and move the
event bindings into the proper views.
2012-09-17 18:08:44 -07:00
Arjun Singh
1f55763b56 Removing tags for now 2012-09-14 00:44:31 -07:00
Matthew Mongeau
5b9967e5a0 Paging wip 2012-09-13 17:35:29 -04:00
Matthew Mongeau
1a402f7fda Mark responses and comments as staff 2012-09-12 11:09:36 -04:00
Tom Giannattasio
2b5718a98b fixed blank slate sidebar resize glitch 2012-09-06 14:02:23 -04:00
Tom Giannattasio
dad22a1a3f fixed discussionBodyTop error 2012-09-05 15:12:57 -04:00
Tom Giannattasio
398e79dc8c simple blank slate view 2012-09-04 13:40:21 -04:00
Ibrahim Awwal
722ce53e61 Pull out discussion-thread-list-template into its own file. 2012-09-02 15:14:54 -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
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
Matthew Mongeau
82c9d045cd Initial work on single thread view. 2012-08-27 17:24:05 -04:00
Matthew Mongeau
91c5b88248 Initial sidebar 2012-08-27 16:21:12 -04:00
Rocky Duan
80195176e9 use escape html everywhere and only send discussion data relavent 2012-08-24 01:45:55 -07:00
David Ormsbee
c52dd5faea another unicode fix for forums 2012-08-23 07:59:53 -04:00
Rocky Duan
74bc232946 fixed discussion title and edit 2012-08-23 00:07:57 -07:00
David Ormsbee
af079a9362 Fix coffee includes for discussion forum. 2012-08-23 00:19:55 -04:00
Rocky Duan
d189a49ee5 continue working on backbone & got vote migrated and working 2012-08-20 17:32:36 -07:00
Rocky Duan
8684ae29b2 Merge branch 'master' of github.com:MITx/mitx into refactor
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt
2012-08-20 15:31:51 -07:00
Rocky Duan
7335c1529e show all content in a course in the forum view 2012-08-15 11:21:31 -07:00
Rocky Duan
50e95de9ef a place to start for the user profiel & fixed some bugs 2012-08-14 15:04:36 -07:00
Rocky Duan
49e840d62b adjust new post button in forum view 2012-08-14 12:43:15 -07:00
Rocky Duan
62bc1aaef7 make following and recent tags display actual things 2012-08-13 16:32:08 -07:00
Rocky Duan
7ba3bdfd61 show recently active posts user's following 2012-08-07 16:16:23 -04:00
Rocky Duan
5309592f01 scaffold for recent active posts 2012-08-07 15:40:36 -04:00
Rocky Duan
f579730f16 should have done this long time ago 2012-08-02 17:20:12 -04:00
Rocky Duan
ab339239f8 use single js dependencies for discussion in forum / courseware 2012-07-30 13:44:00 -04:00
Brittany Cheng
65730c2268 Merge branch 'master' of github.com:dementrock/mitx into discussion 2012-07-30 10:45:04 -04:00
Rocky Duan
8e3251c915 basic tag autocomplete 2012-07-29 17:32:00 -04:00
Rocky Duan
b92a180d25 add tags to threads & view threads by tags 2012-07-29 15:24:15 -04:00
Brittany Cheng
f6a3842fd8 merging inline html 2012-07-28 18:18:47 -04:00