1133 commits

Author	SHA1	Message	Date
Sam	9b33e826f2	clear flags on reply to notify moderators	2013-05-13 11:48:01 +10:00
Sam	a27046bacd	fix cache hole	2013-05-13 11:09:03 +10:00
Sam	d68e3f7369	optimisations (cut down on category queries, cut down on expensive current_user query)	2013-05-13 11:07:22 +10:00
Sam	98d9f174ae	fix spec	2013-05-13 11:07:22 +10:00
Robin Ward	8900ba4779	Fixes staticController bug with requiring an HTML response.	2013-05-10 18:52:10 -04:00
Robin Ward	2f3dc63dd3	FIX: Oneboxes weren't being rendered	2013-05-10 18:50:05 -04:00
Robin Ward	cf01c98d81	Experimental: Interface to Move Posts to an Existing Topic	2013-05-10 14:55:51 -04:00
Régis Hanol	8ebed7a4b1	FIX: user education displays [object Object]	2013-05-10 15:15:21 +02:00
Sam	942f168ab6	UI still a tad rough, but we have a first pass of secure categories	2013-05-10 16:47:47 +10:00
Sam	5280b3a01b	more group progress, UI getting there, controller mostly done ... changed it so notify moderators goes to the moderators group allow admins to grant self moderation and revoke self moderation	2013-05-09 17:37:34 +10:00
Sam	4f328e3e45	+x on files makes no sense unless they really are executable ... rails in the script dir makes no sense, use binstubs or bundler instead	2013-05-09 17:35:15 +10:00
Sam	0f0fd281a8	group progress, never email banned users	2013-05-09 11:34:58 +10:00
Robin Ward	c1185d92eb	Trivial: Remove extra comma	2013-05-08 12:13:23 -04:00
Robin Ward	0d8c962fdf	Fix: Multi-Select should close when an operation succeeds. A little refactoring, too.	2013-05-08 12:04:10 -04:00
Robin Ward	4e16badeae	Merge pull request #833 from kubabrecka/admin_api_l10n ... Localize admin API section	2013-05-08 07:39:02 -07:00
Neil Lalonde	f35a44aeae	Add ability for admins and mods to send another activation email to a user, to activate an account, and deactivate an account	2013-05-08 10:10:47 -04:00
Kuba Brecka	05bc63b102	Localize admin API section	2013-05-08 09:13:10 +02:00
Sam	6b536dcde5	work in progress ... groups	2013-05-08 15:20:38 +10:00
Sam	7571152d1d	fix issue adding users to groups	2013-05-08 10:32:29 +10:00
Robin Ward	6843ba7ed6	Fix regression: default to JSON type on GET requests.	2013-05-07 17:17:21 -04:00
Neil Lalonde	52ee1928cc	Oops, I made a spec fail by refactoring after I made the test pass and didn't check the tests	2013-05-07 15:40:18 -04:00
Neil Lalonde	8e24a608b0	Show empty categories on categories page to people people who can edit and delete categories	2013-05-07 15:31:56 -04:00
Robin Ward	bd99d5a40c	Calls to Discourse.ajax no longer need getURL -- will be done automatically.	2013-05-07 15:16:27 -04:00
Robin Ward	0b4fc5d81c	Deprecate success and error in Discourse.ajax	2013-05-07 11:25:21 -04:00
Robin Ward	6cbcd6e4a6	The last of the callback style AJAX have been converted to promises.	2013-05-07 10:58:41 -04:00
Robin Ward	dfd423a188	Thanks JSHINT!	2013-05-07 10:33:04 -04:00
Robin Ward	be191a95da	More promises instead of callbacks.	2013-05-07 10:27:12 -04:00
Robin Ward	4200f4107b	Merge branch 'master' of github.com:discourse/discourse	2013-05-07 10:27:09 -04:00
Régis Hanol	4606cb4f3b	FIX: hide/show preview in composer preference is saved in local storage	2013-05-07 12:34:47 +02:00
Sam	20493106cd	fix post trashing	2013-05-07 17:56:56 +10:00
Sam	a232e77fa8	whitspace	2013-05-07 17:33:04 +10:00
Jeff Atwood	3bfd3c9723	Merge pull request #825 from ZogStriP/do-not-show-clic-count-in-category-tag ... do not show the clic count in category tag	2013-05-06 21:56:04 -07:00
Sam	e9fc272db7	remove acts_as_paranoid, use .trash! , .recover! and .with_deleted as needed ... makes upgrading to rails 4 possible	2013-05-07 14:39:01 +10:00
Robin Ward	397553e29c	More promises instead of callbacks.	2013-05-06 14:44:19 -04:00
Robin Ward	a71a15913c	Site Customization saving should use a promise instead of success callback.	2013-05-06 14:20:20 -04:00
Régis Hanol	53a430be9d	do not show the clic count in category tag	2013-05-06 19:40:39 +02:00
Neil Lalonde	e70526d851	Fix links to user pages on dashboard	2013-05-06 12:15:25 -04:00
Neil Lalonde	69be7d0ad1	Change the title Visits to Clicks in referral tables on admin dashboard	2013-05-06 11:56:35 -04:00
Neil Lalonde	b944157d88	Fix edit uncategorized when on the /category/uncategorized page	2013-05-06 11:22:58 -04:00
Sam	be1ab8b275	automatic group infrustructure	2013-05-06 14:49:56 +10:00
Sam	9b1263bb3e	Merge pull request #817 from ZogStriP/prevent-duplicates-actions-on-a-post ... prevent duplicate actions on a post	2013-05-05 17:50:53 -07:00
Régis Hanol	4470c05457	prepend the username in the participant alt-text in the topic list	2013-05-06 01:00:44 +02:00
Régis Hanol	392b9696f4	prevent duplicate actions on a post	2013-05-04 02:52:45 +02:00
Neil Lalonde	5b33992604	Fix a case when editing uncategorized all the hidden form controls become visible	2013-05-03 18:58:07 -04:00
Neil Lalonde	52942d2de6	Merge pull request #813 from slainer68/ga_domain_name ... Google Analytics Domain name site setting	2013-05-03 14:57:01 -07:00
Neil Lalonde	c6370a3479	Add ability to edit the uncategorized category name, color, and text_color in a modal	2013-05-03 17:55:04 -04:00
slainer68	ac66f25043	Google Analytics Domain name site setting	2013-05-03 21:58:10 +02:00
Neil Lalonde	16bc215c68	Make enter key work to submit the signup form	2013-05-03 12:33:08 -04:00
Neil Lalonde	3c322e6d3d	Reply button at bottom of topic doesn't ask you to abandon your post when you click it more than once	2013-05-03 12:13:34 -04:00
Sam	42494b5bb1	we can't trust CSRF for anon the way it is designed. ... The page they have loaded may be cached we need a different way of delivering the CSRF potentially	2013-05-03 16:43:11 +10:00