Commit Graph

6949 Commits (13850e35868199d70ccc9c2a954b40377e547131)

Author SHA1 Message Date
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
Julian Lam cf9fe0d5af closes
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
Barış Soner Uşaklı cd3d1f07e0
fix flagReason
Misty (Bot) 6b11bfd9e7 Latest translations and fallbacks
Barış Soner Uşaklı 2ec54166f7 only show alert if on the same category
Barış Soner Uşaklı 9eabb1dc94 closes
use the same UX from /recent on individual categories
Barış Soner Uşaklı f7ccabc3cc only add relative path if not starts with http(s)
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
Barış Soner Uşaklı 80ecd4ba6d closes
Misty (Bot) 9fce645d80 Latest translations and fallbacks
Julian Lam 7e0d0e0eb5 Merge remote-tracking branch 'origin/develop'
Barış Soner Uşaklı b74fe98dc4 closes
Barış Soner Uşaklı 008f757a9b closes
Julian Lam 2123e2f74c updated tinycon lib
Misty (Bot) 3853c741d3 Latest translations and fallbacks
Baris Usakli c9465403f5 closes
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
Barış Soner Uşaklı d8dc79e3c7 closes
Baris Usakli 6a6dc7ef06 closes
Peter Jaszkowiak f4355efb30 Optimize translator
- Use `slice` less
- Skip iterations with `indexOf`
Julian Lam 684a66a760 fixes
Peter Jaszkowiak 189008af75 Optimize translator
- Use `slice` less
- Skip iterations with `indexOf`
Peter Jaszkowiak 60a42aa651 Merge branch 'translator-optimization' into develop
Peter Jaszkowiak cf289b9228 Merge remote-tracking branch 'origin/master' into develop
Peter Jaszkowiak 190eea5691 Remove this useless check
Peter Jaszkowiak 46fafb20b9 Remove string.js dependency
Julian Lam 0efa403a68 invoking the proper ACE Editor mode
Julian Lam bf1e922cab Removed Thumbs.db from a vendor dir
Julian Lam 8741f7c63c updated ACP menu label
Julian Lam ae261e073b updating markdown and moving app.load back into ajaxify.end
Julian Lam cfacc4f133 potential fix for
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
Peter Jaszkowiak 1c35213934 Fix and forking while debugging ()
* Fix forking while debugging

Debugger address in use no longer happens

* Fix cropper error
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
Julian Lam 6852c92ed6 Merge remote-tracking branch 'origin/develop'
RoiEX e1f180ea3f Remove uneccessary undefined declaration
RoiEX ce9a3f20c5 Optimize transition
RoiEX 5e4e523198 Make progress bar finer
RoiEX 1fd160a4e6 Add Support for Firefox OSD
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
Misty (Bot) 47bbe846cb Latest translations and fallbacks
Chế Tiệp Chân Khoa 1f5d14dda4 place some code under the right loop ()
Peter Jaszkowiak dc87d7fc0f Use .js instead of .jst
Fix 
Baris Usakli 8276e20254 closes
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
Baris Usakli a2508161c6 fix hover bg color
Julian Lam b8ce4023c3 finish redirect if success returned 5x, via installer
Julian Lam e64c1d28e6 closes
Misty (Bot) 252be54b32 Latest translations and fallbacks
Julian Lam 514317ab20 using translator.unescape instead of replaces
Julian Lam 211482bbc0 fixes
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
psychobunny d4a11de07d move blacklist.less into admin/manage/ip-blacklist.less
psychobunny fdffaf9ed2 re-organized ip blacklist page
Misty (Bot) 0587b98eca Latest translations and fallbacks
Baris Usakli bf79857b7d closes
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
Peter Jaszkowiak cfba8970e1 Fix posts block usage in categories page
Peter Jaszkowiak b5acd796fb Remove public eslint `templates` global
Peter Jaszkowiak c91dfb46f6 Switch module t.js usage to Benchpress
Peter Jaszkowiak 71aab79a9a Switch client t.js usage to Benchpress
Peter Jaszkowiak dc3f89a505 ajaxify t.js usage to Benchpress
Peter Jaszkowiak 5885e37127 Switch admin t.js usage to Benchpress
Misty (Bot) b3438bc695 Latest translations and fallbacks
Julian Lam cd60d79a13 closes
Misty (Bot) a176582282 Latest translations and fallbacks
Misty (Bot) b2c16b2ba0 Latest translations and fallbacks
Misty (Bot) fad64bf1f0 Latest translations and fallbacks
Andrew Rodrigues 60e0f4ced9 minor typo
Barış Soner Uşaklı 5cc39e8546 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	package.json
#	src/views/admin/manage/ip-blacklist.tpl
Peter Jaszkowiak abffc29128 Use Benchpress ()
* Use Benchpress

* Use Benchpress.compileParse

* Error for template load failure

* Use benchpressjs package

* Compile templates on demand

* Fix user settings page

* Fix admin search to exclude `.jst` files

* Fix 500-embed

So ajaxify can still show an error if the server goes down
psychobunny 864321f727 re-organize newbiePostDelay fields
Julian Lam 53ca6d1199 closes
Misty (Bot) 3705251359 Latest translations and fallbacks
Julian Lam 73d4517d27 Revert "fixes #5894"
This reverts commit e2b40ddf34.
Julian Lam 9d2bf4746c Revert "fix reload loop for guests"
This reverts commit a67a0b0a08.
Julian Lam a67a0b0a08 fix reload loop for guests
psychobunny a13a5c02e9 closes
Julian Lam e2b40ddf34 fixes
Barış Soner Uşaklı 0498832317 closes
psychobunny 714a7066ec add some styling to blacklist rules textarea
psychobunny d5db97930d prevent "plugins" menu from being highlighted when going to Extend -> Plugins
psychobunny e8c40c8dc6 scroll to the actual subsection in the ACP when clicking on links pointing to that hash
Misty (Bot) e895f30c8e Latest translations and fallbacks
Misty (Bot) 8aaf87a3c4 Latest translations and fallbacks
Barış Soner Uşaklı ff88be91fa Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Barış Soner Uşaklı 5dfb2fb83a up themes, fix notif test
Julian Lam c1d7b06ded Fixes
- 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.
Misty (Bot) 4e98c4b39f Latest translations and fallbacks
Baris Usakli bc0645dc26 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
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
Baris Usakli 575c9a41cd Merge remote-tracking branch 'refs/remotes/origin/master' into develop
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
Baris Usakli 27a6b8a713 lint fixes
Baris Usakli bc6b1a8f56 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	public/src/admin/extend/plugins.js
Julian Lam d9ad26c7c5 the meat of , making chat loading not require an ajaxification
Julian Lam 902b823f4d adding mobile handling of chats' recent list links