Commit Graph

1735 Commits (81b53e3ed49757e6a1c06d02d6b33c3c654f9c4b)

Author SHA1 Message Date
Misty (Bot) f56e244ba1 Latest translations and fallbacks
Misty (Bot) 7da2e54980 Latest translations and fallbacks
Misty (Bot) 6a07de2963 Latest translations and fallbacks
Misty (Bot) 0f80c466e0 Latest translations and fallbacks
Julian Lam a126f07471 closes
Misty (Bot) bafb8842e6 Latest translations and fallbacks
Andrew Rodrigues 3292542faa Merge branch 'master' of https://github.com/NodeBB/NodeBB
Andrew Rodrigues 5602092de9 closes
Misty (Bot) 9baeb11b56 Latest translations and fallbacks
Misty (Bot) 8c370f63fb Latest translations and fallbacks
Julian Lam c93f943bef Merge branch 'develop'
Barış Soner Uşaklı 7b45a6ea8b Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Misty (Bot) 49a9ee5024 Latest translations and fallbacks
Misty (Bot) a81b015262 Latest translations and fallbacks
Misty (Bot) cd2aedc691 Latest translations and fallbacks
Misty (Bot) 3572f8fefb Latest translations and fallbacks
Misty (Bot) 880ccb7fc7 Latest translations and fallbacks
Julian Lam c25d752573 Merge remote-tracking branch 'origin/master' into develop
Misty (Bot) d65ce41879 Latest translations and fallbacks
Misty (Bot) 4686b32c54 Latest translations and fallbacks
Misty (Bot) 12fdd7bb63 Latest translations and fallbacks
Misty (Bot) 7bdd2144e0 Latest translations and fallbacks
Misty (Bot) 9034424369 Latest translations and fallbacks
Julian Lam a86d91a552 wrapping up post history work
Julian Lam 55788382ea Merge remote-tracking branch 'origin/master' into develop
Misty (Bot) b126d7ef09 Latest translations and fallbacks
Barış Soner Uşaklı 15e9bbac92 closes
Barış Soner Uşaklı a224c557c0 closes
Misty (Bot) 854f79142e Latest translations and fallbacks
Barış Soner Uşaklı 723f31a362 closes
Julian Lam da3ce2e1d5 added error text for multiple associations
Barış Soner Uşaklı 651b1cc9f8 closes
Barış Soner Uşaklı 7b6282f530 closes
Misty (Bot) 52092531c7 Latest translations and fallbacks
Misty (Bot) 5f663b580c Latest translations and fallbacks
Misty (Bot) 8c5aa740ca Latest translations and fallbacks
Barış Soner Uşaklı 36b4ca1a77 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Misty (Bot) 15192cab64 Latest translations and fallbacks
Barış Soner Uşaklı 7a2d6fe22d Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Misty (Bot) ed506c32a2 Latest translations and fallbacks
psychobunny 29be18ae5b closes
Barış Soner Uşaklı b2cb3def98 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Misty (Bot) 211f00282c Latest translations and fallbacks
Julian Lam 897a7d84f9 Merge remote-tracking branch 'origin/master' into develop
Misty (Bot) 30f4c0adfd Latest translations and fallbacks
Misty (Bot) 108e1f757e Latest translations and fallbacks
Barış Soner Uşaklı 155e20d216 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Barış Soner Uşaklı c7506d77b0 closes
Barış Soner Uşaklı 2e2b97033e closes , closes
Misty (Bot) b3a021a3af Latest translations and fallbacks
Julian Lam b14e531cee Merge remote-tracking branch 'origin/master' into develop
Misty (Bot) 3ebb885fda Latest translations and fallbacks
Barış Soner Uşaklı 33a8cb947e Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Misty (Bot) df86c2ff3f Latest translations and fallbacks
Misty (Bot) da981c8d74 Latest translations and fallbacks
Misty (Bot) 9df3c0d2d6 Latest translations and fallbacks
Julian Lam ac2e185e34 Fixes
If a connection to the parent process is not detected, disable
the restart and reload buttons (as they won't work anyway).
Misty (Bot) 1b8ff1f6a2 Latest translations and fallbacks
Misty (Bot) f948ecef07 Latest translations and fallbacks
Julian Lam 457194b333 Merge branch 'master' into develop
Barış Soner Uşaklı f3fda152bf closes
Misty (Bot) 66a745d27a Latest translations and fallbacks
Barış Soner Uşaklı 81d4766c1a closes
Misty (Bot) ec391f4472 Latest translations and fallbacks
Misty (Bot) 4da9368857 Latest translations and fallbacks
Barış Soner Uşaklı 72140e5338 closes , closes
Misty (Bot) d8fbd51e93 Latest translations and fallbacks
Julian Lam 3de54a5488 Merge branch 'develop' into chat-rewrite
Julian Lam f37b9d786d Merge remote-tracking branch 'origin/master' into develop
Misty (Bot) f4feba94e3 Latest translations and fallbacks
Barış Soner Uşaklı 2f3b7279be closes
Barış Soner Uşaklı f70ddce5f9 fix typo in language file
Misty (Bot) c2ba848d00 Latest translations and fallbacks
Julian Lam 9bcd4928c7 Merge branch 'develop' into chat-rewrite
Julian Lam ec07247854 Merge remote-tracking branch 'origin/master' into develop
Julian Lam 19e53ab61b Lots o' chat changes
- Added chat room management (instead of tagsinput)
- Chat leave button in chat options dropdown
- Refreshing participants when user is added
- Updated autocomplete module so that it can be shown above a modal
  (z-index 100005 > 20000)
- Using cant-chat-with-yourself source string, which wasn't defined
  before, but was still used
Misty (Bot) b9ef1a4805 Latest translations and fallbacks
Barış Soner Uşaklı 530b0e8439 closes
Misty (Bot) e779942215 Latest translations and fallbacks
Julian Lam 970c8b6f64 Merge branch 'develop' into chat-rewrite
Julian Lam d1ccd78ac2 Merge remote-tracking branch 'origin/master' into develop
Julian Lam b2b57d49bf WIP add user modal
Barış Soner Uşaklı 8446a733e5 closes
Barış Soner Uşaklı 2b6410f201 Merge remote-tracking branch 'refs/remotes/origin/master' into chat-permission
Misty (Bot) a524f9b55f Latest translations and fallbacks
Misty (Bot) 64cbb331b7 Latest translations and fallbacks
Misty (Bot) 1fd0b760b1 Latest translations and fallbacks
Misty (Bot) e563e8ac82 Latest translations and fallbacks
Julian Lam dee18d8442 Merge branch 'develop' into chat-rewrite
Julian Lam 8588a54ff2 Merge remote-tracking branch 'origin/master' into develop
Misty (Bot) 4217d06ad0 Latest translations and fallbacks
Julian Lam eea124b312 room rename logic
Julian Lam c9364291fb Merge branch 'develop' into chat-rewrite
Julian Lam f2c251e89c Merge branch 'master' into develop
Baris Usakli 242dc41aca move privileges to same page
Julian Lam d967201b2a drastically simplified main window resizing logic, some language changes
Baris Usakli 4a73621dca chat privilege
Julian Lam 82a95a03be Chat message soft deletion -- closes
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
Misty (Bot) 094bab24c9 Latest translations and fallbacks
Julian Lam 541aa7fbc6 closes
Barış Soner Uşaklı 108c3c980a show invalid url error if request.head fails
Barış Soner Uşaklı 99eb1d1785 closes
Misty (Bot) 89f5015d83 Latest translations and fallbacks
Barış Soner Uşaklı 2bf275fe29
Misty (Bot) 0dc37abe1d Latest translations and fallbacks
Barış Soner Uşaklı 43180d4b83
Misty (Bot) 421685ee69 Latest translations and fallbacks
Barış Soner Uşaklı 19ae8dc7e7 closes
Misty (Bot) 302e20d47d Latest translations and fallbacks
Baris Usakli f177b01022 closes
Julian Lam 9a59aaa755 topic merge fallbacks
Misty (Bot) a77a681156 Latest translations and fallbacks
Julian Lam 553f894540 error message for disabled SSO registration
Barış Soner Uşaklı d9e115c3e6 closes
Misty (Bot) e7a6326b2f Latest translations and fallbacks
Baris Usakli 3551d7d68e closes
Misty (Bot) dceeb0dd5f Latest translations and fallbacks
Misty (Bot) dc1fad7956 Latest translations and fallbacks
Misty (Bot) c0883f629f Latest translations and fallbacks
Julian Lam 50e824f77a it email translation
Misty (Bot) 7269aa17e0 Latest translations and fallbacks
Julian Lam 8affaac8f0 tweaking source copy and removing a bit more commented out html. Moving some items around
Linda Badurina c72864888d ACP "Posts" Changes
- Seperate section for "Post Length" settings
- New section for settings that only apply to new users
- Changed order of some settings under "posting restrctions" and "new user restrictions"
- Uncapitalized words that shouldn't have been capitalized
Misty (Bot) 44d96cbc59 Latest translations and fallbacks
Misty (Bot) 9f5f769f4a Latest translations and fallbacks
Misty (Bot) 76cfcc039a Latest translations and fallbacks
Misty (Bot) d47c5fae04 Latest translations and fallbacks
Misty (Bot) 5354ac6b10 Latest translations and fallbacks
Misty (Bot) d34f3c7247 Latest translations and fallbacks
Misty (Bot) 373ee17a12 Latest translations and fallbacks
Julian Lam 830028b1d5 language strings and fallbacks for
Misty (Bot) 563fe0383c Latest translations and fallbacks
Julian Lam cdc00cc0f2 added 'dissociate' translation string for
Julian Lam 252f611481 changed error text wording
Muhammad Osama Arshad 64895310a9 fix
Peter Jaszkowiak 74ceb78800 Upvote notification frequency selection ()
Closes 

- Notify on every upvote
- Notify on every tenth upvote
- Notify logarithmically (on 10, 100, 1000...)
- Disable upvote notifications
Misty (Bot) 415940af02 Latest translations and fallbacks
Misty (Bot) 018b054c42 Latest translations and fallbacks
Baris Usakli 2065f895d5 closes
Barış Soner Uşaklı c839d1cbc0 closes closes
Barış Soner Uşaklı dd176dd5f2
Notification delivery ()
* 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
Baris Usakli 9e5a8856d1 fix wrong sorting option in acp
Misty (Bot) fd2a49fd1f Latest translations and fallbacks
Julian Lam cdfa45439e updating email translations to not use template value
close 
Misty (Bot) 2f36284e24 Latest translations and fallbacks
Misty (Bot) 6b11bfd9e7 Latest translations and fallbacks
acardinale 5ed6b5c414 Add User (uid) Welcome Notification ()
Misty (Bot) 671f357b6d Latest translations and fallbacks
Misty (Bot) 6958ec1f1f Latest translations and fallbacks
Misty (Bot) 9728b80c38 Latest translations and fallbacks
Misty (Bot) 9fce645d80 Latest translations and fallbacks
Julian Lam 7e0d0e0eb5 Merge remote-tracking branch 'origin/develop'
Misty (Bot) 3853c741d3 Latest translations and fallbacks
Barış Soner Uşaklı 18f4f27fe0 closes
Julian Lam e42ff47e5c closes
Barış Soner Uşaklı 25cd21fba8 closes
Barış Soner Uşaklı d5d6748c71 closes
Baris Usakli 47143a4a09 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Baris Usakli a500e0019c closes
Misty (Bot) 6f02974762 Latest translations and fallbacks
Peter Jaszkowiak 62ae171432 Merge remote-tracking branch 'origin/master' into develop
Misty (Bot) 2929d4b1df Latest translations and fallbacks
Misty (Bot) 2920fc0dfa Latest translations and fallbacks
Peter Jaszkowiak ab8465d7b6 Make deprecation warnings more clear ()
* Add these as warnings

To be removed in next major version

* Make ACP search's purpose more clear

* Only warn once per deprecated path
Misty (Bot) 92684757c6 Latest translations and fallbacks
Baris Usakli c4310395c9 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	package.json
Baris Usakli 19dc7da42f closes
Misty (Bot) 05c1a6cfed Latest translations and fallbacks
Julian Lam 8741f7c63c updated ACP menu label
Julian Lam 9cbf1597cd Merge remote-tracking branch 'origin/master' into develop
Julian Lam cd6dcff38b Split up customJS into customHTML and customJS for better organisation ()
* WIP

* fixed customJS not actually working in footer

* Moving scripts to footer, 

* Added upgrade scripts for 
Baris Usakli 500c978a26 closes
Misty (Bot) 681e8074d2 Latest translations and fallbacks
Misty (Bot) 425db49fe8 Latest translations and fallbacks
Misty (Bot) bb6dcf3779 Latest translations and fallbacks
Misty (Bot) ea41e39dd2 Latest translations and fallbacks
Misty (Bot) 098b8d9971 Latest translations and fallbacks
Dravere 38900a9964 Smtp emailer issue 5951 ()
* Fixed typo at emailer.js line 66 (serice -> service)

* When custom SMTP user and password is empty no authentication is attempted

* Added options to choose custom smtp connection security

* Made custom smtp connection security strings translatable

* Changed switch to if-else for custom smtp security option

* Fixed emailer.js lint errors

* Move custom setting to top of list
Misty (Bot) 47bbe846cb Latest translations and fallbacks
Misty (Bot) 3227e778a2 Latest translations and fallbacks
Misty (Bot) 8f0e48aa40 Latest translations and fallbacks
Misty (Bot) bb65ecd8b8 Latest translations and fallbacks
Misty (Bot) 6ea82515cc Latest translations and fallbacks
Misty (Bot) ce59a78aa4 Latest translations and fallbacks
Misty (Bot) b840b96a4a Latest translations and fallbacks
Misty (Bot) 252be54b32 Latest translations and fallbacks
Misty (Bot) d47c5a7bb0 Latest translations and fallbacks
Misty (Bot) 3872c97bed Latest translations and fallbacks
Julian Lam b5e1b4a9c4 fallbacks for
Julian Lam 4c82539e83 updated goback text,
Julian Lam 38a7030639 Revert "Merge pull request from NodeBB/patch-5922"
This reverts commit f8ddabc884, reversing
changes made to 4976d13013.
Julian Lam 3c335cb451 added post-queue translations and fallbacks
Misty (Bot) 09e2234611 Latest translations and fallbacks
Misty (Bot) f00d5a6e13 Latest translations and fallbacks
Misty (Bot) 5b19675093 Latest translations and fallbacks
Julian Lam f8ddabc884 Merge pull request from NodeBB/patch-5922
Fix 
Peter Jaszkowiak f40d37ad48 Fix
Misty (Bot) 9118323060 Latest translations and fallbacks
Misty (Bot) 0b07068b13 Latest translations and fallbacks
Misty (Bot) 7e82570e1f Latest translations and fallbacks
Misty (Bot) 4628c2d2f4 Latest translations and fallbacks
Misty (Bot) 0587b98eca Latest translations and fallbacks
Julian Lam 1034626896 Merge remote-tracking branch 'origin/develop'
Misty (Bot) 412f844885 Latest translations and fallbacks
Peter Jaszkowiak 23e7222dfa Update Nodemailer to v4
also filter out .jst files from email template dropdowns
Misty (Bot) b3438bc695 Latest translations and fallbacks
Misty (Bot) a176582282 Latest translations and fallbacks
Misty (Bot) b2c16b2ba0 Latest translations and fallbacks
Misty (Bot) fad64bf1f0 Latest translations and fallbacks
Julian Lam 53ca6d1199 closes
Misty (Bot) 3705251359 Latest translations and fallbacks
Barış Soner Uşaklı 0498832317 closes
Misty (Bot) e895f30c8e Latest translations and fallbacks
Misty (Bot) 8aaf87a3c4 Latest translations and fallbacks
Misty (Bot) 4e98c4b39f Latest translations and fallbacks
Baris Usakli 0ce3e4b691 post-queue show category, send notification
Misty (Bot) 77390930bb Latest translations and fallbacks
Baris Usakli c7db59b37b add post queue title
Baris Usakli 5a968730d5 closes
Barış Soner Uşaklı f161bbf956 Post queue ()
* 

* add user to post queue table

* add time of post into queue

add posting restrictions to queue

* fix shouldQueueLogic for guests

* add test for post-queue route
Misty (Bot) 1864a50826 Latest translations and fallbacks
Misty (Bot) 7c99af13e5 Latest translations and fallbacks
Misty (Bot) 23096e24b4 Latest translations and fallbacks
Misty (Bot) 5a52e6f752 Latest translations and fallbacks
Julian Lam 4f9cbabec3 fixes
Misty (Bot) 3a3ccd1d58 Latest translations and fallbacks
Misty (Bot) 88e0ee4ffe Latest translations and fallbacks
Julian Lam 0cf1fbceff added moderator tools to tracked language strings, closes NodeBB/nodebb-theme-persona/370
Misty (Bot) 53508e58c3 Latest translations and fallbacks
Misty (Bot) d76a67a084 Latest translations and fallbacks
Misty (Bot) 00e588b648 Latest translations and fallbacks
Misty (Bot) f2dba40496 Latest translations and fallbacks
Baris Usakli a9dbdc75af closes
Misty (Bot) ae3d5f8aaa Latest translations and fallbacks
Misty (Bot) 5835334b1c Latest translations and fallbacks
Misty (Bot) b2a0ecb3c8 Latest translations and fallbacks
Misty (Bot) 9d0e2e90de Latest translations and fallbacks
Misty (Bot) e87f6f900f Latest translations and fallbacks
Misty (Bot) a1b7666c96 Latest translations and fallbacks
Misty (Bot) 72fb92fa96 Latest translations and fallbacks
Misty (Bot) e02f354ec9 Latest translations and fallbacks
Baris Usakli 43a70270ef closes
Misty (Bot) 018d5d7819 Latest translations and fallbacks
Misty (Bot) 0e4fba7c6c Latest translations and fallbacks
Barış Soner Uşaklı e613064b06 closes
Misty (Bot) d478deb4fe Latest translations and fallbacks
Misty (Bot) 2b3a88365c Latest translations and fallbacks
Misty (Bot) b117f1169e Latest translations and fallbacks
Misty (Bot) 3e453fd1a6 Latest translations and fallbacks
Julian Lam 77d6181bd1 missing translations for ja and pt-BR
Misty (Bot) 1a814f6f94 Latest translations and fallbacks
Misty (Bot) 8e25471685 Latest translations and fallbacks
Misty (Bot) fbdc2d7b3f Latest translations and fallbacks
Misty (Bot) 382240f25c Latest translations and fallbacks
Misty (Bot) 6f14d00026 Latest translations and fallbacks
Misty (Bot) 6b66cc8f64 Latest translations and fallbacks
Misty (Bot) 631e9aea14 Latest translations and fallbacks
Misty (Bot) b0ea511b27 Latest translations and fallbacks
Julian Lam 05434afed1 fixes
Misty (Bot) 3682cd9654 Latest translations and fallbacks
Misty (Bot) d8fc65808c Latest translations and fallbacks
Misty (Bot) a94e3f78a7 Latest translations and fallbacks
Misty (Bot) 2d04bb9d33 Latest translations and fallbacks
Misty (Bot) 02ba714fe8 Latest translations and fallbacks
Misty (Bot) 5f09a8b41d Latest translations and fallbacks
Julian Lam d1805300f7 fix nl language.json
Misty (Bot) 52e795ce78 Latest translations and fallbacks
Misty (Bot) 1451b91fe0 Latest translations and fallbacks
Misty (Bot) 89895099ce Latest translations and fallbacks
Misty (Bot) b6feb0aa57 Latest translations and fallbacks
Misty (Bot) 90a15a633a Latest translations and fallbacks
Misty (Bot) 54e40e815f Latest translations and fallbacks
Misty (Bot) 382a0aa42e Latest translations and fallbacks
Misty (Bot) 2d73e7fec2 Latest translations and fallbacks
Baris Usakli da8b1b605c
Baris Usakli d13eb52f39 closes
psychobunny 88d5f97280 closes
Misty (Bot) 25a84d7314 Latest translations and fallbacks
Barış Soner Uşaklı 9664033b73 add memory usage to info page
Misty (Bot) 57c0861310 Latest translations and fallbacks
Misty (Bot) 033c31719a Latest translations and fallbacks
Misty (Bot) e1a42a49b6 Latest translations and fallbacks
psychobunny 1b98449686 closes
Misty (Bot) d018fe4854 Latest translations and fallbacks
Misty (Bot) dd3bf8d1ca Latest translations and fallbacks
Misty (Bot) 57c5e0b554 Latest translations and fallbacks
Barış Soner Uşaklı 29ca1dbf08 replies/reply fix
Misty (Bot) 4fadbcbbc8 Latest translations and fallbacks
Misty (Bot) 11fc79051a Latest translations and fallbacks
Misty (Bot) f3008391d6 Latest translations and fallbacks
Misty (Bot) 64732af130 Latest translations and fallbacks
Barış Soner Uşaklı 5e4b9479d4 closes
Misty (Bot) 45949be029 Latest translations and fallbacks
Julian Lam 816809ce3c fixes
Julian Lam 064a8aa6d7 Allowing custom date range to be supplied in pageviews graph, closes
Julian Lam 544faa7861 Adding Croatian to languages, closes . Hvala ti!
Barış Soner Uşaklı 873801e9f3 fix test on nodev4 remove console.logs
Misty (Bot) 1d672d9024 Latest translations and fallbacks
Misty (Bot) cb339838c0 Latest translations and fallbacks
Barış Soner Uşaklı 3a1eba2537 merge