5353 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Ward	549060867d	Updated documentation for inlineRegexp	2013-11-25 11:35:28 -05:00
Robin Ward	a8a51746a5	Merge pull request #1693 from sanderdatema/patch-3 ... Updated Dutch translation	2013-11-25 08:32:50 -08:00
Robin Ward	d208be14d2	FIX: Ruby 1.9.3 UTF-8 bug	2013-11-25 11:29:58 -05:00
Sander Datema	2d21e64367	Update client.nl.yml	2013-11-25 17:06:05 +01:00
Sander Datema	6a7e71885d	Updated server.nl.yml	2013-11-25 17:03:54 +01:00
Sam	2eee7433f0	update message bus for .stop() support, stop the message bus during test	2013-11-25 18:01:03 +11:00
Sam	95c968d7b7	fix js specs	2013-11-25 17:50:48 +11:00
Sam	6544f39bcc	fix topic counts not updating automatically in various spots (top menu / categories page / drop down)	2013-11-25 17:37:51 +11:00
Sam	92528d7207	message bus update, extract message bus js out into gem	2013-11-25 17:37:01 +11:00
Jeff Atwood	8df30fa48e	minor copyedit on summary text	2013-11-22 17:18:38 -08:00
Robin Ward	f1a681aa46	Fix: Participant filter was broken.	2013-11-22 17:02:12 -05:00
Régis Hanol	558eb78daa	Merge pull request #1689 from velesin/remove_header_controller_mobile_device ... removes unused property from HeaderController	2013-11-22 13:39:52 -08:00
Neil Lalonde	bc8cd043ad	Send the locale of your site to the Discourse Hub	2013-11-22 15:30:47 -05:00
Wojciech Zawistowski	afd198a387	removes unused property from HeaderController	2013-11-22 21:07:03 +01:00
Régis Hanol	82b78ec6ba	schemaless avatar urls	2013-11-22 19:18:45 +01:00
Régis Hanol	3cf5a363f7	do not destroy uploads when destroying a user	2013-11-22 18:29:07 +01:00
Neil Lalonde	4e45c5ff3d	Fix js for handling click of header buttons. They were adding /# to the url, which broke routing.	2013-11-22 11:50:57 -05:00
Neil Lalonde	35bb4fc17f	When flag is from system, don't show a user avatar. Say System: instead	2013-11-22 11:14:09 -05:00
Robin Ward	4c0642cbe1	Merge pull request #1684 from abbat/master ... Russian translation (actual version)	2013-11-22 08:07:25 -08:00
Robin Ward	ec5788f80b	Merge pull request #1688 from velesin/sitemap_integration_tests ... header sitemap integration tests	2013-11-22 08:06:49 -08:00
Sam	49b48e1eb6	ensure we have a bigint id	2013-11-22 17:51:36 +11:00
Sam	b804f0bec9	add license for oobgc, should not be gpl	2013-11-22 17:04:32 +11:00
Sam	b590b98491	update mini profiler	2013-11-22 17:04:14 +11:00
Régis Hanol	f65cde3cda	do not bump posts when rebaking	2013-11-22 01:52:26 +01:00
Neil Lalonde	bcfbacec16	Don't show category descriptions as suggested topics	2013-11-21 16:43:22 -05:00
Neil Lalonde	574a8c92c4	Change enforce_global_nicknames to false until we start giving out access keys	2013-11-21 15:44:09 -05:00
Wojciech Zawistowski	1d3097245c	header sitemap integration tests	2013-11-21 20:38:56 +01:00
Régis Hanol	60d97b8fc2	fix the build	2013-11-21 19:45:35 +01:00
Régis Hanol	d134a5e199	Merge pull request #1686 from velesin/header_category_info_component_fix ... FIX: removes invalid, unpaired closing tag	2013-11-21 09:07:27 -08:00
Régis Hanol	30e0d102e3	add unf gem to remove warning	2013-11-21 17:33:43 +01:00
Wojciech Zawistowski	b6de8324be	FIX: removes invalid, unpaired closing tag	2013-11-21 17:33:03 +01:00
Robin Ward	50005e2ef9	FIX: Back button wasn't reusing scroll position on category filter	2013-11-21 11:31:10 -05:00
Anton Batenev	a734878930	Russian translation (actual version)	2013-11-21 13:46:19 +04:00
Régis Hanol	fb4fb50b7b	Merge pull request #1683 from GManzato/fix_fr_translation ... Update french translation	2013-11-21 00:36:41 -08:00
Régis Hanol	7ad21b0f90	Merge pull request #1682 from ofgeek/patch-1 ... Update client.zh_CN.yml	2013-11-21 00:28:31 -08:00
Gilles Manzato	e6995945ea	Update french translation	2013-11-21 09:17:15 +01:00
Jeff Atwood	5bc3176ffb	minor copyedits	2013-11-20 17:21:51 -08:00
ofGEEK	fe21ffdab4	Update client.zh_CN.yml	2013-11-21 09:06:33 +08:00
Neil Lalonde	c85fca58b5	Version bump to v0.9.7.5	2013-11-20 17:42:55 -05:00
Neil Lalonde	69cc1dd689	FIX: don't suggest a username that's already taken, even if hub finds a match	2013-11-20 14:56:21 -05:00
Neil Lalonde	97cb9e1545	Signup with 3rd party auth can find the matching username from the Discourse Hub	2013-11-20 14:56:21 -05:00
Robin Ward	ea8e4bfbcf	FIX: Double footer navigation	2013-11-20 14:16:33 -05:00
Robin Ward	5055da76e6	Abort triggers for email body processing	2013-11-20 13:30:01 -05:00
Robin Ward	d09735ff46	Merge pull request #1680 from velesin/user_activity_link_title_fix ... FIX: repairs title attr in the link	2013-11-20 09:04:43 -08:00
Robin Ward	0bab3f9b4e	Revert "Revert "FIX: Markdown bug", breaks build" ... This reverts commit 08ad5d479e.	2013-11-20 11:53:06 -05:00
Neil Lalonde	f3feb441f9	Allow translations for admin_js in plugins. Use deep_merge so plugins can add to existing sections.	2013-11-20 11:51:07 -05:00
Neil Lalonde	9de07fd83f	Merge pull request #1678 from eriko/patch-3 ... Load plugin settings.	2013-11-20 07:54:20 -08:00
Régis Hanol	31fd5b85bc	FIX markdown hotlinked images were not properly pulled	2013-11-20 13:10:08 +01:00
Sam	37267f36a6	we better rm on startup to work around jenkins messing it up, till I figure a cleaner way	2013-11-20 17:31:58 +11:00
Sam	adf355567c	move emoji to correct location without a post rebake	2013-11-20 16:54:49 +11:00