Julian Lam
cb80c7729b
linting
2017-10-30 11:41:44 -04:00
Dr Luke Angel
999a7abc5d
updated equality operator
...
small update to equality operator
2017-10-27 22:21:48 -07:00
Dr Luke Angel
4854888fcf
update blacklist.js to strip ports from v4
...
Blacklist.test in blacklist.js to strip port from ipv4.
my site was passing in
24.18.192.75:52506
and nodebb was giving
28/10 04:34:41 [6680] - error: /login
Error: ipaddr: the address has neither IPv6 nor IPv4 format
So i updated the client Ip to strip the port number if its a v4 IP
2017-10-27 22:16:01 -07:00
Barış Soner Uşaklı
e7318a1cea
Mongo cache ( #6002 )
...
* cache mongodb objects
remove user settings cache since it is cached at the object level
* removed indexOf from isMemberOfSets
* change has to get, change maxAge to 0
2017-10-23 18:31:16 -04:00
Peter Jaszkowiak
1c35213934
Fix #5970 and forking while debugging ( #5965 )
...
* Fix forking while debugging
Debugger address in use no longer happens
* Fix cropper error
2017-10-09 11:40:36 -04:00
Julian Lam
6852c92ed6
Merge remote-tracking branch 'origin/develop'
2017-10-03 13:37:43 -04:00
RoiEX
1fd160a4e6
Add Support for Firefox OSD
2017-10-03 09:43:33 -04:00
Barış Soner Uşaklı
b70f328520
closes #5948
2017-10-02 19:27:57 -04:00
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
2017-10-02 09:24:27 -04:00
Peter Jaszkowiak
dc87d7fc0f
Use .js instead of .jst
...
Fix #5934
2017-09-23 12:51:20 -06:00
Julian Lam
26d4c18340
Merge remote-tracking branch 'origin/master' into develop
2017-09-08 11:40:54 -04:00
Julian Lam
2c2a28c5b6
closes #5919
2017-09-08 11:37:51 -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
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
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
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
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
psychobunny
0e219a8c58
closes #5891
2017-08-21 17:48:58 -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
Julian Lam
1159abf9ec
fixes #5879
2017-08-18 15:05:49 -04:00
Baris Usakli
bc6b1a8f56
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# public/src/admin/extend/plugins.js
2017-08-11 11:33:06 -04:00
Julian Lam
5fc6fe1c80
closes #5162
2017-08-02 12:27:27 -04:00
Baris Usakli
e071f94173
test debugParams.js
2017-08-01 16:51:21 -04:00
Baris Usakli
875672522e
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# src/search.js
2017-07-28 14:19:09 -04:00
Barış Soner Uşaklı
911eb32e70
fix var names
2017-07-27 19:45:54 -04:00
Barış Soner Uşaklı
f646e08a6e
update tags/links for 1.5.4
2017-07-27 19:40:11 -04:00
Julian Lam
f29b9f29f9
added missing setImmediate
2017-07-17 12:23:11 -04:00
Julian Lam
c40b11aa6e
updated site upload logic so that site logo is resized for email header, implemented site logo in email header
2017-07-17 10:47:56 -04:00
Baris Usakli
2d875a99cb
fix data
2017-07-11 13:59:29 -04:00
Baris Usakli
dc110e2e3f
closes #5818
2017-07-11 13:44:51 -04:00
Barış Soner Uşaklı
091fec8d6f
removed unnecessary code
2017-07-04 17:54:51 -04:00
Baris Usakli
cf444755df
closes #5729
2017-06-20 14:23:21 -04:00
Julian Lam
3e6a779dbc
Merge remote-tracking branch 'origin/master'
2017-06-02 15:06:44 -04:00
Julian Lam
6728e9a5cc
#5729
2017-06-02 15:01:24 -04:00
Barış Soner Uşaklı
14ea9a0dd6
Merge pull request #5716 from NodeBB/import-export-ref
...
Import export cleanup
2017-06-02 13:37:16 -04:00
Peter Jaszkowiak
8e5bcf6105
Fix #5727
2017-06-01 14:16:07 -06:00
Peter Jaszkowiak
e71fb9ab24
Fix node --inspect
2017-06-01 14:15:40 -06:00
Peter Jaszkowiak
9a3b684228
Remove dependency, ignore package-lock.json
2017-06-01 14:15:30 -06:00
Peter Jaszkowiak
b60dbe7d1e
Unwrap meta modules
2017-05-31 16:24:23 -06:00
psychobunny
c94365aefd
closes #5721
2017-05-31 16:35:18 -04:00
Baris Usakli
da8b1b605c
#5723
2017-05-30 17:21:34 -04:00
Peter Jaszkowiak
3c2d4fe649
Switch from underscore to lodash
2017-05-27 14:51:45 -06:00
Barış Soner Uşaklı
890c2eff70
style changes
2017-05-27 01:44:26 -04:00
