5803 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Sam	a468d6cfb0	message pack 0.5.6 has issues installing	2013-11-20 12:42:43 +11:00
Sam	bcc9d749ad	load up routes in master	2013-11-20 12:36:19 +11:00
Jeff Atwood	724f81258c	copyedit on summarize	2013-11-19 17:27:28 -08:00
Jeff Atwood	e2458fa892	brevity for user card filter	2013-11-19 17:21:55 -08:00
Robin Ward	fa0b5d3b0e	FIX: Missing Private message topic map	2013-11-19 18:59:29 -05:00
Sam	08ad5d479e	Revert "FIX: Markdown bug", breaks build ... This reverts commit 4a32cddf80.	2013-11-20 10:41:21 +11:00
Sam	7603faa20d	add rbtrace for production tracing	2013-11-20 10:10:12 +11:00
Sam	d16298b1d7	Merge pull request #1679 from velesin/logo_improvement ... removes redundant enclosing tag	2013-11-19 14:59:45 -08:00
Sam	325ad46c20	Merge pull request #1681 from germanviscuso/japanese_locales ... Provides Japanese locales	2013-11-19 14:58:06 -08:00
Neil Lalonde	1616741836	Say something when no site settings match the filter	2013-11-19 16:46:20 -05:00
Neil Lalonde	68a69f06e3	Say All instead of All Results	2013-11-19 16:46:20 -05:00
Robin Ward	4a32cddf80	FIX: Markdown bug	2013-11-19 16:23:04 -05:00
German Viscuso	3f049f4853	Provides Japanese locales	2013-11-19 22:20:19 +01:00
Wojciech Zawistowski	3a470939f0	FIX: repairs title attr in the link	2013-11-19 21:32:02 +01:00
Wojciech Zawistowski	e7c6abde3e	removes redundant enclosing tag	2013-11-19 21:28:05 +01:00
Erik Ordway	bf390163aa	Load plugin settings. ... Along the lines for loading the locale files for a plugin we should also load the settings.yml for a plugin. Updated version 04f3e09 that moves the loading to a function. I do not understand why it was necessary to define the function physically earlier in the file as I thought ruby did two pass but that may only apply to functions and not stray code in the class.	2013-11-19 11:43:01 -08:00
Neil Lalonde	981d8f6aea	Signup form: prefill username if Discourse Hub has a match for the email address. Also, fix some bad specs in username_checker_service_spec that were passing...	2013-11-19 14:15:28 -05:00
Robin Ward	309904ef8f	Revert "Merge pull request #1673 from aperrault/patch-04" ... This reverts commit c9ea89bdd3, reversing changes made to 9ed49888fc.	2013-11-19 14:08:45 -05:00
Robin Ward	c9ea89bdd3	Merge pull request #1673 from aperrault/patch-04 ... Fixing neglect to determine whether a user has the permission to create ...	2013-11-19 10:50:38 -08:00
Robin Ward	9ed49888fc	FIX: Invalid sub category links in suggested topics	2013-11-19 13:36:11 -05:00
Régis Hanol	a7bbc93b9a	Merge pull request #1672 from shivpkumar/shiv/add-session-to-after-create-account ... Add 'session' to auth hash in OAuth complete method	2013-11-19 10:16:31 -08:00
Shiv Kumar	2f0e20bc11	add session to auth hash in oauth complete method	2013-11-19 09:58:12 -08:00
Robin Ward	58b275665b	Oops, missing translation	2013-11-19 12:57:54 -05:00
Robin Ward	f5fc0b6b55	Only show external link icons, use the wikipedia-style icon.	2013-11-19 12:42:19 -05:00
Robin Ward	8f0a0059cc	Sorting by activity now sorts on created_at rather than bumped_at	2013-11-19 12:28:50 -05:00
Robin Ward	b98456a65f	Hide some values from the topic map if they're 0	2013-11-19 12:24:41 -05:00
Robin Ward	20e4a2ef80	Renamed components so they don't all have the annoying discourse- prefix	2013-11-19 11:59:50 -05:00
Régis Hanol	3a8bc60bf2	fix build	2013-11-19 17:16:07 +01:00
Régis Hanol	291acca4fa	autoload server/client locales in plugins	2013-11-19 16:42:28 +01:00
Régis Hanol	f9e8d57acf	Merge pull request #1675 from ofgeek/patch-1 ... Update client.zh_CN.yml	2013-11-19 06:24:51 -08:00
ofGEEK	2d66fd38ea	Update client.zh_CN.yml	2013-11-19 22:21:20 +08:00
Autumn Perrault	d9c026bec5	Fixing neglect to determine whether a user has the permission to create a topic on a category (besides being able to create a post) in ListController, TopicList, and TopicListSerializer causing the "Create Topic" button to appear even if a user cannot actually create a topic in that category but can reply to a topic therein.	2013-11-19 05:09:58 -07:00
Sam	d4435ba2ac	BUGFIX: lets not rename old migrations	2013-11-19 20:01:35 +11:00
Régis Hanol	c22f602235	Merge pull request #1669 from GManzato/fix_fr_translation ... Update french translation	2013-11-19 00:53:41 -08:00
Sam	67222ce8a0	tune down ... 80k is over aggressive	2013-11-19 15:06:34 +11:00
Sam	518ae2c608	added a minimal number of free slots that should always exist	2013-11-19 14:58:27 +11:00
Sam	2841434e36	slow down decay to accommodate for long polling and other tiny reqs	2013-11-19 14:47:13 +11:00
Sam	ef64c1b757	more logging for miss	2013-11-19 14:27:18 +11:00
Sam	f61920565a	reimplemnt oobgc algorithm	2013-11-19 14:13:42 +11:00
Gilles Manzato	231fa9c2c0	Update french translation	2013-11-19 01:00:05 +01:00
Sam	3ce6a7be4a	defer rendering of the site map ... add new and unread links in the site map categories section	2013-11-19 10:41:57 +11:00
Sam	a45334d2b9	no need "booting rails 4" message, just add booting rails 3 for now	2013-11-19 09:43:32 +11:00
Robin Ward	89a96b9e94	FIX: Topic map expansion broken without links.	2013-11-18 17:06:52 -05:00
Robin Ward	a8f9ba7566	Change "Cancel Summary" -> "Show All Posts"	2013-11-18 17:00:19 -05:00
Robin Ward	9aa2bd068a	FIX: Broken links on categories page	2013-11-18 16:59:19 -05:00
Régis Hanol	6e3de67977	fix edit reason when editing a reply	2013-11-18 19:51:30 +01:00
Robin Ward	a2466d182f	Added Participants, Likes to Topic Map	2013-11-18 13:49:53 -05:00
Robin Ward	2f39a4ac6d	Don't shorten links in Topic Map	2013-11-18 13:49:53 -05:00
Neil Lalonde	ae58a7db95	Add a warning on dashboard if enforce_global_nicknames is checked, but access key is blank.	2013-11-18 13:45:10 -05:00
Neil Lalonde	281f839e54	Site settings page tweak	2013-11-18 13:45:10 -05:00