Commit Graph

647 Commits

Author SHA1 Message Date
Julian Lam
bc6364f4c0 fixed #6082 2017-11-17 12:00:43 -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
Barış Soner Uşaklı
b6211fdc04 closes #6053 2017-11-10 10:20:47 -05:00
Barış Soner Uşaklı
6c755869cd add back missing onSettingsLoaded 2017-11-09 14:24:47 -05:00
Baris Usakli
eeedba697b closes #5804 2017-11-08 14:06:52 -05:00
acardinale
5ed6b5c414 Add User (uid) Welcome Notification (#6045) 2017-11-07 09:17:27 -05:00
Julian Lam
7e0d0e0eb5 Merge remote-tracking branch 'origin/develop' 2017-11-02 14:13:48 -04:00
Peter Jaszkowiak
e609e497b3 Provide more error information to logs
Provides full stack instead of just message
2017-11-01 18:59:48 -06:00
Barış Soner Uşaklı
18f4f27fe0 closes #6024 2017-10-31 18:03:54 -04:00
Barış Soner Uşaklı
6b1af76f08 closes #6015 2017-10-31 09:43:11 -04:00
Peter Jaszkowiak
62ae171432 Merge remote-tracking branch 'origin/master' into develop 2017-10-23 17:13:35 -06:00
Barış Soner Uşaklı
e7318a1cea Mongo cache (#6002)
* cache mongodb objects

remove user settings cache since it is cached at the object level

* removed indexOf from isMemberOfSets

* change has to get, change maxAge to 0
2017-10-23 18:31:16 -04:00
Peter Jaszkowiak
46fafb20b9 Remove string.js dependency 2017-10-13 21:02:41 -06:00
Baris Usakli
68bcfb2883 closes #5975 2017-10-12 13:54:53 -04:00
Baris Usakli
500c978a26 closes #5944 2017-10-12 13:03:43 -04:00
Peter Jaszkowiak
da9da8190f Bump dependencies
Bumping eslint & configs meant making some linting fixes

For future reference, the `xmlhttprequest-ssl` library must be of equal versioning to the one in `engine.io-client`, otherwise it won't be deduped which causes the socket.io tests to fail
2017-10-02 09:24:27 -04:00
Barış Soner Uşaklı
ff88be91fa Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-18 20:09:40 -04:00
Barış Soner Uşaklı
5dfb2fb83a up themes, fix notif test 2017-08-18 19:00:48 -04:00
Julian Lam
c1d7b06ded Fixes #5873
- Notifications.getMultiple now takes an optional uid parameter
- If a notification link in dropdown points to a topic and you're
  in said topic, you will be scrolled to the post instead of
  ajaxified to it.
2017-08-18 16:30:54 -04:00
Baris Usakli
dc9b21021a escape moderation notes 2017-08-18 11:23:20 -04:00
Baris Usakli
753f1576ce processSortedSet 2017-08-16 16:47:52 -04:00
Baris Usakli
bc0645dc26 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-16 15:17:26 -04:00
Julian Lam
f56578ab50 remove reset tokens if target user email changes 2017-08-16 14:37:00 -04:00
Baris Usakli
bc6b1a8f56 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	public/src/admin/extend/plugins.js
2017-08-11 11:33:06 -04:00
Baris Usakli
24bbf8fe00 closes #5869 2017-08-10 16:49:16 -04:00
Baris Usakli
9dc0069ce7 closes #5845 2017-08-01 14:09:55 -04:00
Baris Usakli
875672522e Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	src/search.js
2017-07-28 14:19:09 -04:00
Barış Soner Uşaklı
7a405da60f group member search change 2017-07-28 00:55:02 -04:00
Baris Usakli
6cd0582b42 add filter:user.saveSettings 2017-07-26 16:30:08 -04:00
Baris Usakli
949595fdf3 fix eslint 2017-07-26 13:40:17 -04:00
Baris Usakli
541b78c26d fix ipMatch data 2017-07-26 13:39:34 -04:00
Julian Lam
4c0135e188 fixed missing payload items in invitation email 2017-07-14 15:50:59 -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
Baris Usakli
fbddb665b0 make tests pass 2017-07-06 16:07:58 -04:00
Julian Lam
e309ac5040 fixes #5790 2017-07-06 15:42:40 -04:00
psychobunny
0d60b17be1 use direct db call to get rss_token instead 2017-07-05 11:41:23 -04:00
psychobunny
d44090ba18 Merge remote-tracking branch 'refs/remotes/origin/private-feeds' 2017-07-04 23:54:08 -04:00
psychobunny
dd1cfd62d4 don't show rss_token in /api/user/name 2017-07-04 23:46:49 -04:00
Barış Soner Uşaklı
38af651072 use _.uniq 2017-06-25 20:00:05 -04:00
Barış Soner Uşaklı
3d85992757 modify db.processSortedSet so it works with intervals 2017-06-23 18:18:34 -04:00
Julian Lam
3cc528dc02 linting 2017-06-23 13:08:19 -04:00
Julian Lam
2e1528942c fixed #5770 2017-06-23 12:41:40 -04:00
Julian Lam
eb9f6145d9 fixes #5770 2017-06-23 11:03:54 -04:00
Baris Usakli
ef9e656f34 closes #5740
added token to topic page as well
check privilege even if token is provided
tests
2017-06-22 12:44:37 -04:00
psychobunny
228e9ab8e3 proof of concept for #5740 2017-06-20 16:12:55 -04:00
Barış Soner Uşaklı
5a55c882ab convert NaN uids to 0 2017-06-01 16:17:08 -04:00
Barış Soner Uşaklı
92376a1589 fix calls 2017-05-31 13:13:16 -04:00
Baris Usakli
ba9397987a if no email dont send 2017-05-30 14:27:03 -04:00
Julian Lam
d2b5b53cb4 refactor for sendValidationEmail, and sending better dummy data for welcome email template 2017-05-30 13:09:30 -04:00
Julian Lam
313d48b47d updated emailer code so digest emails when tested in ACP are sent with real data instead of incomplete fake data 2017-05-30 12:11:44 -04:00