66 Commits

Author	SHA1	Message	Date
Barış Soner Uşaklı	99eb1d1785	closes #6163	2017-12-11 10:53:29 -05:00
Barış Soner Uşaklı	dd176dd5f2	Notification delivery (#6072) ... * ability for users to choose how they receive notifications add type field to more notifications, the type field is used to determine what to do based on user setting(none,notification,email,notificationemail) * change var name to types * cleanup * add event types for privileged users * remove unused language keys * fix uids check * changed if statements * upgrade script to preserver old settings	2017-11-15 21:35:10 -05:00
Peter Jaszkowiak	46fafb20b9	Remove string.js dependency	2017-10-13 21:02:41 -06:00
Barış Soner Uşaklı	5cc39e8546	Merge remote-tracking branch 'refs/remotes/origin/master' into develop ... # Conflicts: # package.json # src/views/admin/manage/ip-blacklist.tpl	2017-08-24 19:29:15 -04:00
Barış Soner Uşaklı	a46db9616c	fix message delete and add test	2017-08-21 16:48:18 -04:00
Barış Soner Uşaklı	1875764aca	fix typo in delete	2017-08-21 16:39:24 -04:00
Julian Lam	d9ace1723c	removed references to libs that aren't used	2017-07-17 12:40:50 -04:00
Julian Lam	a2627d2066	added default payload to emails, and adding nodebb logo for email header	2017-07-13 11:30:44 -04:00
Barış Soner Uşaklı	9af252b899	notifications tests	2017-05-20 21:01:55 -04:00
Barış Soner Uşaklı	59387540c7	style	2017-05-20 20:26:54 -04:00
Peter Jaszkowiak	932ae4e86d	Merge branch 'master' into notif-abort	2017-05-09 11:31:58 -06:00
Peter Jaszkowiak	4b87324234	Quick fix	2017-04-26 16:02:15 -06:00
Peter Jaszkowiak	033ce02e7b	Rename hooks ... Add `static:messaging.canMessageRoom` as well	2017-04-26 15:22:17 -06:00
Peter Jaszkowiak	42e21d5aa9	Add more messaging hooks	2017-04-26 10:45:40 -06:00
barisusakli	b45111d44b	show max message length in error message	2017-04-19 20:56:12 -04:00
Julian Lam	d18cfced96	Merge remote-tracking branch 'origin/master' into develop	2017-04-12 23:57:14 -04: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
barisusakli	5a2ff8ed0a	closes #5527	2017-03-14 23:03:09 +03:00
barisusakli	6f49509645	fix newSet on redis	2017-03-08 15:09:58 +03:00
Peter Jaszkowiak	dd2b930824	Resolve merge conflicts, minify only .js files	2017-02-23 18:31:49 -07:00
barisusakli	5c01c7b1c7	delayed notification test	2017-02-22 13:35:05 +03: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	57f89663aa	ESlint radix	2017-02-18 14:29:52 -07:00
Peter Jaszkowiak	896c8c7343	ESlint object-curly-spacing	2017-02-18 12:30:49 -07:00
Peter Jaszkowiak	3b0dd2d1ef	ESlint padded-blocks	2017-02-18 02:32:24 -07:00
Peter Jaszkowiak	feb8405f95	ESlint eol-last	2017-02-18 02:30:48 -07:00
Peter Jaszkowiak	b09b3aef7f	ESlint no-undef, remove global comments	2017-02-17 22:03:55 -07:00
Peter Jaszkowiak	bc1d70c126	ESlint comma-dangle	2017-02-17 19:31:21 -07:00
barisusakli	ba1889f441	messaging refactor	2017-01-03 20:02:24 +03:00
barisusakli	dada858565	add canReply to messages	2016-11-18 17:35:10 +03:00
Julian Lam	02998669c3	introducing option to disable chat message editing/deletion	2016-10-21 14:36:38 -04:00
barisusakli	f0f3a86908	closes #5128 ... write more messaging tests	2016-10-18 20:45:31 +03:00
barisusakli	235fe9efe3	fix chat modal title	2016-10-14 13:22:30 +03:00
HeeL	4a3c31b2dc	Fix space-before-function-paren linter rule	2016-10-13 11:43:39 +02:00
barisusakli	eb174739ee	closes #5101	2016-10-12 11:53:25 +03:00
barisusakli	fe50c8d124	closes #5078	2016-10-03 20:35:36 +03:00
barisusakli	abd99760e5	closes #5070	2016-09-30 13:19:55 +03:00
barisusakli	07fe5057e1	make sure validator.escape() receives strings only	2016-08-27 15:45:15 +03:00
barisusakli	276031cd6f	closes #4585, closes https://github.com/NodeBB/nodebb-theme-persona/issues/299	2016-08-25 16:05:07 +03:00
barisusakli	b70610703a	fix crash in notifs	2016-07-30 10:25:40 +03:00
barisusakli	1c0ef00836	closes #4886	2016-07-25 14:37:03 +03:00
Paul Westerdale	05a55c7d65	add roomId to messaging filter (#4596)	2016-05-04 09:54:51 -04:00
pichalite	e23377580d	fixes #4506	2016-04-08 23:55:10 +00:00
barisusakli	05cc3fe4ef	closes #4335	2016-03-11 13:38:52 +02:00
barisusakli	a67f3d2a15	closes #4299	2016-03-03 13:51:42 +02:00
Barış Soner Uşaklı	46c3e5c126	chat notif/unread fix	2016-01-19 12:02:51 +02:00
barisusakli	18013c5518	closes #3977	2016-01-08 12:34:22 +02:00
barisusakli	f91afb5b99	closes #4030	2016-01-07 17:18:45 +02:00
barisusakli	29e87ac984	fix initial room creation	2015-12-26 08:41:03 +02:00
barisusakli	df605babff	closes #3983	2015-12-23 12:28:19 +02:00