1073 Commits

Author	SHA1	Message	Date
Robin Ward	491c93c3d1	Merge branch 'makeheadspace-fix_spelling_on_settings' ... Conflicts: config/locales/server.en.yml	2013-07-31 10:24:37 -04:00
Robin Ward	6f81b9b9af	Merge branch 'fix_spelling_on_settings' of git://github.com/makeheadspace/discourse into makeheadspace-fix_spelling_on_settings	2013-07-31 10:23:04 -04:00
Uģis Ozols	0fc5d53e5a	Remove redundant 'are'.	2013-07-31 13:05:14 +03:00
Jeff Atwood	4e59f2d122	update copy for self-deleted posts ... still needs variable replacement for the 24 hours part	2013-07-30 13:16:13 -07:00
Zee Spencer	1caa301712	Fix spelling of noscript in the settings page.	2013-07-30 10:22:31 -04:00
Neil Lalonde	4fd5087f91	Add button to delete a spammer in the flag modal ... Add SiteSettings: delete_user_max_age, delete_all_posts_max. Add delete spammer button to admin flags UI Moderators can delete users too	2013-07-29 15:29:44 -04:00
Neil Lalonde	5f3e9131ed	Deleting a user from admin user page has the option to also block signups from the same email address	2013-07-29 15:29:43 -04:00
Neil Lalonde	5f8a130277	Add BlockedEmail, to block signups based on email. Track stats of how many times each email address is blocked, and last time it was blocked. Move email validation out of User model and into EmailValidator. Signup form remembers which email addresses have failed and shows validation error on email field.	2013-07-29 15:29:43 -04:00
Sam	77494e201a	Merge pull request #1258 from elo7/pt_BR ... Added pt_BR user.change key value	2013-07-28 22:18:37 -07:00
Sam	aa6c92922d	SECURITY: correct our CSRF implementation to be much more aggressive	2013-07-29 15:13:13 +10:00
Daniel Cukier	c73f22b515	added pt_BR key	2013-07-26 11:17:20 -03:00
Anton Batenev	ce8d69ccf1	Russian translation (actual version)	2013-07-26 14:35:59 +04:00
Robin Ward	e94cab090a	Merge pull request #1251 from johand/updating_es_locale ... updating the spanish translation in client.es.yml	2013-07-25 13:05:08 -07:00
Robin Ward	0317cf9608	Show topics as a list of topics on the User Stream.	2013-07-25 15:56:20 -04:00
Johan	cca9473c55	updating the spanish translation in client.es.yml	2013-07-24 04:43:53 -04:30
Sam	366cb13140	restyle all user notification emails to use a custom html template	2013-07-24 17:24:55 +10:00
Régis Hanol	be9217d4c8	add server-side filesize check on uploads	2013-07-24 00:54:41 +02:00
Sam	7c5e15966f	Merge pull request #1225 from ZogStriP/upload-selector-handles-attachments ... uploads selector texts is now different when attachments are enabled	2013-07-23 00:44:17 -07:00
Sam	9ac6c6e2e9	Merge pull request #1233 from sir-pinecone/improve-group-deletion ... Add confirmation modal to admin group deletion	2013-07-23 00:43:06 -07:00
Doug Alcorn	35a2bb7919	Parameterize the PBKDF2 algorithm in application config ... http://meta.discourse.org/t/sso-between-discourse-and-xmpp/8567/5	2013-07-22 21:36:01 -04:00
Régis Hanol	6474e7df97	uploads selector texts is now different when attachments are enabled	2013-07-22 23:15:23 +02:00
Robin Ward	43ceacabab	Link to edit "About Me" links directly to the field.	2013-07-22 16:53:21 -04:00
Neil Lalonde	b0ca3a34ca	Neil have fixed his grammar	2013-07-22 15:45:46 -04:00
Robin Ward	3e7b418ea8	First Try: Include Post History (context) in Notification Emails	2013-07-22 15:06:37 -04:00
Robin Ward	ed745c3fdd	Merge pull request #1222 from ZogStriP/fix-s3-related-issues ... Fix s3 related issues	2013-07-22 07:30:41 -07:00
Robin Ward	c879c58481	Merge pull request #1227 from abbat/master ... Russian translation (actual version)	2013-07-22 07:23:18 -07:00
Robin Ward	8b181e0803	Merge pull request #1230 from ZogStriP/add-newuser-max-attachments-setting ... add newuser-max-attachments setting	2013-07-22 07:22:23 -07:00
Sam	1f3c5cb656	allow end user to recover a post they delete ... automatically delete stubs after 1 day	2013-07-22 17:48:47 +10:00
Michael Campagnaro	9616767bff	Add confirmation modal to admin group deletion	2013-07-22 02:48:23 -04:00
Sam	9e4b0df7ff	69 specs fail in rails 4 now ...not too bad	2013-07-22 15:07:20 +10:00
Régis Hanol	2986798ba7	add newuser-max-attachments setting	2013-07-22 02:39:17 +02:00
Anton Batenev	ad31eefb27	Russian translation (actual version)	2013-07-22 01:49:46 +04:00
Michael Brown	ddabc476bf	Awesome documentation updates	2013-07-21 03:43:54 -04:00
Régis Hanol	613e31d3ef	added a warning regarding the case of the s3_upload_bucket setting ... until we get proper setting validation.	2013-07-20 11:54:21 +02:00
Sam	58eec31351	sample ubuntu upstart config file	2013-07-19 15:23:55 +10:00
Prem Prakash	713735f4c8	updating pt_BR translations	2013-07-18 00:09:54 -03:00
Robin Ward	19f3a8d640	Each user activity filter has its own URL now.	2013-07-17 15:42:31 -04:00
Robin Ward	e2ff064aa3	Merge pull request #1198 from prem-prakash/master ... Adding Portuguese Brazilian translations	2013-07-17 06:59:31 -07:00
Robin Ward	6839869170	Merge pull request #1211 from zsj950618/master ... Add some translation of Simplified Chinese	2013-07-17 06:53:07 -07:00
Robin Ward	75e636f5a5	FIX: Invalid YAML	2013-07-17 09:51:03 -04:00
Junki Cho	b4cae0f5d3	Korean language pack	2013-07-17 09:36:50 -04:00
Sam	c2be81a76e	Merge pull request #1199 from ZogStriP/uploads ... adds the `max_attachment_size_kb` setting	2013-07-16 23:03:42 -07:00
Sam	2573935155	improve security UI	2013-07-17 15:10:49 +10:00
Sam	625204c8bd	work in progress category UI ... refactor hack from earlier	2013-07-17 14:54:21 +10:00
SJ Zhu	0956c60c99	add some missing Simplified Chinese translation	2013-07-17 09:47:07 +08:00
Régis Hanol	46ff98f2d3	fix composer toolbar upload title	2013-07-17 01:21:27 +02:00
Robin Ward	d466d11e71	Ember RC6 update	2013-07-16 10:35:18 -04:00
Robin Ward	86d0255d5a	Merge pull request #1197 from kubabrecka/cs_update49 ... cs translation update	2013-07-16 07:33:33 -07:00
Sam	06bd9e3234	allow login required screen to be customized	2013-07-16 20:49:04 +10:00
Sam	ff7d9cac38	fix non localized said: in quotes	2013-07-16 17:22:54 +10:00