948 Commits

Author	SHA1	Message	Date
Régis Hanol	c42cb6ef48	add a comment in database.yml template files indicating that Sidekiq must be restarted after changes	2013-07-04 23:31:36 +02:00
Robin Ward	ea11286ab6	Merge pull request #1131 from novemberkilo/feature/temporary-boost-trust-levels ... Feature: Admin can modify user trust levels	2013-07-04 06:57:59 -07:00
Sam	b83e3a3ffd	Merge pull request #1137 from kubabrecka/cs_update47 ... cs translation update	2013-07-03 23:29:05 -07:00
Sam	33a49607d6	Merge pull request #1138 from kubabrecka/en_yml_action_type_fix ... remove localization duplicate - seems like a typo	2013-07-03 23:15:26 -07:00
Anton Batenev	89dcded3a7	i18n transliteration map from Russian Cyrillic to ASCII ... i18n transliteration map from Russian Cyrillic to ASCII (ISO-9:1995 / GOST 7.79-2000, table B) for pretty URLs (slug)	2013-07-04 01:17:01 +04:00
Kuba Brecka	f7e2b3be7f	remove localization duplicate - seems like a typo	2013-07-03 21:27:46 +02:00
Kuba Brecka	e58f9ef843	cs translation update	2013-07-03 21:22:41 +02:00
Robin Ward	f328804488	Merge branch 'add-list-of-authorized-extensions' of git://github.com/ZogStriP/discourse into ZogStriP-add-list-of-authorized-extensions ... Conflicts: app/models/site_setting.rb	2013-07-03 11:18:42 -04:00
Robin Ward	6364fc74ef	Merge branch 'rewrite_update_alls' of git://github.com/stephankaag/discourse-1 into stephankaag-rewrite_update_alls ... Conflicts: app/services/spam_rules_enforcer.rb	2013-07-03 11:13:56 -04:00
Robin Ward	c12e87650d	Merge pull request #1130 from adrianlang/patch-1 ... Fix German translation of user_automatically blocked template	2013-07-03 08:06:15 -07:00
ThomasHarper	7ef5f0ac9b	Update server.fr.yml	2013-07-03 14:47:38 +02:00
ThomasHarper	4f10ea9880	Update server.fr.yml ... Added few POPS3 translations and few things	2013-07-03 14:22:31 +02:00
ThomasHarper	67502d0c8e	Update server.fr.yml ... added cas_domainname	2013-07-03 14:07:26 +02:00
ThomasHarper	64a00e284e	Update client.fr.yml ... Missing capital on homepage	2013-07-03 11:43:52 +02:00
Navin	3da37506da	Back end - temporary boosting of trust levels	2013-07-03 10:30:40 +02:00
Adrian Lang	5ea2bce646	Fix German translation of user_automatically blocked template ... Right now this bug prevents blocking with German locale.	2013-07-03 09:38:21 +02:00
Robin Ward	22e6b3f466	FIX: When moving topics to an existing topic, say it's an existing topic in the moderator message.	2013-07-02 15:47:15 -04:00
Neil Lalonde	075ed1ab53	Refactor user blocking code; hide the Block button in admin	2013-07-02 14:42:53 -04:00
Robin Ward	5770879472	Refactor: Move Topic Details into better objects, identity map, tests, query string filters	2013-07-02 10:36:46 -04:00
merugear	f47effa154	Changed grammar on powered_by_html	2013-07-02 12:11:28 +02:00
Jeff Atwood	8057851cf5	"there are no more" is sufficient, drop "to read"	2013-07-01 23:29:49 -07:00
Sam	12f866a727	Merge pull request #1120 from abbat/master ... Russian translation (actual version)	2013-07-01 22:44:30 -07:00
Sam	c3f64f99b3	fix up messed up routes	2013-07-02 15:21:26 +10:00
Sam	46c6949b6e	Merge pull request #1123 from stephankaag/rails4-new ... Refactor routes in order to be compatible with Rails 4	2013-07-01 16:07:22 -07:00
Stephan Kaag	e39cc464b1	Refactor routes in order to be compatible with Rails 4	2013-07-01 20:00:06 +02:00
Anton Batenev	5281ba5af3	Russian translation (actual version)	2013-07-01 11:14:19 +04:00
Régis Hanol	6723ba6014	Add a list of for file uploads	2013-07-01 02:19:03 +02:00
Neil Lalonde	c1a39b5a30	Show date with year in message to banned users who try to log in	2013-06-30 12:49:34 -04:00
Neil Lalonde	dca216ed54	Be a bit more clear in the forgot password message	2013-06-28 18:14:16 -04:00
Robin Ward	2deaf8ef98	Custom Wordpress Serializer and Path, with Specs	2013-06-28 13:56:13 -04:00
Neil Lalonde	2d6118297d	Changes to tiny date format to remove mon and show short format dates instead	2013-06-28 13:10:04 -04:00
Neil Lalonde	3c9cdead49	Update title on bookmark button of the last post you read	2013-06-28 13:10:04 -04:00
ThomasHarper	0382ec319e	Update client.fr.yml	2013-06-28 16:38:10 +02:00
Robin Ward	4711c75e53	Merge pull request #1103 from royguo/patch-1 ... Update server.zh_CN.yml	2013-06-28 07:21:50 -07:00
Robin Ward	251d169c0d	Merge pull request #1104 from ThomasHarper/patch-5 ... Update client.fr.yml	2013-06-28 07:21:10 -07:00
ThomasHarper	71464c0c31	Update client.fr.yml ... dynamic_favion added	2013-06-28 16:04:20 +02:00
ThomasHarper	80e886bfde	Update client.fr.yml ... Adding few translations again	2013-06-28 15:58:19 +02:00
ThomasHarper	a94947f5b0	Update client.fr.yml ... Adding missing fr translation	2013-06-28 15:25:05 +02:00
Roy Guo	4034cde6aa	Update server.zh_CN.yml ... num_clicks : "点击数"	2013-06-28 09:54:37 +08:00
Jeff Atwood	40c9014634	make flag reply reply-ier	2013-06-27 16:01:48 -07:00
Neil Lalonde	5d6ad8f39c	Show a useful message when a banned user tries to log in	2013-06-27 15:14:42 -04:00
Robin Ward	bf96c8ad01	Support for Custom FAQ content	2013-06-27 12:50:24 -04:00
Robin Ward	d13166fa17	Merge pull request #1095 from Mikulas/typo-translation-czech ... Minor typo fix in czech translation	2013-06-27 07:08:57 -07:00
Sam	9fd00cac65	work in progress, add custom faq link, ember router needs to know about this or the redirect trick will not work	2013-06-27 17:15:59 +10:00
Jeff Atwood	5d1f5505af	"private topics" doesn't need to say "count"	2013-06-26 21:26:51 -07:00
Régis Hanol	72745d257d	provide a way to give a default filename to pasted images in the lightbox overlay	2013-06-26 21:54:08 +02:00
Mikulas	6819cd2886	minor typo fix in czech translation ... grammar source: http://www.proofreading.cz/\?p\=377	2013-06-26 20:10:50 +02:00
Robin Ward	89f182899f	Support for custom Privacy Policies	2013-06-26 10:59:36 -04:00
Neil Lalonde	196a8f4ba5	Add dashboard warnings for system_username and notification_email site settings	2013-06-26 10:57:04 -04:00
Jeff Atwood	e4f1255cde	copy improvement on account approval	2013-06-26 01:17:27 -07:00