Brian Talbot
|
ef2218296f
|
LMS: revises CSS reference/pipeline architecture to handle IE9 selector limits
|
2013-10-16 12:29:49 -04:00 |
|
Chris Dodge
|
c20ca2bf5e
|
fix more rebase conflicts
|
2013-08-02 11:25:05 -04:00 |
|
Chris Dodge
|
3a2bb7ba01
|
add escaping
|
2013-08-02 09:51:41 -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 |
|
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 |
|
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 |
|
Ibrahim Awwal
|
2d58f8dea1
|
Fix load more pages button on single thread.
|
2012-09-14 02:37:46 -07:00 |
|
Matthew Mongeau
|
1a402f7fda
|
Mark responses and comments as staff
|
2012-09-12 11:09:36 -04: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
|
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
|
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 |
|
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 |
|
Matthew Mongeau
|
46d0d4c4f2
|
Hook up list to voting.
|
2012-08-29 11:19:29 -04:00 |
|
Matthew Mongeau
|
e1113d9ca9
|
Get voting hooked up
|
2012-08-29 10:07:20 -04:00 |
|
Matthew Mongeau
|
82c9d045cd
|
Initial work on single thread view.
|
2012-08-27 17:24:05 -04:00 |
|
David Ormsbee
|
a24fd328d9
|
Fix error when unicode string is in message viewed in single-thread template
|
2012-08-23 07:40:18 -04:00 |
|
Rocky Duan
|
74bc232946
|
fixed discussion title and edit
|
2012-08-23 00:07:57 -07:00 |
|
David Ormsbee
|
53c3d60ef1
|
Do JS fix for collectstatic that we had on main for discussion's index.html
|
2012-08-23 00:32:45 -04:00 |
|
Rocky Duan
|
0e21ed030c
|
removed new post button & added recent threads to single thread page
|
2012-08-22 19:22:35 -07:00 |
|