1583 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Ward	a14f62766e	Replace MultisiteI18n hack with SiteContent and admin editing.	2013-04-05 16:48:15 -04:00
Jeff Atwood	52f79e8096	1st child in post body blockquotes, no top margin	2013-04-05 13:43:40 -07:00
Robin Ward	cecdafd4e8	Fixes broken spec	2013-04-05 16:27:25 -04:00
Robin Ward	c6bd6371f2	Exclude recently made invisible topics from the categories list. Also remove a couple n+1 queries.	2013-04-05 16:09:27 -04:00
Robin Ward	fe8d2377e8	admins/moderators should not receive "body is too similar" when editing ... a regular user's post.	2013-04-05 15:38:03 -04:00
Robin Ward	72b4f41254	Can change TOS content via site content editor	2013-04-05 15:21:55 -04:00
Robin Ward	af9b27358c	If an admin or moderator edits a visitor's post, the restrictions should be based ... on the *editors* access rights, not the original poster.	2013-04-05 13:59:00 -04:00
Robin Ward	ab85d4a757	Merge pull request #661 from wojciechka/prefix_fixes ... Fix for reply to user avatar and picture uploading not working when editing post when using prefix	2013-04-05 08:23:31 -07:00
Robin Ward	87f67a95eb	Merge pull request #660 from wojciechka/cooked_images_double_prefix ... Post processing of images adds prefix second time	2013-04-05 08:22:36 -07:00
Robin Ward	c41bdc8752	Merge pull request #662 from kubabrecka/en_typos ... fix some typos in English strings	2013-04-05 08:20:52 -07:00
Robin Ward	dbe1da6f63	Merge pull request #663 from kubabrecka/cs_update29 ... cs translation update	2013-04-05 08:20:34 -07:00
Robin Ward	63f252c142	Merge pull request #658 from ZogStriP/prevent-crlf-on-yml-files ... prevent crlf on yml files	2013-04-05 08:16:22 -07:00
Robin Ward	83b98830a2	Merge pull request #657 from kubabrecka/master ... Replace CRLF with LF	2013-04-05 08:12:12 -07:00
Robin Ward	75a8a3198e	Merge pull request #642 from mshappe/mac-native-guide-fixed ... Instructions for creating an OS X native development environment	2013-04-05 08:11:42 -07:00
Shawn Holmes	acbf4cb412	Sync folder now specifies id ... Vagrant 1.1.5 seems to think we are overriding a previous shared folder in our script. Passing the id solves this.	2013-04-05 08:42:46 -06:00
Wojciech Kocjan	0481fbae8c	Fix for reply to user avatar and picture uploading not working when editing post with discourse running in a prefix	2013-04-05 12:46:14 +02:00
Wojciech Kocjan	68bdab6635	Post processing of images adds prefix second time when post processing a post with one or more images if running with a prefix	2013-04-05 12:38:20 +02:00
Kuba Brecka	6dff266930	cs translation update	2013-04-05 11:31:43 +02:00
Kuba Brecka	920e1dfd24	fix some typos in English strings	2013-04-05 11:31:06 +02:00
Régis Hanol	86ef17af4f	prevent crlf on yml files	2013-04-05 11:20:57 +02:00
Kuba Brecka	5f4b66d1bd	replace CRLF with LF	2013-04-05 11:05:03 +02:00
Sam	5273657537	a method called "adding_user_record" is annoying me. 5 lines of code replaced with 2	2013-04-05 17:53:39 +11:00
Sam	ea8d69fbd6	fix my broken test	2013-04-05 17:47:54 +11:00
Sam	a2cca2540e	some minimal site settings diags ... fix issue where days_visited was totally out of sync	2013-04-05 17:47:54 +11:00
Sam	a7f92ec0c1	topic reply count resync for each new post	2013-04-05 17:47:54 +11:00
Jeff Atwood	efa99eb242	copyedits on Site Content editor help	2013-04-04 22:47:32 -07:00
Jeff Atwood	e7499adacc	clarify language on enable_private_messages	2013-04-04 22:24:58 -07:00
Jeff Atwood	e3b6fc3ec0	trust ranges are 0-4, not 0-5 (moderators diff)	2013-04-04 22:19:13 -07:00
Sam	bf8e756175	Merge pull request #637 from wojciechka/master ... Putting rootURL in JavaScript using Discourse::base_uri and erb	2013-04-04 21:42:54 -07:00
Sam	fe434710e1	Merge pull request #647 from windyson2008/patch-1 ... Update client.zh_CN.yml	2013-04-04 21:40:41 -07:00
Sam	162af29aae	Merge pull request #653 from kubabrecka/cs_typos ... fix some typos in cs translation	2013-04-04 21:36:31 -07:00
Sam	27776287f4	Merge pull request #654 from ZogStriP/consistent-behavior-regarding-file-uploads ... consistent behavior regarding file uploads	2013-04-04 21:36:17 -07:00
Sam	4fbf017272	get regular trust level going, self heal inconsistent topic timings	2013-04-05 15:30:28 +11:00
Régis Hanol	82bd92dd46	consistent behavior regarding file uploads	2013-04-05 01:07:31 +02:00
Jeff Atwood	6aaa0ffe5e	add max-width to all img in onebox-result-body	2013-04-04 15:20:11 -07:00
Robin Ward	fa1ba6791b	Work in Progress: Content Editing in Admin Section	2013-04-04 17:26:22 -04:00
Neil Lalonde	bd0e98aec2	Fix for when category description has html. Could be better.	2013-04-04 17:16:30 -04:00
Neil Lalonde	d974aea536	Underline links in the detected problems messages on admin dashboard	2013-04-04 16:16:58 -04:00
Neil Lalonde	66bc48a0e3	Give magic wands to all moderators	2013-04-04 16:14:55 -04:00
Neil Lalonde	4096c6bdc2	Use a font-awesome icon in category search field instead of the default hideous one	2013-04-04 12:46:38 -04:00
Neil Lalonde	a4a09dc242	Fix styling of category select when editing a topic title	2013-04-04 11:34:07 -04:00
Kuba Brecka	53bcf99f57	fix some typos in cs translation	2013-04-04 16:57:54 +02:00
Neil Lalonde	3e0ef018ab	Use temp variable for .chosen().next()	2013-04-04 10:44:11 -04:00
Wojciech Kocjan	a875b1c44a	Store base URI in Discourse.BaseUri and use it in all places where rootURL was previously used	2013-04-04 11:16:38 +02:00
Jeff Atwood	02c6f0f631	make ban the actual icon-circle-ban, and danger	2013-04-04 02:09:27 -07:00
Jeff Atwood	cb9370b00c	clarify that read tab is in order that you read	2013-04-04 02:06:31 -07:00
Jeff Atwood	9eec973fc4	screwed up the magicks a bit.	2013-04-04 01:56:35 -07:00
Jeff Atwood	90d979d88d	add moderator MAGGICCCKKSSSSSsssSSss	2013-04-04 01:52:47 -07:00
windyson2008	d8b6ecef74	Update client.zh_CN.yml ... 1,Add tag 2,Fix translation	2013-04-04 13:20:45 +09:00
Michael Scott Shappe	668bf4e86e	The wrong version actually got moved to this branch when I tried to clean some things up. This version should be correct :-)	2013-04-03 22:36:17 -05:00