3070 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Neil Lalonde	b2d300fe0b	Add ability to give users a title. Show them under usernames beside posts. Needs love from a designer.	2013-06-25 18:39:20 -04:00
Neil Lalonde	a86b35c873	Remove the access_password site setting	2013-06-25 15:05:25 -04:00
Robin Ward	9a19c0d9c4	Fix for multiple paragraph emails with text em-dashes in them (--).	2013-06-25 14:06:05 -04:00
Jeff Atwood	87db582297	minor copyedit on "20 to go.."	2013-06-25 10:36:46 -07:00
Jeff Atwood	a9f4fa4927	copyedits on reply via email	2013-06-25 10:07:27 -07:00
Robin Ward	3067c2ed3b	Private messages have instructions for reply by email. We also strip X-Discourse headers ... before sending the message as they are no longer needed.	2013-06-25 11:35:26 -04:00
Robin Ward	3fc69337d3	Enable reply by email for all users, display a message in the footer indicating so.	2013-06-25 11:27:17 -04:00
Robin Ward	62daeedf08	Merge pull request #1092 from ZogStriP/rolling-back-markdown-conversion-pipeline-order-changes ... reverting changes to the markdown conversion pipeline order	2013-06-25 08:20:10 -07:00
Régis Hanol	573c4b41f0	reverting changes to the markdown conversion pipeline order	2013-06-25 17:13:41 +02:00
Neil Lalonde	8ee00b4d5e	Make the reply-on-which-topic modal bigger	2013-06-25 10:50:36 -04:00
Robin Ward	a4e8a828c8	Merge pull request #1091 from mfeckie/refactor-tests ... Refactor tests	2013-06-25 07:31:19 -07:00
Martin Feckie	674e26e6c3	Updated tests to decrease string repetition ... Removed an unused variable Some minor style changes	2013-06-25 22:15:41 +08:00
Sam	7d1e8239e0	Merge pull request #1070 from house9/top-menu ... adds TopMenuItem model which encapsulates top_menu parsing logic	2013-06-25 02:51:57 -07:00
Sam	4c51f36db2	was dropping off the last key when inviting a user by email.	2013-06-25 17:53:12 +10:00
Sam	1106eb9902	correct the category chooser to properly convert any html in category descriptions to text	2013-06-25 17:22:56 +10:00
Jeff Atwood	1ac7c28680	add method='post' to JS injected login form	2013-06-24 21:42:08 -07:00
Neil Lalonde	008f3b4785	Use tiny date format on posts	2013-06-24 18:46:58 -04:00
Jeff Atwood	d9a8419d68	Merge pull request #1087 from ZogStriP/fix-posts-rebake ... Fix posts rebake	2013-06-24 15:32:14 -07:00
Régis Hanol	52b8e6014b	forgot to commit the test	2013-06-24 22:56:03 +02:00
Régis Hanol	3d2ef18bb7	move BBCode formating before the markdown conversion	2013-06-24 22:25:08 +02:00
Régis Hanol	da52ac88b0	do not throw exception when parsing a bad URI	2013-06-24 21:38:00 +02:00
Neil Lalonde	e12dff2c31	New bootbox renders all the buttons backwards. :<	2013-06-24 15:29:58 -04:00
Neil Lalonde	c79ab3fc2e	Change modal that asks which topic you want to reply in; upgrade bootbox.js	2013-06-24 15:01:07 -04:00
Jesse House	06be760257	adds TopMenuItem model which encapsulates top_menu parsing logic	2013-06-24 10:04:18 -07:00
Robin Ward	0c4de24dd5	Merge pull request #1086 from budnik/facebook_user_info_assoc_was_missing ... adding a missing User association	2013-06-24 07:15:20 -07:00
Dmitriy Budnik	d12288de49	adding a missing User association	2013-06-24 17:08:49 +03:00
Robin Ward	b56f8a0176	Merge pull request #1085 from ThomasHarper/patch-4 ... Update server.fr.yml	2013-06-24 06:45:41 -07:00
ThomasHarper	7e9d942060	Update server.fr.yml ... Adding quotes and few things missing	2013-06-24 15:41:24 +02:00
Robin Ward	bad7707cf3	Merge pull request #1082 from ThomasHarper/patch-2 ... Update client.fr.yml	2013-06-24 06:28:51 -07:00
Robin Ward	4b638a0fea	Merge pull request #1083 from ThomasHarper/patch-3 ... Update client.fr.yml	2013-06-24 06:27:59 -07:00
Robin Ward	adce747d1b	Merge pull request #1084 from abbat/master ... Russian translation (actual version)	2013-06-24 06:27:11 -07:00
Robin Ward	1b8c9d2efd	Merge pull request #1077 from jamesaanderson/jump-to-last-post-in-best-of-mode-fix ... Jump to last post in "Best of" mode fix	2013-06-24 06:26:44 -07:00
Anton Batenev	fe51fd87cc	Russian translation (actual version)	2013-06-24 15:55:44 +04:00
ThomasHarper	b8960f26c9	Update client.fr.yml ... Dates were missing and few stuff on back end	2013-06-24 12:43:02 +03:00
ThomasHarper	fadab25609	Update client.fr.yml ... Missing quote	2013-06-24 12:01:42 +03:00
Jeff Atwood	ab74bbfc8e	we use wrench for admin not cog ... NO WIRE COAT HANGERS!! NO WIIIIREEE COOAATT HANNGGERSS	2013-06-24 01:22:40 -07:00
Jeff Atwood	686d1c0c25	Merge pull request #1080 from Supermathie/sysadmin-docs ... Add documentation for discourse email setup	2013-06-24 01:21:25 -07:00
Michael Brown	ecb3858283	docs: add warning to NOT use gmail for outgoing	2013-06-24 04:16:33 -04:00
Michael Brown	ffba090fb7	docs: Add note on where to put local assets	2013-06-24 04:16:33 -04:00
Michael Brown	c2e1e553bf	docs: create configuration steps for mail	2013-06-24 04:16:25 -04:00
James Anderson	c6113f6701	Jump to last post in "Best of" mode fix ... http://meta.discourse.org/t/jump-to-last-post-does-not-work-in-best-of-mode/7626/	2013-06-23 12:12:37 -07:00
Sam	47fd1c5228	more left over code removed	2013-06-23 15:33:35 +10:00
Sam	25bb8cf382	remove dead uncalled code	2013-06-23 15:28:38 +10:00
Sam	d4d8daaa6d	Merge pull request #1069 from erlend-sh/patch-2 ... Updated NO translation - Some questions in dscr.	2013-06-23 22:32:45 -07:00
Sam	4f2e72b6f7	Merge pull request #1071 from jamesaanderson/master ... Correctly resize big images in preview	2013-06-23 22:31:07 -07:00
Sam	ea932b74e7	values is a much more consistent name than all_values ... we use {}.values not {}.all_values ... also fixes random ordering of tests failure in site settings	2013-06-23 15:07:49 +10:00
Sam	22d6f6784c	Merge pull request #1075 from ZogStriP/fix-lightboxing-when-using-s3 ... FIX: lightbox wasn't working when using s3 upload	2013-06-23 22:11:45 -07:00
Sam	7c726bd235	Merge pull request #1079 from ZogStriP/do-not-lightbox-oneboxed-images ... do not lightbox oneboxed images	2013-06-23 22:07:25 -07:00
Régis Hanol	361062d53e	do not lightbox oneboxed images	2013-06-24 02:10:21 +02:00
Sam	287d0dbd75	bad locale files could lead to broken automatic groups	2013-06-23 14:44:16 +10:00