22621 Commits

Author	SHA1	Message	Date
David Ormsbee	239e6e8cc5	Add AWS storage bucket name for S3 to make file uploads work	2012-09-14 19:55:13 -04:00
Arjun Singh	b2c88575ee	fix deep comment links	2012-09-14 15:38:48 -07:00
Arjun Singh	46d830df13	Merge branch 'master' into feature/arjun/new-discussions	2012-09-14 15:15:21 -07:00
Arjun Singh	febba9b93a	Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions	2012-09-14 15:10:06 -07:00
Arjun Singh	913403d1e0	increase font size for votes / comments	2012-09-14 15:09:55 -07:00
arjun810	8561469f8f	Merge pull request #694 from MITx/feature/dave/new-discussions ... Don't explode if a forum content piece is by a user that doesn't exist	2012-09-14 14:28:03 -07:00
David Ormsbee	ce9fc9ceab	Don't explode if a forum content piece is by a user that doesn't exist	2012-09-14 17:25:12 -04:00
Arjun Singh	8631cb2644	Add a tiny bit of padding back to unexpanded form	2012-09-14 13:39:07 -07:00
Arjun Singh	190f25c0dd	Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions	2012-09-14 13:35:43 -07:00
Tom Giannattasio	2f5ad06eec	smoother comment form expansion	2012-09-14 16:34:55 -04:00
Arjun Singh	3756d31761	Placeholder for wmd editors; specifically comment form	2012-09-14 13:20:54 -07:00
Tom Giannattasio	5caa989e3c	added transparent icons for the comment form	2012-09-14 16:17:34 -04:00
Kyle Fiedler	8fa8450fbf	Added color to span and removed width from bottom sequence navigation	2012-09-14 16:13:37 -04:00
Tom Giannattasio	7b7ad3d8c2	new paragraph styles for comments	2012-09-14 16:07:45 -04:00
arjun810	0ad3e8a7b0	Merge pull request #692 from MITx/feature/dave/new-discussions ... Small fixes	2012-09-14 13:06:53 -07:00
David Ormsbee	a32be2958c	Change 'View discussion' link on user profile page to be a simple link rather than AJAX.	2012-09-14 16:00:09 -04:00
Arjun Singh	11289e6d90	comment styling	2012-09-14 12:59:10 -07:00
Arjun Singh	387c8ea1b5	make wmd editor for comments	2012-09-14 12:46:48 -07:00
Victor Shnayder	a788db53e9	Show login modal if there's a next param to index, university index ... * also replace the external-auth-related popping up of the signup form with jquery. Presumably it takes care of the browser specific stuff.	2012-09-14 14:31:04 -04:00
Victor Shnayder	6472e0ebe3	If there's a ?next param, redirect there instead of dashboard after login	2012-09-14 14:29:31 -04:00
David Ormsbee	820003b96c	Prevent showing redundant roles for this user	2012-09-14 14:29:17 -04:00
Carlos Andrés Rocha	c72dafa906	Fix error when selecting all boards on the discussion pane	2012-09-14 13:45:01 -04:00
Tom Giannattasio	b98b43e8b9	sidebar height one pixel taller	2012-09-14 11:41:48 -04:00
Tom Giannattasio	19c5895cbe	tweaked profile posted details template	2012-09-14 11:30:51 -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	f656da46ec	bump inline count, fix tiny bug for server startup	2012-09-14 06:00:01 -07:00
Arjun Singh	7dbea50d79	reasonable behavior when creating a thread	2012-09-14 05:52:49 -07:00
Arjun Singh	27b80bc8e8	Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions	2012-09-14 04:07:15 -07:00
Arjun Singh	edf02dd90e	Fix context links for the 123187th time	2012-09-14 04:07:04 -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	154cb843dd	Bump up threads per page again, because I don't think showing 5 threads at a time is ... particularly useful.	2012-09-14 02:48:49 -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	2d58f8dea1	Fix load more pages button on single thread.	2012-09-14 02:37:46 -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	9197efc3a1	Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions	2012-09-13 21:59:09 -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	4d59013955	Remove dead code.	2012-09-13 19:58:17 -07:00
Arjun Singh	3cbc075f7b	Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions	2012-09-13 19:41:18 -07:00
Arjun Singh	e4c7a5ea97	Fix courseware context links; filter out unstarted topics.	2012-09-13 19:41:07 -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