8928 Commits (2086a64a5eda4d67ad69e0acc78611c0d6ca7fb2)

Author SHA1 Message Date
Julian Lam 2086a64a5e fixes #5947 8 years ago
Barış Soner Uşaklı b70f328520 closes #5948 8 years ago
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
8 years ago
Peter Jaszkowiak dc87d7fc0f Use .js instead of .jst
Fix #5934
8 years ago
Barış Soner Uşaklı f989988178 closes #1668 8 years ago
Barış Soner Uşaklı 2185480c4e switch to eachSeries 8 years ago
Baris Usakli 8276e20254 closes #5937 8 years ago
Baris Usakli 852396e60d closes #5903 8 years ago
Barış Soner Uşaklı 4c0d430819 only return minimal info for pending and invited users 8 years ago
Barış Soner Uşaklı 1019feb569 fix method name 8 years ago
Barış Soner Uşaklı f42119673f fix string cids in post summaries 8 years ago
Julian Lam 38a7030639 Revert "Merge pull request #5923 from NodeBB/patch-5922"
This reverts commit f8ddabc884, reversing
changes made to 4976d13013.
8 years ago
Julian Lam f8ddabc884 Merge pull request #5923 from NodeBB/patch-5922
Fix #5922
8 years ago
Peter Jaszkowiak f40d37ad48 Fix #5922 8 years ago
Julian Lam 4976d13013 removed console log 8 years ago
Julian Lam f7d78771f8 fixes #5921 8 years ago
Barış Soner Uşaklı a4532f011a Blacklist fix (#5918)
* closes #5917

* fix callback for upgrade script

* delete key even if falsy, could be empty string

* DRYer ternary
8 years ago
Julian Lam 302f06df95 fixes #5914 8 years ago
Peter Jaszkowiak 61b0f0c4c3 Catch uglify errors 8 years ago
psychobunny d4a11de07d move blacklist.less into admin/manage/ip-blacklist.less 8 years ago
psychobunny fdffaf9ed2 re-organized ip blacklist page 8 years ago
Baris Usakli 1358a89305 closes #5907 8 years ago
Julian Lam 1034626896 Merge remote-tracking branch 'origin/develop' 8 years ago
Harmdhast 0b520f8d65 Template - Benchpress | Variable call fix
Change the way the var is called to match the new benchpressjs templating system.
Fixes the admin permission panel.
8 years ago
Peter Jaszkowiak 23e7222dfa Update Nodemailer to v4
also filter out .jst files from email template dropdowns
8 years ago
manolino 9cb098bb0b Implements Jimp exitRotate() new method (jimp 0.2.28) to sove incoherent rotations when scaling images. 8 years ago
psychobunny ececfe9a77 Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop 8 years ago
psychobunny 01275787b6 added widgets.resetTemplate(s) 8 years ago
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
8 years ago
Peter Jaszkowiak abffc29128 Use Benchpress (#5901)
* 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
8 years ago
psychobunny 864321f727 re-organize newbiePostDelay fields 8 years ago
Julian Lam 53ca6d1199 closes #5889 8 years ago
Julian Lam 73d4517d27 Revert "fixes #5894"
This reverts commit e2b40ddf34.
8 years ago
Julian Lam cdd139b327 increment blacklist analytics on blacklist block 8 years ago
Julian Lam 00c25d47f9 blacklist should not use data.result anymore, just err is fine 8 years ago
Baris Usakli 19ae2b3eb4 dont join online_users and uid_ if user does not exist 8 years ago
Baris Usakli 0d0ea0977f check error 8 years ago
Julian Lam e2b40ddf34 fixes #5894 8 years ago
Julian Lam 81cf8f77d3 add blacklist test to onSuccessfulLogin as well 8 years ago
Baris Usakli b2542c1e19 add missing return false 8 years ago
Julian Lam c71b7db646 remove messy regexes and a console.log 8 years ago
Julian Lam 5d2b3d3c39 remove dependency on ip-range-check and ip, use lower level ipaddr.js instead
re: #5893
8 years ago
Julian Lam 8346130cdc introduced new hook filter:blacklist.test 8 years ago
Barış Soner Uşaklı 0498832317 closes #5888 8 years ago
psychobunny 714a7066ec add some styling to blacklist rules textarea 8 years ago
psychobunny 5699236fd2 added missing relative_path to view sitemap button 8 years ago
psychobunny c0c0a28f21 point to the correct section for user registration settings 8 years ago
psychobunny 0e219a8c58 closes #5891 8 years ago
Barış Soner Uşaklı fcce96efab style change 8 years ago
Barış Soner Uşaklı a46db9616c fix message delete and add test 8 years ago