4524 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jeff Atwood	40c9014634	make flag reply reply-ier	2013-06-27 16:01:48 -07:00
Neil Lalonde	8e50b49cf1	Try to fix specs that are failing in jenkins	2013-06-27 17:23:06 -04:00
Neil Lalonde	1355c1e3b0	Fix links to uncategorized when SiteSetting.uncategorized_name is set	2013-06-27 16:16:06 -04:00
Neil Lalonde	5d6ad8f39c	Show a useful message when a banned user tries to log in	2013-06-27 15:14:42 -04:00
Neil Lalonde	948fc62b4a	Handle configurable routes for statics in static_controller.js. Make it better when we can use ember's new async routing.	2013-06-27 13:01:12 -04:00
Robin Ward	bf96c8ad01	Support for Custom FAQ content	2013-06-27 12:50:24 -04:00
Neil Lalonde	94b8286819	Configurable FAQ url	2013-06-27 12:10:43 -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	1dd6699bf2	fix jshint	2013-06-27 17:19:11 +10: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
Sam	6145e99baa	navigate to message fixed, changed to button ... added spec to catch this regression in future	2013-06-27 16:59:07 +10:00
Sam	87e9e9d437	fix broken link for admin user in flags	2013-06-27 16:59:07 +10:00
Sam	274d8cbc0b	if the title is the same as the value for a number, do not display it	2013-06-27 16:59:07 +10:00
Jeff Atwood	5d1f5505af	"private topics" doesn't need to say "count"	2013-06-26 21:26:51 -07:00
Jeff Atwood	61b387524d	Merge pull request #1099 from Supermathie/sysadmin-docs ... docs: Add link to Admin Guide	2013-06-26 21:02:00 -07:00
Michael Brown	7efe97798b	docs: Add link to Admin Guide	2013-06-26 23:58:29 -04:00
Sam	2a899da909	fix trademark	2013-06-27 09:38:15 +10:00
Jeff Atwood	63d967e634	Merge pull request #1097 from ZogStriP/blob-blob-blob ... provide a way to give a default filename to pasted images...	2013-06-26 16:24:51 -07:00
Jeff Atwood	0d8bda2aa5	Merge pull request #1098 from ZogStriP/FIX-urls-in-BBCode-tags ... FIX: urls in BBCode tags weren't working	2013-06-26 16:24:35 -07:00
Régis Hanol	689b296204	FIX: urls in BBCode tags weren't working	2013-06-27 00:42:11 +02:00
Neil Lalonde	b47f6e80b8	Version bump to v0.9.4	2013-06-26 17:55:12 -04:00
Neil Lalonde	278ae7e413	Fix exporter spec brokenness in random mode	2013-06-26 17:02:24 -04:00
Neil Lalonde	6b58713fa6	Fix title attributes on post info	2013-06-26 16:27:18 -04: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
Jeff Atwood	a0031f2a0d	minor style tweaks to flags layout	2013-06-26 12:10:07 -07: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
Neil Lalonde	b1d0f30379	Fix AdminUser bulkApprove; add a way to approve a user without sending them the welcome email for cases when must_approve_users is enabled and there are existing users	2013-06-26 13:24:30 -04:00
Neil Lalonde	03afe9280d	Fix failing import spec with seed 30239	2013-06-26 11:42:52 -04: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
Neil Lalonde	dea75870e1	Fix: don't enable login_required on sites that used to use an access_password	2013-06-26 10:31:10 -04:00
Sam	039b4758ac	fix 1.9.3 regression, [] does not work on OpenStruct there.	2013-06-26 21:49:29 +10:00
Jeff Atwood	e4f1255cde	copy improvement on account approval	2013-06-26 01:17:27 -07:00
Sam	5a4279f2ab	if for some reason user was nuked don't kill the old flag page	2013-06-26 18:05:15 +10:00
Sam	827830d7ea	move each flag to its own row inside a nested table.	2013-06-26 17:01:58 +10:00
Jeff Atwood	1ec411c811	we're so excited, and we just can't hide it ... we're about to lose control and we think we like it	2013-06-25 23:57:28 -07:00
Sam	38abac8877	no idea why, but jenkins does not like this pending spec	2013-06-26 16:38:52 +10:00
Sam	bb0c3302f3	oddly enough having this code in a pending block causes an error in jenkins	2013-06-26 16:28:07 +10:00
Sam	48d7a33157	Flag UI now displays deleted status for post/topic correctly on old flags ... Commented out a spec that was failing in order random, with a TODO	2013-06-26 16:18:50 +10:00
Sam	148d2f2cd4	bug fixes	2013-06-26 16:00:17 +10:00
Sam	65dc04c00e	simplify flag reporting and correct it so it properly displays old flags	2013-06-26 15:57:55 +10:00
Jeff Atwood	1323a717da	Merge pull request #1094 from Supermathie/sysadmin-docs ... docs: fix ugly linebreak issues in INSTALL-email	2013-06-25 22:34:50 -07:00
Michael Brown	6dc5659fed	docs: fix ugly linebreak issues in INSTALL-email	2013-06-26 01:22:11 -04:00
Sam	7a16472041	Merge pull request #1093 from ZogStriP/soften-the-lightbox-overlay ... soften the lightbox overlay	2013-06-25 18:49:12 -07:00
Régis Hanol	d3eae56e71	soften the lightbox overlay	2013-06-26 02:44:20 +02:00
Sam	92562c2090	Merge pull request #1057 from house9/list-controller-1 ... refactor list_controller	2013-06-25 17:36:56 -07:00
Sam	4b56aa8183	Merge pull request #1089 from budnik/minor_refactorings ... Some refactorings	2013-06-25 17:29:51 -07:00
Sam	3af12ba7d3	Merge pull request #1088 from ComputerDruid/fix-ipv6 ... Fix ipv6 addresses in the database	2013-06-25 17:25:48 -07:00
Sam	3d75e69bd5	gem update	2013-06-26 10:04:41 +10:00
Dan Johnson	98f926f193	remove unneeded has_ip_address gem	2013-06-25 19:47:32 -04:00