578 Commits

Author	SHA1	Message	Date
Barış Soner Uşaklı	db532fbb0d	fix user settings cache	2017-05-08 21:23:30 -04:00
Barış Soner Uşaklı	3a1eba2537	merge	2017-05-08 13:49:35 -04:00
psychobunny	2a405ad439	fixed permaban on redis	2017-05-05 20:11:18 -04:00
psychobunny	41b4ef859f	add ban messaging when logged in	2017-05-05 19:50:50 -04:00
Barış Soner Uşaklı	9ebbd65544	up user settings cache size	2017-05-03 17:24:31 -04:00
Barış Soner Uşaklı	e7d076a084	closes #5634	2017-05-03 16:36:34 -04:00
Barış Soner Uşaklı	114f416ec0	remove dupe code	2017-05-03 15:30:46 -04:00
Barış Soner Uşaklı	da24e342f2	limit sessions displayed to 20	2017-04-30 15:11:51 -04:00
Barış Soner Uşaklı	c45c4a5fdb	on login display invalid-login-credentials	2017-04-24 13:31:38 -04:00
barisusakli	33e8ecc1f4	closes #5404	2017-04-22 19:07:57 -04:00
Julian Lam	d18cfced96	Merge remote-tracking branch 'origin/master' into develop	2017-04-12 23:57:14 -04:00
Peter Jaszkowiak	484a800327	Merge branch master into develop	2017-04-12 21:11:39 -06:00
Peter Jaszkowiak	1ed571189c	Make utils and translator easier to require ... Move utils.walk to file.walk, backwards compatible	2017-04-08 20:27:52 -06:00
Barış Soner Uşaklı	d88219b4d1	closes #5566	2017-04-03 06:35:20 -04:00
Julian Lam	7afe8a32f6	Merge branch 'master' into develop	2017-03-29 15:26:49 -04:00
Julian Lam	55f07d3301	fixed flags list in account info page	2017-03-29 12:44:40 -04:00
husseinwalli	3876a88252	Added additional parameters to user creation method (#5496) ... Treating picture, location and birthday similar to data.email as optional parameters to be passed to the create a user	2017-03-27 14:05:06 -04:00
Peter Jaszkowiak	14ed0be4f7	Remove duplicate slugify	2017-03-24 14:43:58 -06:00
Julian Lam	b649eb95f8	Merge remote-tracking branch 'origin/master' into develop	2017-03-24 14:37:39 -04:00
Peter Jaszkowiak	a7677063de	Rename to uniqueUsername	2017-03-24 10:33:38 -06:00
Peter Jaszkowiak	642306e69c	Fix #5543	2017-03-24 10:28:18 -06:00
Barış Soner Uşaklı	fe27d40ff6	closes #5542	2017-03-23 10:58:28 +03:00
Julian Lam	7f8f197e60	Merge branch 'master' into develop	2017-03-16 14:58:39 -04:00
Julian Lam	2ef71e22aa	Merge pull request #5532 from NodeBB/patch_5491 ... Fix tests for #5491 fix	2017-03-15 23:11:09 -04:00
Peter Jaszkowiak	8f8babf90b	Fix tests	2017-03-15 20:09:07 -07:00
Julian Lam	23d4497c73	Merge pull request #5531 from NodeBB/patch_5491 ... Fix #5491	2017-03-15 23:01:42 -04:00
Peter Jaszkowiak	8c45411ccc	Fix #5491	2017-03-15 20:00:05 -07:00
Julian Lam	1ebbbdd3f9	Merge remote-tracking branch 'origin/master' into develop	2017-03-15 10:01:00 -04:00
barisusakli	6a4b082080	closes #5524	2017-03-15 12:19:09 +03:00
barisusakli	cb92ebb3be	fix call	2017-03-14 23:29:26 +03:00
barisusakli	5a2ff8ed0a	closes #5527	2017-03-14 23:03:09 +03:00
barisusakli	0478e9c98c	lint	2017-03-11 19:37:34 +03:00
barisusakli	37be43a3c5	async	2017-03-11 18:32:00 +03:00
barisusakli	27b030a71c	test for #5523	2017-03-11 16:43:31 +03:00
Julian Lam	f0d9bddd56	fix merge conflict artifact that was left in	2017-03-06 09:58:02 -05:00
Julian Lam	af2d9fb85b	Merge branch 'master' into develop	2017-03-06 09:51:11 -05:00
barisusakli	531df7bd09	closes #5504	2017-03-06 13:54:43 +03:00
barisusakli	e85e35cf0c	closes #5497	2017-03-05 00:46:18 +03:00
barisusakli	b060bda8a0	some more refactors	2017-03-02 17:25:32 +03:00
barisusakli	b1b87d339f	more refactors	2017-03-02 16:11:11 +03:00
Julian Lam	6e7b505ea7	more linting	2017-02-24 12:55:31 -05:00
Julian Lam	ddea9f534e	running eslint again	2017-02-24 12:47:46 -05:00
Julian Lam	72e77772db	Merge branch 'master' into develop	2017-02-24 12:46:40 -05:00
Peter Jaszkowiak	dd2b930824	Resolve merge conflicts, minify only .js files	2017-02-23 18:31:49 -07:00
Julian Lam	62e0f5f883	Merge remote-tracking branch 'origin/master' into develop	2017-02-21 11:21:51 -05:00
barisusakli	799f688503	closes #5463 , invitation tests	2017-02-21 15:08:17 +03:00
barisusakli	ef90702049	closes #5459	2017-02-20 21:28:02 +03:00
Peter Jaszkowiak	23540afaeb	Resolve merge conflicts	2017-02-18 19:14:39 -07:00
Peter Jaszkowiak	93f38d4f30	ESlint no-multi-assign ... and max-nested-callbacks, no-mixed-requires, max-statements-per-line	2017-02-18 18:06:28 -07:00
Peter Jaszkowiak	4bb49a7171	ESlint no-unused-vars	2017-02-18 15:05:36 -07:00