12220 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
psychobunny	66b6e12aa3	added grunt deps	2015-01-30 12:21:00 -05:00
Julian Lam	77a9c7c195	Merge branch 'master' into 0.7.0	2015-01-29 19:51:29 -05:00
Julian Lam	939e623547	collapsing a bunch of whitespace using async.apply, and also fixed #2672 as well	2015-01-29 19:49:32 -05:00
barisusakli	39cac43b96	if key isn't found dont error ... Conflicts: src/database/redis/main.js	2015-01-29 19:40:51 -05:00
barisusakli	f3f3ca8e50	if key isn't found dont error	2015-01-29 19:25:01 -05:00
Julian Lam	a7a4edfd37	administrators group no longer shows up in group searches	2015-01-29 19:18:18 -05:00
Julian Lam	f793536131	latest translations and fallbacks	2015-01-29 17:45:42 -05:00
barisusakli	d1a1cada19	fix typo	2015-01-29 17:12:12 -05:00
barisusakli	530bdbbd1a	dont rename if key doesn't exist	2015-01-29 17:10:49 -05:00
barisusakli	b54f2de504	pass uid to getUsers and getUsersFromSets	2015-01-29 17:02:20 -05:00
Julian Lam	f753cfb1c9	search on grop sort change too	2015-01-29 16:45:51 -05:00
Julian Lam	b052ed3504	searching on keyup instead of enter key	2015-01-29 16:42:00 -05:00
Julian Lam	6ebc048f1f	searching on keyup instead of enter key	2015-01-29 16:41:48 -05:00
psychobunny	6a2c35c263	latest t.js	2015-01-29 15:45:31 -05:00
Barış Soner Uşaklı	eb5746b2b4	Merge pull request #2589 from Schamper/bat-script ... Simple bat file for Windows. Not all options are supported, but it's a start	2015-01-29 14:19:48 -05:00
Barış Soner Uşaklı	af4a272264	Merge pull request #2636 from Schamper/fix-editorconfig ... Fix editorconfig syntax	2015-01-29 14:19:29 -05:00
barisusakli	4413c70d3c	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-29 13:42:05 -05:00
barisusakli	57453f33ab	new group members route ... getMembers can take start end ability to specify how many group members to return	2015-01-29 13:37:45 -05:00
barisusakli	e16cfa396b	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-29 12:53:01 -05:00
barisusakli	a1c8902b4e	hook fixes ... new hook, action:user.online, fix action:user.set hooks so they pass in uid check err before firing hooks	2015-01-29 12:52:30 -05:00
Julian Lam	8bc2d97352	stringify helper for t.js	2015-01-29 10:08:53 -05:00
barisusakli	aaa1fae558	closes #2597	2015-01-29 01:06:48 -05:00
barisusakli	4d6a6f64b0	slug is lowercase	2015-01-28 23:43:08 -05:00
barisusakli	f9fecf4bc1	faster sort users	2015-01-28 19:19:55 -05:00
barisusakli	60fecdbdf8	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-28 19:08:19 -05:00
barisusakli	0fab6c243c	increase rate limit timeframe from 1 second to 10 seconds	2015-01-28 19:07:44 -05:00
barisusakli	c87c99eadd	dont check admin emits against flooding	2015-01-28 17:08:41 -05:00
barisusakli	ed714cdf77	user search paginator	2015-01-28 15:08:33 -05:00
barisusakli	98ff75b9c3	closes #2581	2015-01-28 13:46:11 -05:00
Julian Lam	aabfeba38d	Merge branch 'master' into 0.7.0 ... Conflicts: src/user.js	2015-01-28 13:39:21 -05:00
Julian Lam	63eeee4394	fixed issue where hitting enter while searching for groups would cause the page to reload.	2015-01-28 13:38:08 -05:00
barisusakli	9db7f0f9a0	doing on master as well	2015-01-28 10:30:18 -05:00
psychobunny	5a3c056759	removing li specific selector	2015-01-27 23:50:10 -05:00
psychobunny	370a60c14f	potential bug @barisusakli I think you changed this, just pinging you in case	2015-01-27 23:50:01 -05:00
psychobunny	d47cd270df	some random favourite typo	2015-01-27 23:37:47 -05:00
barisusakli	0dc0c39f48	removed li selector	2015-01-27 19:58:17 -05:00
barisusakli	ab69477b24	moved filter:user,get to central function	2015-01-27 17:37:21 -05:00
psychobunny	c06132e779	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-27 17:13:43 -05:00
psychobunny	f253b11d71	passed in wrong object	2015-01-27 17:09:45 -05:00
psychobunny	0828caab32	renamed to filter:userlist.get	2015-01-27 16:51:48 -05:00
psychobunny	943e268ffc	add filter:users.get	2015-01-27 16:39:33 -05:00
barisusakli	ddee93beab	Merge remote-tracking branch 'origin/master' into 0.7.0	2015-01-27 16:20:20 -05:00
barisusakli	27518716a0	make getUsers public for plugins	2015-01-27 16:04:02 -05:00
Julian Lam	a3cadff1d3	updated settings module (v2) to fix multiple selects and checkboxes using name instead of id, which isn't always guaranteed to be set.	2015-01-27 14:47:39 -05:00
Julian Lam	d096a639d6	fixed #2657 -- there's a slight chance this might break other ACP pages, but my limited testing tells me it is ok so far	2015-01-27 13:14:07 -05:00
Julian Lam	891731ca52	enabled saving of sendPostNotification setting	2015-01-27 11:42:03 -05:00
Julian Lam	08e39d150e	fixed #2655	2015-01-27 11:19:36 -05:00
Julian Lam	06238f6894	partial fix to #2655	2015-01-27 11:12:19 -05:00
barisusakli	c33b369858	closes #2658	2015-01-27 10:36:35 -05:00
psychobunny	72e14e6db6	closes #2653	2015-01-27 04:39:00 -05:00