19916 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jeremy Banks	6af69f7e77	Do not strip leading and trailing whitespace from raw posts.	2013-02-15 20:58:33 -05:00
Sam Saffron	985b5c59c3	missing h3	2013-02-16 12:27:30 +11:00
Sam Saffron	c95e1b644c	fix tests	2013-02-16 12:26:10 +11:00
Sam Saffron	c81d07c44b	clean up the topics footer so it does not flash and is localisable	2013-02-16 12:15:15 +11:00
Sam Saffron	ff0d58e4ee	message bus work in progress	2013-02-16 12:14:52 +11:00
Sam	8631a6850b	Merge pull request #178 from danneu/update-stats-fix ... Category year/month/week stats shouldn't include deleted topics.	2013-02-17 14:00:12 -08:00
Sam	e8b3821b41	Merge pull request #179 from tms/users-like-like-posts ... Users like like posts	2013-02-17 13:57:52 -08:00
Sam	db66e9facc	Merge pull request #181 from danneu/flags-i18n ... added "flagged_by" i18n	2013-02-17 13:56:33 -08:00
Sam	53539aa799	Merge pull request #182 from danneu/guide-typo ... fixed guide download link	2013-02-17 13:56:15 -08:00
Sam	1623197b05	Merge pull request #184 from tms/activity-stream-tweaks ... Improved action descriptions/links on user stream items	2013-02-17 13:55:45 -08:00
Sam	c7fba796b6	Merge pull request #185 from tms/search-all-the-things ... Search all the things	2013-02-17 13:53:58 -08:00
Sam	bc1f8244e4	Merge pull request #186 from tms/oneboxes-shouldnt-explode ... Oneboxes shouldn't explode when the remote causes an HTTPError	2013-02-17 13:52:40 -08:00
Sam	df63a3c516	Merge pull request #187 from tms/blog-onebox-tweaks ... Have oneboxer default to page title when og:title is missing	2013-02-17 13:51:43 -08:00
Sam	6cd115b7b9	Merge pull request #189 from tms/get-off-my-lawn ... Fancy 404 should require access too	2013-02-17 13:49:06 -08:00
Shawn Holmes	3c97cda8e4	Update docs/VAGRANT.md ... - added a subsection for Windows users on what they need to do in lieu of 'vagrant ssh' not working on the Win platform.	2013-02-17 14:11:57 -07:00
tms	20c723c4fb	Fancy 404 should require access too	2013-02-17 15:26:47 -05:00
tms	85b0c0afab	Have oneboxer default to page title when og:title is missing	2013-02-17 04:31:21 -05:00
tms	702fbcdfa8	Oneboxes shouldn't explode when the remote causes an HTTPError	2013-02-17 04:10:17 -05:00
Jeff Atwood	fa9a2dda6d	nav for /tos /privacy /faq pages, h2 anchors	2013-02-17 01:09:54 -08:00
tms	eebc6c7e41	Request per_facet + 1 in search to know if we actually have more	2013-02-17 02:52:21 -05:00
tms	66d56a8b93	Correctly set the typeFilter when the user clicks "show more"	2013-02-17 02:21:49 -05:00
tms	fb5710b5d6	Improved action descriptions/links on user stream items	2013-02-17 01:38:20 -05:00
Dan Neumann	7df5366aed	fixed guide download link	2013-02-16 22:55:43 -06:00
Dan Neumann	72264e3034	added 'flagged_by' i18n.	2013-02-16 21:40:24 -06:00
Dan Neumann	fac75401ef	category stats shouldn't include deleted topics.	2013-02-16 21:10:18 -06:00
tms	b7e392c7a3	Don't count bookmark stats for users who can't see them	2013-02-16 16:46:20 -05:00
tms	b91ac45359	Avoid grouping user stats by archetype (filter happens beforehand)	2013-02-16 16:33:51 -05:00
Jeff Atwood	cecbede5db	add tooltip and better color to reply jump arrows	2013-02-16 13:07:14 -08:00
Robin Ward	7f4ee00228	Merge pull request #170 from alxndr/remove-iconv-100 ... Removes iconv dependency	2013-02-16 13:01:09 -08:00
Robin Ward	9ca0615d94	Merge pull request #173 from dbarros/saved_preferences ... Clear 'Saved' message when clicking Save button in user preferences.	2013-02-16 12:57:20 -08:00
Robin Ward	91ff0beb56	Merge pull request #177 from danneu/minor-fix ... minor word change	2013-02-16 12:56:47 -08:00
Jeff Atwood	0d650972c2	add end nav footer to topic lists by category view	2013-02-16 12:27:24 -08:00
Dan Neumann	6dc088ca16	minor word change	2013-02-16 11:30:46 -06:00
Diego Barros	420614d50d	Clear 'Saved' message when clicking Save button in user preferences.	2013-02-16 19:30:01 +11:00
Shawn Holmes	921c3f016f	Update docs/VAGRANT.md ... - reverted the Vagrant URL to http; using the https link generates a security warning in Chrome.	2013-02-15 22:06:14 -07:00
Robin Ward	9cd13880ec	Merge pull request #169 from alxndr/master ... move TESTING.md into docs/	2013-02-15 14:17:55 -08:00
Robin Ward	b440e30f45	Better filtering out private messages on user stream.	2013-02-15 17:08:28 -05:00
Alexander	6c4ae05454	Removes iconv dependency ... Fixes #100	2013-02-15 13:36:19 -08:00
Robin Ward	fc1c120014	Arrows to navigate to embedded posts.	2013-02-15 15:17:57 -05:00
Alexander	c01c64992c	move TESTING into docs/	2013-02-15 09:14:42 -08:00
Robin Ward	674c861eaf	Adjust deadlock trap to match postgres format.	2013-02-15 11:48:38 -05:00
Robin Ward	5c4e6c9f2c	Merge pull request #153 from xdite/refactor_topic_show_again ... use helper again	2013-02-15 07:19:01 -08:00
Robin Ward	036e795e10	Merge pull request #152 from xdite/canonical-url ... use canonical-url plugin to make view more clean	2013-02-15 07:18:41 -08:00
Robin Ward	a73b5a4708	Merge pull request #166 from marcoceppi/i-suck-at-this-game ... Fix typo, profile => procfile	2013-02-15 07:16:50 -08:00
Robin Ward	3cdf89d052	Merge pull request #162 from jessepollak/omniauth-failure ... Adds failure callback for omniauth	2013-02-15 07:13:17 -08:00
Marco Ceppi	a409fbcc30	Fix typo, profile => procfile	2013-02-15 07:09:18 -05:00
Jeff Atwood	c1a50aae04	add more delete button styles on delete.. buttons	2013-02-15 01:45:37 -08:00
Sam Saffron	eb188c57e8	started work on message bus diags	2013-02-15 19:23:40 +11:00
Sam Saffron	89ff51e108	a stop gap so notifications do not look horrible	2013-02-15 19:22:25 +11:00
Sam Saffron	5767465104	moving mini profiler too far up breaks its ability to profile	2013-02-15 15:29:49 +11:00