746 Commits (f96208a0c80a65ec498a8f802acc1abffe7029e0)

Author SHA1 Message Date
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
Barış Soner Uşaklı b6211fdc04
closes #6053 7 years ago
Barış Soner Uşaklı 6c755869cd
add back missing onSettingsLoaded 7 years ago
Baris Usakli eeedba697b closes #5804 7 years ago
acardinale 5ed6b5c414 Add User (uid) Welcome Notification (#6045) 7 years ago
Julian Lam 7e0d0e0eb5 Merge remote-tracking branch 'origin/develop' 7 years ago
Peter Jaszkowiak e609e497b3 Provide more error information to logs
Provides full stack instead of just message
7 years ago
Barış Soner Uşaklı 18f4f27fe0 closes #6024 7 years ago
Barış Soner Uşaklı 6b1af76f08 closes #6015 7 years ago
Peter Jaszkowiak 62ae171432 Merge remote-tracking branch 'origin/master' into develop 7 years ago
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
7 years ago
Peter Jaszkowiak 46fafb20b9 Remove string.js dependency 7 years ago
Baris Usakli 68bcfb2883 closes #5975 7 years ago
Baris Usakli 500c978a26 closes #5944 7 years ago
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
8 years ago
Barış Soner Uşaklı ff88be91fa Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Barış Soner Uşaklı 5dfb2fb83a up themes, fix notif test 8 years ago
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.
8 years ago
Baris Usakli dc9b21021a escape moderation notes 8 years ago
Baris Usakli 753f1576ce processSortedSet 8 years ago
Baris Usakli bc0645dc26 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Julian Lam f56578ab50 remove reset tokens if target user email changes 8 years ago
Baris Usakli bc6b1a8f56 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	public/src/admin/extend/plugins.js
8 years ago
Baris Usakli 24bbf8fe00 closes #5869 8 years ago
Baris Usakli 9dc0069ce7 closes #5845 8 years ago
Baris Usakli 875672522e Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	src/search.js
8 years ago
Barış Soner Uşaklı 7a405da60f group member search change 8 years ago
Baris Usakli 6cd0582b42 add filter:user.saveSettings 8 years ago
Baris Usakli 949595fdf3 fix eslint 8 years ago
Baris Usakli 541b78c26d fix ipMatch data 8 years ago
Julian Lam 4c0135e188 fixed missing payload items in invitation email 8 years ago
Julian Lam a2627d2066 added default payload to emails, and adding nodebb logo for email header 8 years ago
Baris Usakli fbddb665b0 make tests pass 8 years ago
Julian Lam e309ac5040 fixes #5790 8 years ago
psychobunny 0d60b17be1 use direct db call to get rss_token instead 8 years ago
psychobunny d44090ba18 Merge remote-tracking branch 'refs/remotes/origin/private-feeds' 8 years ago
psychobunny dd1cfd62d4 don't show rss_token in /api/user/name 8 years ago
Barış Soner Uşaklı 38af651072 use _.uniq 8 years ago
Barış Soner Uşaklı 3d85992757 modify db.processSortedSet so it works with intervals 8 years ago
Julian Lam 3cc528dc02 linting 8 years ago
Julian Lam 2e1528942c fixed #5770 8 years ago
Julian Lam eb9f6145d9 fixes #5770 8 years ago
Baris Usakli ef9e656f34 closes #5740
added token to topic page as well
check privilege even if token is provided
tests
8 years ago
psychobunny 228e9ab8e3 proof of concept for #5740 8 years ago
Barış Soner Uşaklı 5a55c882ab convert NaN uids to 0 8 years ago
Barış Soner Uşaklı 92376a1589 fix calls 8 years ago
Baris Usakli ba9397987a if no email dont send 8 years ago
Julian Lam d2b5b53cb4 refactor for sendValidationEmail, and sending better dummy data for welcome email template 8 years ago
Julian Lam 313d48b47d updated emailer code so digest emails when tested in ACP are sent with real data instead of incomplete fake data 8 years ago
Barış Soner Uşaklı 59b1d8fbae Merge pull request #5710 from NodeBB/_lodash
Switch from underscore to lodash
8 years ago
Barış Soner Uşaklı 08aaabd33c closes #5642 8 years ago
Peter Jaszkowiak 3c2d4fe649 Switch from underscore to lodash 8 years ago
Barış Soner Uşaklı 890c2eff70 style changes 8 years ago
Barış Soner Uşaklı bcc566fb68 remove unnecessary checks 8 years ago
Barış Soner Uşaklı f1b8492164 remove unnecessary checks 8 years ago
Barış Soner Uşaklı f6ac92111b style changes 8 years ago
Barış Soner Uşaklı c9d502320f file.delete method 8 years ago
Barış Soner Uşaklı b29745aa44 more auth tests 8 years ago
Barış Soner Uşaklı fa5026c92e clear settings cache on all nodes on save 8 years ago
Barış Soner Uşaklı c5c755fbb0 more notification tests 8 years ago
Barış Soner Uşaklı 4b94446cd9 more user search tests 8 years ago
Barış Soner Uşaklı 95196ceedc closes #5692 8 years ago
Barış Soner Uşaklı e49f33317d digest cleanup and tests 8 years ago
Julian Lam 5f1eb70d01 fixes #5680 8 years ago
Barış Soner Uşaklı ed9a429ca9 test invalid expiry 8 years ago
Barış Soner Uşaklı 8920523e06 more tests 8 years ago
Barış Soner Uşaklı 6daeadb7e9 remove async.parallel 8 years ago
Barış Soner Uşaklı 5e4b9479d4 closes #5677 8 years ago
Barış Soner Uşaklı db532fbb0d fix user settings cache 8 years ago
Barış Soner Uşaklı 3a1eba2537 merge 8 years ago
psychobunny 2a405ad439 fixed permaban on redis 8 years ago
psychobunny 41b4ef859f add ban messaging when logged in 8 years ago
Barış Soner Uşaklı 9ebbd65544 up user settings cache size 8 years ago
Barış Soner Uşaklı e7d076a084 closes #5634 8 years ago
Barış Soner Uşaklı 114f416ec0 remove dupe code 8 years ago
Barış Soner Uşaklı da24e342f2 limit sessions displayed to 20 8 years ago
Barış Soner Uşaklı c45c4a5fdb on login display invalid-login-credentials 8 years ago
barisusakli 33e8ecc1f4 closes #5404 8 years ago
Julian Lam d18cfced96 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Peter Jaszkowiak 484a800327 Merge branch 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
Barış Soner Uşaklı d88219b4d1 closes #5566 8 years ago
Julian Lam 7afe8a32f6 Merge branch 'master' into develop 8 years ago
Julian Lam 55f07d3301 fixed flags list in account info page 8 years ago
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
8 years ago
Peter Jaszkowiak 14ed0be4f7 Remove duplicate slugify 8 years ago
Julian Lam b649eb95f8 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Peter Jaszkowiak a7677063de Rename to `uniqueUsername` 8 years ago
Peter Jaszkowiak 642306e69c Fix #5543 8 years ago
Barış Soner Uşaklı fe27d40ff6 closes #5542 8 years ago
Julian Lam 7f8f197e60 Merge branch 'master' into develop 8 years ago
Julian Lam 2ef71e22aa Merge pull request #5532 from NodeBB/patch_5491
Fix tests for #5491 fix
8 years ago
Peter Jaszkowiak 8f8babf90b Fix tests 8 years ago
Julian Lam 23d4497c73 Merge pull request #5531 from NodeBB/patch_5491
Fix #5491
8 years ago
Peter Jaszkowiak 8c45411ccc Fix #5491 8 years ago
Julian Lam 1ebbbdd3f9 Merge remote-tracking branch 'origin/master' into develop 8 years ago
barisusakli 6a4b082080 closes #5524 8 years ago
barisusakli cb92ebb3be fix call 8 years ago
barisusakli 5a2ff8ed0a closes #5527 8 years ago
barisusakli 0478e9c98c lint 8 years ago
barisusakli 37be43a3c5 async 8 years ago
barisusakli 27b030a71c test for #5523 8 years ago
Julian Lam f0d9bddd56 fix merge conflict artifact that was left in 8 years ago
Julian Lam af2d9fb85b Merge branch 'master' into develop 8 years ago
barisusakli 531df7bd09 closes #5504 8 years ago
barisusakli e85e35cf0c closes #5497 8 years ago
barisusakli b060bda8a0 some more refactors 8 years ago
barisusakli b1b87d339f more refactors 8 years ago
Julian Lam 6e7b505ea7 more linting 8 years ago
Julian Lam ddea9f534e running eslint again 8 years ago
Julian Lam 72e77772db Merge branch 'master' into develop 8 years ago
Peter Jaszkowiak dd2b930824 Resolve merge conflicts, minify only `.js` files 8 years ago
Julian Lam 62e0f5f883 Merge remote-tracking branch 'origin/master' into develop 8 years ago
barisusakli 799f688503 closes #5463 , invitation tests 8 years ago
barisusakli ef90702049 closes #5459 8 years ago
Peter Jaszkowiak 23540afaeb Resolve merge conflicts 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 4bb49a7171 ESlint no-unused-vars 8 years ago
Peter Jaszkowiak 57f89663aa ESlint radix 8 years ago
Peter Jaszkowiak c4bdb72941 ESlint no-unneeded-ternary
and no-extend-native, no-sequences
8 years ago
Peter Jaszkowiak 896c8c7343 ESlint object-curly-spacing 8 years ago
barisusakli b33d34f7cf refactor user/picture.js 8 years ago
Peter Jaszkowiak 1493afee2a ESlint indent 8 years ago
Peter Jaszkowiak 3b0dd2d1ef ESlint padded-blocks 8 years ago
Peter Jaszkowiak feb8405f95 ESlint eol-last 8 years ago
Peter Jaszkowiak a038c66549 ESlint quotes 8 years ago
Peter Jaszkowiak 604358ecc4 ESlint keyword-spacing, no-multi-spaces 8 years ago
Peter Jaszkowiak a5a3f3089a ESlint no-mixed-operators 8 years ago
Peter Jaszkowiak 2e031f3759 ESlint comma-spacing 8 years ago
Peter Jaszkowiak 277a7fb8b4 ESlint key-spacing, no-trailing-spaces 8 years ago
Peter Jaszkowiak b1b486f729 ESlint quote-props 8 years ago
Peter Jaszkowiak 3361a72725 ESlint no-plusplus
and no-empty, space-unary-ops
8 years ago
Peter Jaszkowiak 3d6bfa47c5 ESlint no-useless-return 8 years ago
Peter Jaszkowiak 2ba46808a1 ESlint one-var, fix comma-dangle 8 years ago
Peter Jaszkowiak bc1d70c126 ESlint comma-dangle 8 years ago
pichalite aacd8a2422 Fix return and tests 8 years ago
pichalite 8dab8864f6 Add extensions for cropped images 8 years ago
Julian Lam eae541d040 Merge branch 'master' into develop 8 years ago
Julian Lam 6289f118ae updated cron strings with 5-digit strings instead of 6-digit ones 8 years ago
Julian Lam 7f124a3ccf Merge branch 'master' into develop 8 years ago
Julian Lam 6b2e40a8ce promoting digest output to info, instead of verbose 8 years ago
Julian Lam 8a0a74d95e Merge remote-tracking branch 'origin/master' into develop 8 years ago
Julian Lam b5daedb7a3 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Peter Jaszkowiak bb1bfb0449 Merge branch 'master' into assets-route 8 years ago
Peter Jaszkowiak d31499a860 Fix tests rewriting `logo.png` 8 years ago
pichalite de28ff5d43 Ability to crop profile images before uploading 8 years ago
barisusakli 3fb7f9fce5 closes #5398 8 years ago
barisusakli 367078056e add hook 8 years ago
barisusakli 0c8aa599a0 closes #5357 8 years ago
Julian Lam 3861b2dd80 Merge remote-tracking branch 'origin/master' into develop 8 years ago