Commit Graph

5028 Commits

Author SHA1 Message Date
Tom Giannattasio
b98b43e8b9 sidebar height one pixel taller 2012-09-14 11:41:48 -04:00
David Ormsbee
2e34c4ae5c Merge pull request #676 from MITx/feature/kfiedler/ocw-links
Feature/kfiedler/ocw links
2012-09-14 07:26:53 -07:00
Arjun Singh
7dbea50d79 reasonable behavior when creating a thread 2012-09-14 05:52:49 -07:00
Ibrahim Awwal
a570b6030a Prevent threads from being added to a discussion twice.
Probably slow, but it works for now.
2012-09-14 03:40:41 -07:00
Ibrahim Awwal
d05c92ba7c Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions 2012-09-14 02:59:58 -07:00
Ibrahim Awwal
a665f3aa18 Change CSS class for more pages button to .more-pages 2012-09-14 02:59:47 -07:00
Arjun Singh
8f63ec4d44 merge 2012-09-14 02:56:34 -07:00
Arjun Singh
fff7bcc5a7 Remove more tags; anonymity to peers 2012-09-14 02:50:08 -07:00
Ibrahim Awwal
6057904d51 Fix sidebar height growing forever when loading more pages, and also jumping to top when loading more pages. 2012-09-14 02:40:15 -07:00
Ibrahim Awwal
b5671e0fe9 Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions 2012-09-14 02:23:45 -07:00
Ibrahim Awwal
ac9dd7bd1e Fix hiding the more pages button. 2012-09-14 02:23:39 -07:00
Ibrahim Awwal
910be64aa2 Make pagination respect any filters or searches or sort keys. Searches and filters will
query the comment service to get their results rather than filtering threads that have
already been loaded.
2012-09-14 02:13:53 -07:00
Arjun Singh
b6f9dcdf74 fix inline closed threads 2012-09-14 01:25:02 -07:00
Arjun Singh
1f55763b56 Removing tags for now 2012-09-14 00:44:31 -07:00
Arjun Singh
8506cbcd15 Response editing 2012-09-14 00:11:32 -07:00
Arjun Singh
6b8e2c78ab Allow students to delete threads / respones; prepare for edit view for response comments (but not complete) 2012-09-13 21:58:59 -07:00
Ibrahim Awwal
d92a070ab1 Obey current search query and sort order when retrieving additional pages. 2012-09-13 18:34:01 -07:00
Ibrahim Awwal
236756e4ca Default argument value for options in Discussion so that inline discussions can still
work without modification. Eventually we'll want to switch the pagination there to
match the pagination on the main forum though.
2012-09-13 17:53:30 -07:00
Kyle Fiedler
a32d9686ae One more IE fix and added comments so there is some explination of what is there 2012-09-13 19:21:55 -04:00
Matthew Mongeau
5b9967e5a0 Paging wip 2012-09-13 17:35:29 -04:00
Tom Giannattasio
031a7d4e28 firefox border-box bug fix 2012-09-13 17:01:15 -04:00
kimth
81e01c8c72 Bring back bullets in lists 2012-09-13 16:46:19 -04:00
kimth
26158e78ea Merge pull request #682 from MITx/feature/kfiedler/updates
Update styles for the info updates
2012-09-13 12:45:43 -07:00
Tom Giannattasio
6c481b8aa3 fixed post list sort active state bug 2012-09-13 15:41:25 -04:00
Kyle Fiedler
e0e94ee1f1 A little more space for each list 2012-09-13 15:23:46 -04:00
Tom Giannattasio
cb9697ba58 fixed jump to top bug on edit form cancel button click 2012-09-13 15:16:17 -04:00
Kyle Fiedler
15ffd7e01d Better styles for updates 2012-09-13 15:13:42 -04:00
Tom Giannattasio
d2c6ae9391 tweaked inline tag styles; added href to tags 2012-09-13 15:01:54 -04:00
Kyle Fiedler
c17a9b78f8 fixed empty space below accordion nav items that dont have a subtitle 2012-09-13 13:52:47 -04:00
Tom Giannattasio
021f86a9a8 Merge pull request #669 from MITx/feature/kfiedler/widows
Added widow fix for subtitles too
2012-09-13 09:40:03 -07:00
Kyle Fiedler
f253186e31 Added right style for label 2012-09-13 11:57:46 -04:00
Tom Giannattasio
991e3fd1b7 fixed sidebar height glitch 2012-09-13 11:37:08 -04:00
Kyle Fiedler
5c76a1fbaf Added fix for sequence nav in vertical 2012-09-13 11:24:07 -04:00
Tom Giannattasio
ffd60fbd7e added margin to tags 2012-09-13 11:19:57 -04:00
Tom Giannattasio
cb1db86100 additional margins for thread-tags 2012-09-13 11:01:42 -04:00
Tom Giannattasio
6e217b315d added conditional to render tags wrapper only if there are tags 2012-09-13 10:59:47 -04:00
Tom Giannattasio
3496e4ee05 added sidebar load more styles 2012-09-13 10:47:50 -04:00
Tom Giannattasio
a152041ef8 fixed inline thread replace error 2012-09-13 10:25:10 -04:00
Victor Shnayder
f4a93b7c70 Merge remote-tracking branch 'origin/master' into feature/kfiedler/ocw-links 2012-09-13 10:22:44 -04:00
Tom Giannattasio
85abb71398 styles for inline comment count 2012-09-13 10:13:49 -04:00
Tom Giannattasio
b3335ec551 brought vote button back to collapsed inline discussions 2012-09-13 10:08:31 -04:00
Ibrahim Awwal
aa6e878626 Fix repeated edits on inline threads. 2012-09-13 05:50:43 -07:00
Ibrahim Awwal
b03bcae4a2 Re expand thread if edit is canceled.
Should rework how inline threads are expanded/collapsed a little so that this kind of
thing is not needed.
2012-09-13 05:45:32 -07:00
Ibrahim Awwal
5fd45a50bc Enable editing for inline threads.
Currently there's a bug where editing more than once without reloading the page
causes it to successively get more and more broken.
2012-09-13 05:36:46 -07:00
Ibrahim Awwal
30b4918e77 Fix tags updating after editing a post. 2012-09-13 04:14:19 -07:00
Ibrahim Awwal
62b047f3c2 Refactored DiscussionThreadInlineView to inherit from DiscussionThreadView and
use subviews for rendering. Functionality should be the same. Changed a few things
in DiscussionThreadView to make this a little easier.
2012-09-13 03:11:30 -07:00
Ibrahim Awwal
58fc3eca12 Fix staff markers for inline threads and double staff markers for threads with deeply nested comments. 2012-09-13 02:20:35 -07:00
Ibrahim Awwal
712e59a68d Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/static/sass/_discussion.scss
2012-09-12 15:18:34 -07:00
Ibrahim Awwal
9a0798b68f Remove old backbone views (the last place they were being used was the profile page). 2012-09-12 15:16:44 -07:00
Ibrahim Awwal
b4828db1e3 User profile page redone to act like the inline discussion, except threads are
loaded into the page in a data attribute instead of loaded on request via ajax.
The user profile page also does not provide facilities for adding
comments/responses, which I think would clutter the page too much.

Also removed some unused stuff from views.py.
2012-09-12 15:16:35 -07:00