2265 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Kuba Brecka	09221bb72e	max_upload_size_kb is in "kB" not "kb"	2013-05-08 08:43:47 +02:00
Kuba Brecka	0f4b443317	cs translation update	2013-05-08 08:37:34 +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
Sam	b26057292e	change md route to raw	2013-05-08 10:26:55 +10:00
Robin Ward	6843ba7ed6	Fix regression: default to JSON type on GET requests.	2013-05-07 17:17:21 -04:00
Neil Lalonde	f9a82f3aa0	Add a spec for category list with empty category	2013-05-07 15:52:45 -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
Sam	2a98e8773f	Merge pull request #828 from ZogStriP/hide-show-preview-in-composer-preference-is-saved-in-local-storage ... FIX: hide/show preview in composer preference is saved in local storage	2013-05-07 03:49:39 -07: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	71728b3adb	oops	2013-05-07 18:02:56 +10: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
Sam	68e6405aca	redis rack cache was crazy, it was just storing stuff in redis FOREVER, added a PR to fix, forked to my repo, sourcing a sane version	2013-05-07 17:33:04 +10:00
Jeff Atwood	a64e04ca42	Merge pull request #826 from sanderdatema/dutch_translation ... Dutch translation updated	2013-05-06 21:56:34 -07: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	381c42724f	comments	2013-05-07 14:50:02 +10:00
Sam	066c2bed42	better comments	2013-05-07 14:46:46 +10: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
Sander Datema	1b1cd0973d	Dutch translation updated ... Updated til commit e70526d851	2013-05-06 19:44:44 +02: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	b0945599b7	enter will either run all specs or tell you which failed	2013-05-06 15:16:53 +10:00
Sam	be1ab8b275	automatic group infrustructure	2013-05-06 14:49:56 +10:00
Sam	93e9bcc7eb	add a few ignores	2013-05-06 10:54:34 +10:00
Sam	d4a0d4f5dd	Merge pull request #814 from ZogStriP/keep-reloaders-happy ... prevent warning message about already defined constants	2013-05-05 17:52:22 -07:00
Sam	ca17312682	Merge pull request #815 from juanpastas/patch-1 ... Update TROUBLESHOOTING.md	2013-05-05 17:51:51 -07:00
Sam	872866744f	Merge pull request #812 from goodbrews/capistrano-samples ... Link to helpful article on Capistrano deployment	2013-05-05 17:51:17 -07: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
Sam	bb7a2da224	update psuedo locale	2013-05-06 10:48:30 +10:00
Sam	57950a9d2f	Merge branch 'master' of github.com:discourse/discourse	2013-05-06 10:47:16 +10:00
Sam	b3769b1bba	am serializer update	2013-05-06 10:46:58 +10:00
Sam	63435d9bdd	Merge pull request #819 from kubabrecka/cs_update42 ... cs translation update	2013-05-05 16:51:52 -07:00
Sam	8d42bf536b	Merge pull request #820 from ZogStriP/keep-french-l10n-up-to-date-2013-05-04 ... keep French l10n up to date [ci-skip]	2013-05-05 16:51:30 -07:00
Sam	caa3cae535	remove pointless to_sym	2013-05-06 09:51:09 +10:00
Sam	f9ea5ab20b	Merge pull request #821 from piglop/define-method-fix ... Fix for Debian Ruby 1.9	2013-05-05 16:45:30 -07:00
Sam	8d1687d9d5	Merge pull request #822 from ZogStriP/prepend-the-username-in-participants-title ... prepend the username in the participant alt-text in the topic list	2013-05-05 16:44:35 -07:00