332 Commits (71e50bbf4e4afde6202632241e499a24853a7f5e)

Author SHA1 Message Date
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
Julian Lam 4b3dcd1a02 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Ben Lubar 7f713ee822 Admin option to allow all users to view votes (#5534)
* Admin option to allow all users to view votes

* Fix </strong></strong>
8 years ago
Julian Lam c805d55b85 creating notification for flag assignment 8 years ago
barisusakli 5a2ff8ed0a closes #5527 8 years ago
Julian Lam 860999fa6c Merge remote-tracking branch 'origin/master' into develop 8 years ago
psychobunny f2eb4b8083 closes #5439 8 years ago
psychobunny 8da8e4d8c3 closes #5469 8 years ago
psychobunny fd8e647ef5 closes #5506 8 years ago
Julian Lam 8154e29ad5 Merge branch 'master' into develop 8 years ago
psychobunny 458cbfd603 show dashboard notice if forum is running in dev mode 8 years ago
Julian Lam a17c26ea45 Merge branch 'master' into develop 8 years ago
Julian Lam d61665c20a updated copy for no-routes-not-found 8 years ago
psychobunny 570efb9e4b Merge branch 'develop' into threads-enhancement 8 years ago
psychobunny 83cd960ffa improved threaded view design 8 years ago
barisusakli 387110fecc closes #5315 8 years ago
Julian Lam b5daedb7a3 Merge remote-tracking branch 'origin/master' into develop 8 years ago
pichalite de28ff5d43 Ability to crop profile images before uploading 8 years ago
Peter Jaszkowiak c14a31644b Merge branch 'master' into 'develop' 8 years ago
Julian Lam 3ab631c82e Merge pull request #5391 from Pappmann/patch-4
added missing translation in dashboard
8 years ago
Julian Lam 7414482753 Merge branch 'master' into develop 8 years ago
psychobunny 9d069d76db random \t's in language string 8 years ago
Stephan 56f045e6b0 Update dashboard.json 8 years ago
Julian Lam 1a0e4db466 removing duplicate strings from flags language file 8 years ago
Julian Lam 2c6beb9ffb Merge branch 'master' into develop 8 years ago
Julian Lam 8e7af0291a fixed grammar in admin-manage-categories string 8 years ago
barisusakli c42eaee30c fix typo in language file 8 years ago
Julian Lam 3861b2dd80 Merge remote-tracking branch 'origin/master' into develop 8 years ago
pichalite da8795f666 Add missing translations 8 years ago
pichalite 5b646495af Confirm before removing user and group cover picture 8 years ago
Julian Lam 05fdd35818 removed menu item for flags management in ACP 8 years ago
Julian Lam 29c7ae7645 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Peter Jaszkowiak 6d00d5f6a5 Fix ACP title issues 8 years ago
Anil Mandepudi 8229de5eaa Add missing translation 8 years ago
Julian Lam 7c7cb8cfe6 remove flag translations from development branch 8 years ago
Julian Lam c640bdf2b9 Merge branch 'master' into develop 8 years ago
Julian Lam 926186108b ACP Translations 8 years ago
Peter Jaszkowiak daf3ab4db4 WIP 8 years ago
Peter Jaszkowiak 038c45f4b6 `admin/manage` translations, misc
- Translate Manage templates and JS
- Change `translator.translate -> .html` into `.translateHtml` where fitting
- Translate `admin/partials/download_plugin_item`
8 years ago
Peter Jaszkowiak 94eb74646c `admin/manage/categories` translations
- Fix privilege table headers so bottom borders align
- Fix `/admin` route to show Dashboard title correctly
- Translate ACP category management and privileges templates
- Translate ACP category management JS
- Remove unnecessary translates in JS
- Fix bootbox wrapper to work with translations containing html
8 years ago
Peter Jaszkowiak 862908d0eb ACP search and title improvements
- Search uses translated titles if available
- Use `advanced` for `development` route titles
- Remove route title from showing up in results
- Highlight matching part of result title
- Don't show empty result contents when only title is matched
8 years ago
Peter Jaszkowiak 3008794797 `admin/general` JS translations and misc 8 years ago
Peter Jaszkowiak 95bef8f3f6 `admin/extend` JS translations and misc 8 years ago
Peter Jaszkowiak 38eba81933 ACP menu and title translations 8 years ago
Peter Jaszkowiak 606de990e9 `admin/advanced` JS translations 8 years ago
Peter Jaszkowiak 20db4657b2 `admin/general` translations 8 years ago
Peter Jaszkowiak 3cd6a8a94b `admin/extend` translations 8 years ago
Peter Jaszkowiak 50aed01c57 `admin/development` translations 8 years ago
Peter Jaszkowiak 6c1b852d48 `admin/appearance` translations 8 years ago
Peter Jaszkowiak 8931702136 `admin/advanced` translations 8 years ago
barisusakli 1fed01fe43 ability to filter search by tags 8 years ago
Julian Lam ad633aad45 additional tests and proper handling for purged flag targets, #5232 8 years ago
Julian Lam 0927d54c98 ability to filter flags by cid, #5232, more tests 8 years ago
Julian Lam e6768ab572 some more fixes to flags, simplifying qs manipulation in flags search
re: #5232
8 years ago
Julian Lam 5d63c0aa3b Merge remote-tracking branch 'origin/master' into flagging-refactor 8 years ago
Julian Lam 31996f9377 added page titles 8 years ago
Julian Lam a5fb4825b4 deprecating old hook for #5232 8 years ago
Julian Lam 5dd892bd01 a bunch of changes here... allowing user profiles to be flagged, #5232 8 years ago
Julian Lam 9f9051026b more work on #5232 8 years ago
Peter Jaszkowiak f1cfed50a1 Translate skins and themes fully 8 years ago
Julian Lam 88958049eb added some more filters, and appending event to history on flag creation
issue #5232
8 years ago
Julian Lam 8e1d441e20 Added some quick filters, #5232 8 years ago
Julian Lam 753d4b0275 wrapped up basic functionality of list and detail for flags, filter support. #5232 8 years ago
Julian Lam 9129597811 #5232 some tweaks to flag history saving 8 years ago
Julian Lam 839a0efc0a one more language string for #5232 8 years ago
Julian Lam 22eeabc5c7 new strings for empty notes or history, #5232 8 years ago
Julian Lam f1d144f15e history appending, finished up notes, #5232 8 years ago
Julian Lam d9d60c20bd flag updating and note appending, #5232 8 years ago
Julian Lam c5c2d27180 flag assignees, state, notes WIP, #5232 8 years ago
Julian Lam fceb5cc86b more work on flags detail pages (#5232) 8 years ago
Peter Jaszkowiak 77e58f31c5 Fixes, passes tests 8 years ago
Julian Lam 98a104564b some light refactoring, details API (#5232) 8 years ago
Julian Lam 640df0379e flag list page (#5232) 8 years ago
Peter Jaszkowiak c5237443cd Standard language codes (#5218)
* Use standard language codes. Fallback for plugins.

* Fix transifex config

* Tab vs space here for some reason

* Remove redundancies

* config.relative_path instead of allcaps

* added upgrade script for existing users' accounts
8 years ago