3355 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Ward	1be08dbcb5	Merge pull request #1170 from abbat/russian-translation ... Russian translation (actual version)	2013-07-09 08:26:35 -07:00
Robin Ward	7ad471f019	FIX: If you split one topic already, the second topic was showing "Saving..."	2013-07-09 11:18:09 -04:00
Robin Ward	e05a3569a1	FIX: Deep linking into a category was losing the badge	2013-07-09 10:57:52 -04:00
Anton Batenev	ed1fb847ed	Russian translation (actual version)	2013-07-09 18:26:59 +04:00
Robin Ward	5cda0e556c	Merge pull request #1111 from jamesaanderson/flash-video-onebox ... Add flash video onebox support	2013-07-09 06:55:56 -07:00
Robin Ward	cb7f540568	Merge pull request #1136 from stephankaag/update_migrations_rails4 ... Update migrations to be compatible with Rails 4	2013-07-09 06:49:31 -07:00
Robin Ward	f9d1fcb169	Merge pull request #1140 from stephankaag/code_refactoring ... Refactor code that raises deprecating warnings in Rails 4	2013-07-09 06:48:48 -07:00
Robin Ward	437175b102	Merge pull request #1166 from jamesaanderson/mobile-and-tablet-video-rendering-fix ... Mobile and tablet video rendering fix	2013-07-09 06:44:49 -07:00
Robin Ward	f4c3416f1b	Merge pull request #1167 from ZogStriP/i18n-helper ... I18n helper	2013-07-09 06:43:48 -07:00
Jeff Atwood	a6b63b2871	de-box the topic posts a bit ... I CANT TAKE IT ANY MORE AHHHHHHH	2013-07-09 03:38:01 -07:00
Sam	0f46df4670	workaround for bust up button on topics	2013-07-09 18:16:18 +10:00
Sam	8f892da890	move bookmark to end	2013-07-09 18:16:17 +10:00
Jeff Atwood	2c314e275e	improve new category copy a bit	2013-07-09 00:49:38 -07:00
Jeff Atwood	853fcb9b88	improve best of copy slightly	2013-07-08 23:39:22 -07:00
Sam	21bfb64a28	added EMBED_CLOCKWORK so users can embed clockwork scheduling inside another process	2013-07-09 11:01:51 +10:00
James Anderson	171e703e11	Mobile and tablet video rendering fix ... http://meta.discourse.org/t/chrome-for-ipad-iphone-breaks-with-this-video-embed/7983	2013-07-08 17:22:25 -07:00
Régis Hanol	1f263c57fd	fool jshint	2013-07-09 02:14:35 +02:00
Régis Hanol	c1acce17cc	removed unnecessary console.log	2013-07-09 02:10:55 +02:00
Régis Hanol	924c5d65cb	wrapped I18n.lookup to inject the "js" namespace	2013-07-09 02:10:55 +02:00
Sam	e993d6b29b	upgrade font awesome to version 3.2.1, use scss instead of css for the include.	2013-07-09 10:06:57 +10:00
Neil Lalonde	806bd98f99	Update category's topic_count immediately when trashing or recovering a topic; this ensures that a category can be deleted without waiting for the category_stats job to run.	2013-07-08 15:23:20 -04:00
Neil Lalonde	d3fe8f65a2	Add tooltip to avatars of people who liked a post	2013-07-08 14:00:47 -04:00
Neil Lalonde	ad096ac2b7	More nav links on admin users list page	2013-07-08 12:44:14 -04:00
Neil Lalonde	9b0f63627b	Add blocked users count to dashboard	2013-07-08 12:44:13 -04:00
Stephan Kaag	2abfd38aee	Refactor code that raises deprecating warnings in Rails 4	2013-07-08 18:35:11 +02:00
Robin Ward	cfc4dda9ff	FIX: OpenGraph should feature the desired post, if found in the set.	2013-07-08 12:21:39 -04:00
Robin Ward	013ad0fdda	Added In-Reply-To and References email headers. Additionally removed username from ... email replies and new posts to keep the subjects collapsable.	2013-07-08 11:48:40 -04:00
James A. Anderson & Jalil Mohammed	d51a3cf50f	Add flash video onebox as disabled setting by default	2013-07-08 06:37:44 -07:00
Jeff Atwood	4ddd50fe17	add "new" to PM title there for clarity	2013-07-08 00:01:24 -07:00
Jeff Atwood	7bf798891b	better new user block PM copy	2013-07-07 23:58:07 -07:00
Sam	4b437ccd2f	Merge pull request #1148 from nterray/fix_html_entities_after_editing_topic_title ... Add :title as attribute for basic_topic	2013-07-07 23:45:25 -07:00
Sam	f42fc3be37	Merge pull request #1150 from mcwumbly/topic-likes ... little tweaks to like counts in topic list view	2013-07-07 23:39:38 -07:00
Sam	807b9d438a	Merge pull request #1159 from jd-erreape/user_refactors ... Refactors in user model	2013-07-07 23:38:16 -07:00
Sam	180d887481	title for category pages	2013-07-08 16:01:40 +10:00
Sam	2f096083d0	custom title for user page	2013-07-08 15:56:13 +10:00
Sam	085e094497	404 if a category does not exist ....	2013-07-08 15:56:13 +10:00
Sam	f1a31cd9e6	Merge pull request #1163 from ZogStriP/refactor-cooked-post-processor ... refactored CookedPostProcessor	2013-07-07 22:01:48 -07:00
Sam	5d6ce6d17f	Merge pull request #1164 from ZogStriP/add-label-for-boolean-settings ... add label for boolean setting	2013-07-07 22:00:09 -07:00
Sam	f6a8f6cfe5	don't notify on moderator actions, they just cause noise, ... also filter out pms properly while at it	2013-07-08 12:44:55 +10:00
Sam	91238af6f1	correct failing specs	2013-07-08 12:25:38 +10:00
Sam	3dbb4ff9bc	Reorder filters on user page and name them better (All, Topics, Posts, Responses)	2013-07-08 12:12:06 +10:00
Sam	ae6ad734eb	remove bad console.log	2013-07-08 12:11:20 +10:00
Sam	5086f48784	reloading classes is just trouble in test, lets not do that so spork is squeaky clean and happy.	2013-07-08 12:10:47 +10:00
Sam	d79aa917f1	add option suppress_reply_directly_above to stop suppressing the reply directly above ... added a bunch of debugging information to help diagnose weird positioning issues	2013-07-08 11:13:45 +10:00
Régis Hanol	f9b2738ae1	add label for boolean setting	2013-07-08 01:43:30 +02:00
Régis Hanol	ac7253a938	refactor CookedPostProcessor & specs	2013-07-08 01:39:08 +02:00
Juan de Dios Herrero	27b038cd40	Refactored username validations to avoid repeated code	2013-07-07 13:05:18 +02:00
Juan de Dios Herrero	e4fc6e02ed	Added discourse hub nickname operations simplify and avoid repeated code	2013-07-07 12:40:35 +02:00
Sam	c6c8246399	added sample unicorn config ... added utility to measure real memory usage don't require thin by default	2013-07-07 14:31:07 +10:00
Robin Ward	337f393af5	Merge pull request #1155 from ZogStriP/remove-auto-link-images-wider-than-setting ... removed auto_link_images_wider_than setting	2013-07-06 17:12:11 -07:00