130 Commits (4818ec377e55f28c6b03bad9e4033e6047794c15)

Author SHA1 Message Date
Barış Soner Uşaklı 7df57ba7a7 remove dupe code 7 years ago
Barış Soner Uşaklı b0dad9bd7f closes #6369 7 years ago
Barış Soner Uşaklı 7a1888dfbf closes #6514 7 years ago
Julian Lam 71c8a78748 updated properties to match other similar calls
re: #6501
7 years ago
Julian Lam 5eeec6f470 closes #6501 7 years ago
Julian Lam a367b698e3 a bit more integration for #6463 7 years ago
Julian Lam 1ce448f2a1 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Baris Usakli e99d4a5c61 closes #6313 7 years ago
Julian Lam f37b9d786d Merge remote-tracking branch 'origin/master' into develop 7 years ago
Baris Usakli 48cff9bfcb fix chat message subject 7 years ago
Julian Lam d1ccd78ac2 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Barış Soner Uşaklı d2ffdbda7d closes #6203 7 years ago
Julian Lam 82a95a03be Chat message soft deletion -- closes #6181
Squashed commit of the following:

commit f84c06bdcc45f24ef7ffde6a8f33b48d8f97fc36
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Dec 18 14:42:47 2017 -0500

    added restore handler for chat messages

commit 725cd370c6ea1e8f4a28298350f3dc024d4e668e
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Dec 18 14:23:52 2017 -0500

    backend logic and testing complete for deletion and restoration of chat messages

commit 072da758319cc93fa4c6f8bc0d672a1b716dc06e
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Dec 18 13:52:35 2017 -0500

    changing message delete logic to not remove mids, but to filter when retrieving

commit 68bf373305ab82737658a7c31dc5549af4d6d69f
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Dec 18 12:37:58 2017 -0500

    logic to handle deletion of a deleted chat message -- added some failing tests

commit 6899d0d234fa752e227188aa69cfcabd0d0500cc
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Dec 18 11:35:36 2017 -0500

    chat message deletion logic
7 years ago
Julian Lam 541aa7fbc6 closes #6177 7 years ago
Barış Soner Uşaklı 99eb1d1785 closes #6163 7 years ago
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
7 years ago
Peter Jaszkowiak 46fafb20b9 Remove string.js dependency 7 years ago
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
8 years ago
Barış Soner Uşaklı a46db9616c fix message delete and add test 8 years ago
Barış Soner Uşaklı 1875764aca fix typo in delete 8 years ago
Julian Lam d9ace1723c removed references to libs that aren't used 8 years ago
Julian Lam a2627d2066 added default payload to emails, and adding nodebb logo for email header 8 years ago
Barış Soner Uşaklı 9af252b899 notifications tests 8 years ago
Barış Soner Uşaklı 59387540c7 style 8 years ago
Peter Jaszkowiak 932ae4e86d Merge branch 'master' into notif-abort 8 years ago
Peter Jaszkowiak 4b87324234 Quick fix 8 years ago
Peter Jaszkowiak 033ce02e7b Rename hooks
Add `static:messaging.canMessageRoom` as well
8 years ago
Peter Jaszkowiak 42e21d5aa9 Add more messaging hooks 8 years ago
barisusakli b45111d44b show max message length in error message 8 years ago
Julian Lam d18cfced96 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Peter Jaszkowiak 1ed571189c Make utils and translator easier to require
Move utils.walk to file.walk, backwards compatible
8 years ago
barisusakli 5a2ff8ed0a closes #5527 8 years ago
barisusakli 6f49509645 fix newSet on redis 8 years ago
Peter Jaszkowiak dd2b930824 Resolve merge conflicts, minify only `.js` files 8 years ago
barisusakli 5c01c7b1c7 delayed notification test 8 years ago
Peter Jaszkowiak 93f38d4f30 ESlint no-multi-assign
and max-nested-callbacks, no-mixed-requires, max-statements-per-line
8 years ago
Peter Jaszkowiak 57f89663aa ESlint radix 8 years ago
Peter Jaszkowiak 896c8c7343 ESlint object-curly-spacing 8 years ago
Peter Jaszkowiak 3b0dd2d1ef ESlint padded-blocks 8 years ago
Peter Jaszkowiak feb8405f95 ESlint eol-last 8 years ago
Peter Jaszkowiak b09b3aef7f ESlint no-undef, remove global comments 8 years ago
Peter Jaszkowiak bc1d70c126 ESlint comma-dangle 8 years ago
barisusakli ba1889f441 messaging refactor 8 years ago
barisusakli dada858565 add canReply to messages 8 years ago
Julian Lam 02998669c3 introducing option to disable chat message editing/deletion 8 years ago
barisusakli f0f3a86908 closes #5128
write more messaging tests
8 years ago
barisusakli 235fe9efe3 fix chat modal title 8 years ago
HeeL 4a3c31b2dc Fix space-before-function-paren linter rule 8 years ago
barisusakli eb174739ee closes #5101 8 years ago
barisusakli fe50c8d124 closes #5078 9 years ago
barisusakli abd99760e5 closes #5070 9 years ago
barisusakli 07fe5057e1 make sure validator.escape() receives strings only 9 years ago
barisusakli 276031cd6f closes #4585, closes https://github.com/NodeBB/nodebb-theme-persona/issues/299 9 years ago
barisusakli b70610703a fix crash in notifs 9 years ago
barisusakli 1c0ef00836 closes #4886 9 years ago
Paul Westerdale 05a55c7d65 add roomId to messaging filter (#4596) 9 years ago
pichalite e23377580d fixes #4506 9 years ago
barisusakli 05cc3fe4ef closes #4335 9 years ago
barisusakli a67f3d2a15 closes #4299 9 years ago
Barış Soner Uşaklı 46c3e5c126 chat notif/unread fix 9 years ago
barisusakli 18013c5518 closes #3977 9 years ago
barisusakli f91afb5b99 closes #4030 9 years ago
barisusakli 29e87ac984 fix initial room creation 9 years ago
barisusakli df605babff closes #3983 9 years ago
barisusakli abed319da2 closes #3996 9 years ago
barisusakli 0887105046 created chat:room hashes, save owner uid in hash, update chat uids when they message 9 years ago
barisusakli dff3d7f20e various group chat fixes #3980
fix multiple modals using the same tagsinput
fix online user getting chat notification
fix owner not being able to remove users in the chat modal
9 years ago
Barış Soner Uşaklı f4e502c793 simpler isNewSet 9 years ago
barisusakli 002e931a9c rev 9 years ago
barisusakli 832a20e59e markRead fixes 9 years ago
barisusakli 1bd9b364e4 fix notifs, dont send to self, fix notification path to roomId 9 years ago
barisusakli d8810ceae9 send messages 9 years ago
barisusakli 784ff07907 ability to add/remove users from chat rooms, tagsinput 9 years ago
barisusakli 8fab270852 leaveRoom method, small fixes 9 years ago
barisusakli f8a6666e1a chat notify changes 9 years ago
barisusakli c5d2f61b01 more fixes 9 years ago
barisusakli 6b12bd2328 update messaging.editMessage 9 years ago
barisusakli 5d1169e686 changed the chat route to /chats/:roomid? 9 years ago
barisusakli 58d05f7c79 recent chat list with rooms 9 years ago
barisusakli e2e547db45 first part of messaging refactor 9 years ago