323 Commits (28151f86dad3b0eb072efec1216d0f708d288bc8)

Author SHA1 Message Date
Julian Lam 3951bb9532 Merge remote-tracking branch 'origin/master' into user-blocking 7 years ago
Julian Lam 7089e5c6a6 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Julian Lam f0f30041f5 re: #6408 7 years ago
Andrew Rodrigues 1c09094011 show success alert + rebuild msg when ordering plugins 7 years ago
Julian Lam ca932d30d2 basic UCP integration #6463 7 years ago
Andrew Rodrigues a3224cc4ba added missing language key 7 years ago
Julian Lam 777d9aeee6 implement proper file sorting by mtime in ACP uploads 7 years ago
Julian Lam 388765bdf9 added post usage column to uploads ACP page
re: #6455
7 years ago
Julian Lam 364ded4f8e Merge remote-tracking branch 'origin/master' into develop 7 years ago
Barış Soner Uşaklı 501d02220c closes #6456 7 years ago
Julian Lam a4dc62c7c7 closes #6441 7 years ago
Julian Lam 67dec83011 profile export for #6441 + integration 7 years ago
Barış Soner Uşaklı ef99ef86a4 fix lang-key 7 years ago
Barış Soner Uşaklı 927537c759 #6431 add private upload info 7 years ago
Julian Lam 8e822c7772 Added user consent pages (#6430)
- "Your Rights & Consent" user settings page
7 years ago
Barış Soner Uşaklı 7cd004ca23 user uploads route 7 years ago
Barış Soner Uşaklı ddd3dfc7f0 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Julian Lam c6c31e9e5f a tiny bit of work to make our casing a little less insane 7 years ago
Julian Lam 13a3f44ed3 closes #6432 7 years ago
Barış Soner Uşaklı 47606c8df5 merge 7 years ago
Barış Soner Uşaklı 0070f5c1b2 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Julian Lam 697699f969 updated password reset send success text 7 years ago
Barış Soner Uşaklı caf43e3025 closes #6358 7 years ago
Julian Lam 113fed05d8 closes #6412 7 years ago
Julian Lam c1aa46c663 added new option to disable post diffs /cc @BenLubar 7 years ago
Barış Soner Uşaklı 749b282cdd add matchwords to search api 7 years ago
Timothy Fike 585d613d4b fix reload actions (#6394)
* fix reload actions

* wait until restart action is complete instead of using timeouts.

* Change Reload nominclature to Rebuild and Restart.
7 years ago
Julian Lam 0158b1aa91 Various password logic fixes on client and server-side
Fixes #6399
Fixes #6400
7 years ago
Barış Soner Uşaklı 5281b84521 add missing translation 7 years ago
Barış Soner Uşaklı ae0f1847ae allow multiple origins for access-control-allow-origin header
add access-control-allow-credentials header to acp
7 years ago
Peter Jaszkowiak eaae5b52cd ACP quick actions (#6374)
* ACP quick actions

- Moved restart, build & restart, and logout into separate buttons
- Moved buttons on mobile into the side menu
- Added version and upgrade alert to header / mobile menu
- Moved version checking to server-side with a cache for rate limiting
- Changed "reload" translations to "rebuild and restart"

* Change info alert to black-on-white to match focused search bar

* Fix tests

* Fallback for failed fetch of latest version
7 years ago
Barış Soner Uşaklı dcb6af5768 closes #6373 7 years ago
Julian Lam a126f07471 closes #6043 7 years ago
Andrew Rodrigues 5602092de9 closes #6347 7 years ago
Julian Lam a86d91a552 wrapping up post history work 7 years ago
Julian Lam 55788382ea Merge remote-tracking branch 'origin/master' into develop 7 years ago
Barış Soner Uşaklı 15e9bbac92 closes #6311 7 years ago
Barış Soner Uşaklı a224c557c0 closes #6326 7 years ago
Barış Soner Uşaklı 723f31a362 closes #6323 7 years ago
Julian Lam da3ce2e1d5 added error text for multiple associations 7 years ago
Barış Soner Uşaklı 651b1cc9f8 closes #6321 7 years ago
Barış Soner Uşaklı 7b6282f530 closes #6308 7 years ago
Barış Soner Uşaklı 7a2d6fe22d Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
psychobunny 29be18ae5b closes #6268 7 years ago
Barış Soner Uşaklı 155e20d216 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Barış Soner Uşaklı c7506d77b0 closes #6247 7 years ago
Barış Soner Uşaklı 2e2b97033e closes #6248 , closes #6282 7 years ago
Barış Soner Uşaklı 33a8cb947e Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Julian Lam ac2e185e34 Fixes #6261
If a connection to the parent process is not detected, disable
the restart and reload buttons (as they won't work anyway).
7 years ago
Julian Lam 457194b333 Merge branch 'master' into develop 7 years ago
Barış Soner Uşaklı f3fda152bf closes #6216 7 years ago
Barış Soner Uşaklı 81d4766c1a closes #6236 7 years ago
Barış Soner Uşaklı 72140e5338 closes #5991, closes #5884 7 years ago
Julian Lam 3de54a5488 Merge branch 'develop' into chat-rewrite 7 years ago
Julian Lam f37b9d786d Merge remote-tracking branch 'origin/master' into develop 7 years ago
Barış Soner Uşaklı 2f3b7279be closes #6212 7 years ago
Barış Soner Uşaklı f70ddce5f9 fix typo in language file 7 years ago
Julian Lam 9bcd4928c7 Merge branch 'develop' into chat-rewrite 7 years ago
Julian Lam ec07247854 Merge remote-tracking branch 'origin/master' into develop 7 years ago
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
7 years ago
Barış Soner Uşaklı 530b0e8439 closes #6217 7 years ago
Julian Lam 970c8b6f64 Merge branch 'develop' into chat-rewrite 7 years ago
Julian Lam d1ccd78ac2 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Julian Lam b2b57d49bf WIP add user modal 7 years ago
Barış Soner Uşaklı 8446a733e5 closes #5569 7 years ago
Julian Lam eea124b312 room rename logic 7 years ago
Baris Usakli 242dc41aca move privileges to same page 7 years ago
Julian Lam d967201b2a drastically simplified main window resizing logic, some language changes 7 years ago
Baris Usakli 4a73621dca chat privilege 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ı 108c3c980a show invalid url error if request.head fails 7 years ago
Barış Soner Uşaklı 99eb1d1785 closes #6163 7 years ago
Barış Soner Uşaklı 2bf275fe29 #6158 7 years ago
Barış Soner Uşaklı 43180d4b83 #6158 7 years ago
Barış Soner Uşaklı 19ae8dc7e7 closes #6154 7 years ago
Baris Usakli f177b01022 closes #6147 7 years ago
Julian Lam 553f894540 error message for disabled SSO registration 7 years ago
Barış Soner Uşaklı d9e115c3e6 closes #6146 7 years ago
Baris Usakli 3551d7d68e closes #4804 7 years ago
Julian Lam 8affaac8f0 tweaking source copy and removing a bit more commented out html. Moving some items around 7 years ago
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
7 years ago
Julian Lam 830028b1d5 language strings and fallbacks for #5955 7 years ago
Julian Lam cdc00cc0f2 added 'dissociate' translation string for #5955 7 years ago
Julian Lam 252f611481 changed error text wording 7 years ago
Muhammad Osama Arshad 64895310a9 fix #5973 7 years ago
Peter Jaszkowiak 74ceb78800 Upvote notification frequency selection (#6087)
Closes #5963

- Notify on every upvote
- Notify on every tenth upvote
- Notify logarithmically (on 10, 100, 1000...)
- Disable upvote notifications
7 years ago
Baris Usakli 2065f895d5 closes #6037 7 years ago
Barış Soner Uşaklı c839d1cbc0 closes #6080 closes #6078 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
Baris Usakli 9e5a8856d1 fix wrong sorting option in acp 7 years ago
Julian Lam cdfa45439e updating email translations to not use template value
close #6057
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
Barış Soner Uşaklı 18f4f27fe0 closes #6024 7 years ago
Julian Lam e42ff47e5c closes #6018 7 years ago
Barış Soner Uşaklı 25cd21fba8 closes #6019 7 years ago
Barış Soner Uşaklı d5d6748c71 closes #6013 7 years ago
Baris Usakli 47143a4a09 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Baris Usakli a500e0019c closes #6005 7 years ago
Peter Jaszkowiak 62ae171432 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Peter Jaszkowiak ab8465d7b6 Make deprecation warnings more clear (#5996)
* Add these as warnings

To be removed in next major version

* Make ACP search's purpose more clear

* Only warn once per deprecated path
7 years ago
Baris Usakli c4310395c9 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	package.json
7 years ago
Baris Usakli 19dc7da42f closes #5994 7 years ago
Julian Lam 8741f7c63c updated ACP menu label 7 years ago
Julian Lam 9cbf1597cd Merge remote-tracking branch 'origin/master' into develop 7 years ago
Julian Lam cd6dcff38b Split up customJS into customHTML and customJS for better organisation (#5981)
* WIP

* fixed customJS not actually working in footer

* Moving scripts to footer, #5980

* Added upgrade scripts for #5980
7 years ago
Baris Usakli 500c978a26 closes #5944 7 years ago
Dravere 38900a9964 Smtp emailer issue 5951 (#5954)
* 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
7 years ago
Julian Lam 4c82539e83 updated goback text, #5922 7 years ago
Julian Lam 38a7030639 Revert "Merge pull request #5923 from NodeBB/patch-5922"
This reverts commit f8ddabc884, reversing
changes made to 4976d13013.
7 years ago
Peter Jaszkowiak f40d37ad48 Fix #5922 7 years ago
Peter Jaszkowiak 23e7222dfa Update Nodemailer to v4
also filter out .jst files from email template dropdowns
7 years ago
Julian Lam 53ca6d1199 closes #5889 8 years ago
Barış Soner Uşaklı 0498832317 closes #5888 8 years ago
Baris Usakli 0ce3e4b691 post-queue show category, send notification 8 years ago
Baris Usakli c7db59b37b add post queue title 8 years ago
Baris Usakli 5a968730d5 closes #5880 8 years ago
Barış Soner Uşaklı f161bbf956 Post queue (#5878)
* #5876

* 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
8 years ago
Julian Lam 4f9cbabec3 fixes #5853 8 years ago
Julian Lam 0cf1fbceff added moderator tools to tracked language strings, closes NodeBB/nodebb-theme-persona/370 8 years ago
Baris Usakli a9dbdc75af closes #5825 8 years ago
Baris Usakli 43a70270ef closes #5835 8 years ago
Barış Soner Uşaklı e613064b06 closes #5819 8 years ago
Baris Usakli da8b1b605c #5723 8 years ago
Baris Usakli d13eb52f39 closes #5722 8 years ago
psychobunny 88d5f97280 closes #5717 8 years ago
Barış Soner Uşaklı 9664033b73 add memory usage to info page 8 years ago
psychobunny 1b98449686 closes #5704 8 years ago
Barış Soner Uşaklı 29ca1dbf08 replies/reply fix 8 years ago
Barış Soner Uşaklı 5e4b9479d4 closes #5677 8 years ago
Julian Lam 816809ce3c fixes #5606 8 years ago
Julian Lam 064a8aa6d7 Allowing custom date range to be supplied in pageviews graph, closes #5541 8 years ago
Barış Soner Uşaklı 873801e9f3 fix test on nodev4 remove console.logs 8 years ago
Barış Soner Uşaklı 3a1eba2537 merge 8 years ago
psychobunny 480352c650 send the banned user an email with reason + time limit if applies 8 years ago
psychobunny b3bd70235a refactor ban messaging; add ban duration to message; use bootbox instead of alert 8 years ago
Barış Soner Uşaklı ea6f981686 closes #5638 8 years ago
Barış Soner Uşaklı af6cde5534 show how many nodes responded 8 years ago
Barış Soner Uşaklı c45c4a5fdb on login display invalid-login-credentials 8 years ago
barisusakli b91b41dfa3 show database values in gbs 8 years ago
Peter Jaszkowiak c7929ec7d8 Add option for disabling language autodetection 8 years ago
barisusakli b45111d44b show max message length in error message 8 years ago
barisusakli 7b91da067b closes #5602 8 years ago
barisusakli b8c606cbbd closes #5519 8 years ago
Peter Jaszkowiak 484a800327 Merge branch master into develop 8 years ago
pichalite 4c89497cc4 Closes #5521 8 years ago
psychobunny 5985a8a7a3 closes #5574 8 years ago
psychobunny e121a5a798 closes #5574 8 years ago
Barış Soner Uşaklı fe27d40ff6 closes #5542 8 years ago