1556 Commits (083ff9f6370cb3938e3f8eee60d6489436135fa1)

Author SHA1 Message Date
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
Misty (Bot) 52092531c7 Latest translations and fallbacks 7 years ago
Misty (Bot) 5f663b580c Latest translations and fallbacks 7 years ago
Misty (Bot) 8c5aa740ca Latest translations and fallbacks 7 years ago
Barış Soner Uşaklı 36b4ca1a77 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Misty (Bot) 15192cab64 Latest translations and fallbacks 7 years ago
Barış Soner Uşaklı 7a2d6fe22d Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Misty (Bot) ed506c32a2 Latest translations and fallbacks 7 years ago
psychobunny 29be18ae5b closes #6268 7 years ago
Barış Soner Uşaklı b2cb3def98 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Misty (Bot) 211f00282c Latest translations and fallbacks 7 years ago
Julian Lam 897a7d84f9 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Misty (Bot) 30f4c0adfd Latest translations and fallbacks 7 years ago
Misty (Bot) 108e1f757e Latest translations and fallbacks 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
Misty (Bot) b3a021a3af Latest translations and fallbacks 7 years ago
Julian Lam b14e531cee Merge remote-tracking branch 'origin/master' into develop 7 years ago
Misty (Bot) 3ebb885fda Latest translations and fallbacks 7 years ago
Barış Soner Uşaklı 33a8cb947e Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Misty (Bot) df86c2ff3f Latest translations and fallbacks 7 years ago
Misty (Bot) da981c8d74 Latest translations and fallbacks 7 years ago
Misty (Bot) 9df3c0d2d6 Latest translations and fallbacks 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
Misty (Bot) 1b8ff1f6a2 Latest translations and fallbacks 7 years ago
Misty (Bot) f948ecef07 Latest translations and fallbacks 7 years ago
Julian Lam 457194b333 Merge branch 'master' into develop 7 years ago
Barış Soner Uşaklı f3fda152bf closes #6216 7 years ago
Misty (Bot) 66a745d27a Latest translations and fallbacks 7 years ago
Barış Soner Uşaklı 81d4766c1a closes #6236 7 years ago
Misty (Bot) ec391f4472 Latest translations and fallbacks 7 years ago
Misty (Bot) 4da9368857 Latest translations and fallbacks 7 years ago
Barış Soner Uşaklı 72140e5338 closes #5991, closes #5884 7 years ago
Misty (Bot) d8fbd51e93 Latest translations and fallbacks 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
Misty (Bot) f4feba94e3 Latest translations and fallbacks 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
Misty (Bot) c2ba848d00 Latest translations and fallbacks 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
Misty (Bot) b9ef1a4805 Latest translations and fallbacks 7 years ago
Barış Soner Uşaklı 530b0e8439 closes #6217 7 years ago
Misty (Bot) e779942215 Latest translations and fallbacks 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
Barış Soner Uşaklı 2b6410f201 Merge remote-tracking branch 'refs/remotes/origin/master' into chat-permission 7 years ago
Misty (Bot) a524f9b55f Latest translations and fallbacks 7 years ago
Misty (Bot) 64cbb331b7 Latest translations and fallbacks 7 years ago
Misty (Bot) 1fd0b760b1 Latest translations and fallbacks 7 years ago
Misty (Bot) e563e8ac82 Latest translations and fallbacks 7 years ago
Julian Lam dee18d8442 Merge branch 'develop' into chat-rewrite 7 years ago
Julian Lam 8588a54ff2 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Misty (Bot) 4217d06ad0 Latest translations and fallbacks 7 years ago
Julian Lam eea124b312 room rename logic 7 years ago
Julian Lam c9364291fb Merge branch 'develop' into chat-rewrite 7 years ago
Julian Lam f2c251e89c Merge branch 'master' into develop 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
Misty (Bot) 094bab24c9 Latest translations and fallbacks 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
Misty (Bot) 89f5015d83 Latest translations and fallbacks 7 years ago
Barış Soner Uşaklı 2bf275fe29 #6158 7 years ago
Misty (Bot) 0dc37abe1d Latest translations and fallbacks 7 years ago
Barış Soner Uşaklı 43180d4b83 #6158 7 years ago
Misty (Bot) 421685ee69 Latest translations and fallbacks 7 years ago
Barış Soner Uşaklı 19ae8dc7e7 closes #6154 7 years ago
Misty (Bot) 302e20d47d Latest translations and fallbacks 7 years ago
Baris Usakli f177b01022 closes #6147 7 years ago
Julian Lam 9a59aaa755 topic merge fallbacks 7 years ago
Misty (Bot) a77a681156 Latest translations and fallbacks 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
Misty (Bot) e7a6326b2f Latest translations and fallbacks 7 years ago
Baris Usakli 3551d7d68e closes #4804 7 years ago
Misty (Bot) dceeb0dd5f Latest translations and fallbacks 7 years ago
Misty (Bot) dc1fad7956 Latest translations and fallbacks 7 years ago
Misty (Bot) c0883f629f Latest translations and fallbacks 7 years ago
Julian Lam 50e824f77a it email translation 7 years ago
Misty (Bot) 7269aa17e0 Latest translations and fallbacks 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
Misty (Bot) 44d96cbc59 Latest translations and fallbacks 7 years ago
Misty (Bot) 9f5f769f4a Latest translations and fallbacks 7 years ago
Misty (Bot) 76cfcc039a Latest translations and fallbacks 7 years ago
Misty (Bot) d47c5fae04 Latest translations and fallbacks 7 years ago
Misty (Bot) 5354ac6b10 Latest translations and fallbacks 7 years ago
Misty (Bot) d34f3c7247 Latest translations and fallbacks 7 years ago
Misty (Bot) 373ee17a12 Latest translations and fallbacks 7 years ago
Julian Lam 830028b1d5 language strings and fallbacks for #5955 7 years ago
Misty (Bot) 563fe0383c Latest translations and fallbacks 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
Misty (Bot) 415940af02 Latest translations and fallbacks 7 years ago
Misty (Bot) 018b054c42 Latest translations and fallbacks 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
Misty (Bot) fd2a49fd1f Latest translations and fallbacks 7 years ago
Julian Lam cdfa45439e updating email translations to not use template value
close #6057
7 years ago
Misty (Bot) 2f36284e24 Latest translations and fallbacks 7 years ago
Misty (Bot) 6b11bfd9e7 Latest translations and fallbacks 7 years ago
acardinale 5ed6b5c414 Add User (uid) Welcome Notification (#6045) 7 years ago
Misty (Bot) 671f357b6d Latest translations and fallbacks 7 years ago
Misty (Bot) 6958ec1f1f Latest translations and fallbacks 7 years ago
Misty (Bot) 9728b80c38 Latest translations and fallbacks 7 years ago
Misty (Bot) 9fce645d80 Latest translations and fallbacks 7 years ago
Julian Lam 7e0d0e0eb5 Merge remote-tracking branch 'origin/develop' 7 years ago
Misty (Bot) 3853c741d3 Latest translations and fallbacks 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
Misty (Bot) 6f02974762 Latest translations and fallbacks 7 years ago
Peter Jaszkowiak 62ae171432 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Misty (Bot) 2929d4b1df Latest translations and fallbacks 7 years ago
Misty (Bot) 2920fc0dfa Latest translations and fallbacks 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
Misty (Bot) 92684757c6 Latest translations and fallbacks 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
Misty (Bot) 05c1a6cfed Latest translations and fallbacks 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
Misty (Bot) 681e8074d2 Latest translations and fallbacks 7 years ago
Misty (Bot) 425db49fe8 Latest translations and fallbacks 7 years ago
Misty (Bot) bb6dcf3779 Latest translations and fallbacks 7 years ago
Misty (Bot) ea41e39dd2 Latest translations and fallbacks 7 years ago
Misty (Bot) 098b8d9971 Latest translations and fallbacks 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
Misty (Bot) 47bbe846cb Latest translations and fallbacks 7 years ago