Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-28 02:09:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
21,328 Commits 71 Branches 489 Tags
18ae7cf719fba7dab4a7461894de9de1364b87ac
Commit Graph

11415 Commits

Author SHA1 Message Date
Julian Lam
2c2a28c5b6 closes #5919 2017-09-08 11:37:51 -04:00
Julian Lam
4976d13013 removed console log 2017-09-08 11:25:45 -04:00
Julian Lam
f7d78771f8 fixes #5921 2017-09-08 11:12:48 -04:00
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
 2017-09-07 15:34:17 -04:00
Julian Lam
302f06df95 fixes #5914 2017-09-06 15:09:01 -04:00
Peter Jaszkowiak
61b0f0c4c3 Catch uglify errors 2017-09-06 11:15:39 -06:00
psychobunny
d4a11de07d move blacklist.less into admin/manage/ip-blacklist.less 2017-09-01 19:47:20 -04:00
psychobunny
fdffaf9ed2 re-organized ip blacklist page 2017-09-01 19:29:09 -04:00
Baris Usakli
1358a89305 closes #5907 2017-09-01 18:40:34 -04:00
Julian Lam
1034626896 Merge remote-tracking branch 'origin/develop' 2017-09-01 16:07:12 -04:00
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.
 2017-09-01 01:10:38 +02:00
Peter Jaszkowiak
23e7222dfa Update Nodemailer to v4 
also filter out .jst files from email template dropdowns
 2017-08-30 14:26:41 -06:00
manolino
9cb098bb0b Implements Jimp exitRotate() new method (jimp 0.2.28) to sove incoherent rotations when scaling images. 2017-08-28 14:34:42 -04:00
psychobunny
ececfe9a77 Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop 2017-08-25 13:59:20 -04:00
psychobunny
01275787b6 added widgets.resetTemplate(s) 2017-08-25 13:59:14 -04:00
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
 2017-08-24 19:29:15 -04:00
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
 2017-08-24 19:26:50 -04:00
psychobunny
864321f727 re-organize newbiePostDelay fields 2017-08-24 14:25:09 -04:00
Julian Lam
53ca6d1199 closes #5889 2017-08-24 12:39:57 -04:00
Julian Lam
73d4517d27 Revert "fixes #5894" 
This reverts commit e2b40ddf34.
 2017-08-23 21:38:58 -04:00
Julian Lam
cdd139b327 increment blacklist analytics on blacklist block 2017-08-23 16:16:27 -04:00
Julian Lam
00c25d47f9 blacklist should not use data.result anymore, just err is fine 2017-08-23 16:14:08 -04:00
Baris Usakli
19ae2b3eb4 dont join online_users and uid_ if user does not exist 2017-08-23 15:30:13 -04:00
Baris Usakli
0d0ea0977f check error 2017-08-23 15:29:27 -04:00
Julian Lam
e2b40ddf34 fixes #5894 2017-08-23 15:11:15 -04:00
Julian Lam
81cf8f77d3 add blacklist test to onSuccessfulLogin as well 2017-08-23 12:14:14 -04:00
Baris Usakli
b2542c1e19 add missing return false 2017-08-23 10:54:00 -04:00
Julian Lam
c71b7db646 remove messy regexes and a console.log 2017-08-22 16:55:47 -04:00
Julian Lam
5d2b3d3c39 remove dependency on ip-range-check and ip, use lower level ipaddr.js instead 
re: #5893
 2017-08-22 16:55:31 -04:00
Julian Lam
8346130cdc introduced new hook filter:blacklist.test 2017-08-22 13:46:20 -04:00
Barış Soner Uşaklı
0498832317 closes #5888 2017-08-22 10:28:35 -04:00
psychobunny
714a7066ec add some styling to blacklist rules textarea 2017-08-21 19:05:37 -04:00
psychobunny
5699236fd2 added missing relative_path to view sitemap button 2017-08-21 18:58:01 -04:00
psychobunny
c0c0a28f21 point to the correct section for user registration settings 2017-08-21 18:46:43 -04:00
psychobunny
0e219a8c58 closes #5891 2017-08-21 17:48:58 -04:00
Barış Soner Uşaklı
fcce96efab style change 2017-08-21 16:51:42 -04:00
Barış Soner Uşaklı
a46db9616c fix message delete and add test 2017-08-21 16:48:18 -04:00
Barış Soner Uşaklı
1875764aca fix typo in delete 2017-08-21 16:39:24 -04:00
Barış Soner Uşaklı
62c81ca0d3 fix lint 2017-08-20 21:07:54 -04:00
Barış Soner Uşaklı
329bfeeb3b convert min/max to float 2017-08-20 20:41:31 -04:00
Barış Soner Uşaklı
74caf191f5 fix typo 2017-08-19 09:13:15 -04:00
Barış Soner Uşaklı
ff88be91fa Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-18 20:09:40 -04:00
Barış Soner Uşaklı
5344edc2a7 closes #5885 2017-08-18 20:08:19 -04:00
Barış Soner Uşaklı
5dfb2fb83a up themes, fix notif test 2017-08-18 19:00:48 -04:00
Julian Lam
c1d7b06ded Fixes #5873 
- 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.
 2017-08-18 16:30:54 -04:00
Julian Lam
1159abf9ec fixes #5879 2017-08-18 15:05:49 -04:00
Baris Usakli
dc9b21021a escape moderation notes 2017-08-18 11:23:20 -04:00
Baris Usakli
753f1576ce processSortedSet 2017-08-16 16:47:52 -04:00
Baris Usakli
bc0645dc26 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-16 15:17:26 -04:00
Baris Usakli
a9b1a0bdc4 fix tpl name 2017-08-16 15:17:10 -04:00