Andrea Cardinale
f4fca746e8
Revert "Fix missing '"
...
This reverts commit 2da2d98ae2
2017-11-05 19:21:13 +01:00
Andrea Cardinale
831e291e78
Add User (uid) Welcome Notification
2017-11-05 19:17:20 +01:00
Andrea Cardinale
dfa9aec5f3
Merge branch 'master' of https://github.com/NodeBB/NodeBB
2017-11-05 19:03:58 +01:00
Barış Soner Uşaklı
fae8ee83e8
closes #6039
2017-11-05 09:54:59 -05:00
acardinale
2da2d98ae2
Fix missing '
2017-11-04 20:31:15 +01:00
Peter Jaszkowiak
bbdc55cb3a
Better fix for #5993 ( #6034 )
...
* Better fix for #5993
Also a nice newline so the line doesn't get overwritten when running `./nodebb upgrade`
* Optimizations for custom homepage
Move it into a separate module
2017-11-04 10:51:44 -04:00
Barış Soner Uşaklı
760c061b1d
closes #5993
2017-11-03 14:23:34 -04:00
Barış Soner Uşaklı
4551ee4768
some more tests
2017-11-03 13:25:43 -04:00
Julian Lam
766f94745f
updated bootstrap and bootswatch css on installer template, closes #6033
2017-11-03 11:29:06 -04:00
Barış Soner Uşaklı
845f01f297
dont set meta.config to null
2017-11-02 18:39:36 -04:00
Barış Soner Uşaklı
662f92a4a8
supply callback to req.session.destroy
2017-11-02 18:21:25 -04:00
acardinale
b325d2184b
Fix if cover URL is external URL
...
Currently, when cover:url is an external URL, it's concat with relative path [fix barisusakli]
2017-11-02 21:18:44 +01:00
Julian Lam
7e0d0e0eb5
Merge remote-tracking branch 'origin/develop'
2017-11-02 14:13:48 -04:00
Peter Jaszkowiak
dfad76120d
Support npm@5 and yarn ( #6010 )
...
* Support npm@5 and yarn
Use package.default.json
Partial #6008
- Overwrite package.json with package.default.json values
- `dependencies` field is merged with package.default.json version taking precidence
- `./nodebb upgrade` automatically does those things and runs `git pull`
- use `./nodebb upgrade --dev` to avoid the `git pull`
* added logic to preserve extraneous plugins installed in node_modules/
* Don't automatically git pull
* Simplify package-install, run it on upgrade just in case
2017-11-02 14:12:05 -04:00
Barış Soner Uşaklı
008f757a9b
closes #6030
2017-11-02 13:16:07 -04:00
Barış Soner Uşaklı
54a84bf130
cache fixes
2017-11-02 12:56:44 -04:00
Barış Soner Uşaklı
43f9c3224f
dont crash sortedSetIncryBy on redis if no callback is supplied
2017-11-02 08:14:35 -04:00
Peter Jaszkowiak
e609e497b3
Provide more error information to logs
...
Provides full stack instead of just message
2017-11-01 18:59:48 -06:00
Peter Jaszkowiak
ec38b18e34
Always compare password with a hash
...
Prevents quick response when user / email doesn't exist
2017-11-01 18:57:52 -06:00
Baris Usakli
e3a7649290
closes #6027
2017-11-01 12:31:15 -04:00
acardinale
9afecd5a82
Fix if cover URL is external URL
...
Currently, when cover:url is an external URL, it's concat with relative path
2017-11-01 11:37:53 +01:00
Peter Jaszkowiak
adc47fd053
Use relative linking ( #6011 )
...
* Use relative linking
* Add copyFile method and tests
Closes #5988
* Fix relative linking on Windows
Hard links and junctions don't work with relative paths
* Fix tests
* Revert ghange to gitignore
2017-10-31 22:18:15 -04:00
Barış Soner Uşaklı
18f4f27fe0
closes #6024
2017-10-31 18:03:54 -04:00
Barış Soner Uşaklı
5b2a674a4f
closes #6020
2017-10-31 16:04:25 -04:00
Barış Soner Uşaklı
25cd21fba8
closes #6019
2017-10-31 10:53:28 -04:00
Barış Soner Uşaklı
6b1af76f08
closes #6015
2017-10-31 09:43:11 -04:00
Barış Soner Uşaklı
3c45b3edb6
string is removed on develop
2017-10-31 09:04:07 -04:00
Barış Soner Uşaklı
d5d6748c71
closes #6013
2017-10-30 20:20:14 -04:00
Baris Usakli
43bec4cb45
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
2017-10-30 17:08:16 -04:00
Baris Usakli
6778cce265
add new zset
2017-10-30 17:07:51 -04:00
Baris Usakli
47143a4a09
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
2017-10-30 15:29:26 -04:00
Baris Usakli
a500e0019c
closes #6005
2017-10-30 15:26:17 -04:00
Julian Lam
103d9a91a9
Revert "sanitizing uploaded filename without using slugify, in composer, re comment in: #6011 "
...
This reverts commit 9f670fe586
2017-10-30 14:45:41 -04:00
Julian Lam
cb80c7729b
linting
2017-10-30 11:41:44 -04:00
Julian Lam
39d67b5b69
Merge branch 'patch-2' of https://github.com/drlukeangel/NodeBB into drlukeangel-patch-2
2017-10-30 11:41:23 -04:00
Julian Lam
9f670fe586
sanitizing uploaded filename without using slugify, in composer, re comment in: #6011
2017-10-30 11:02:26 -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ı
9a3a5192c4
add filter:post.shouldQueue
2017-10-27 17:24:43 -04:00
Barış Soner Uşaklı
c453fc7275
add widget reset test
2017-10-26 22:42:16 -04:00
psychobunny
2453ce3cb3
strip + validate before hook instead
2017-10-26 18:27:54 -04:00
Julian Lam
98eddc78cb
escaping message text in parse.raw
2017-10-26 17:55:11 -04:00
Barış Soner Uşaklı
a11058bce2
closes #6004
2017-10-26 10:32:24 -04:00
Barış Soner Uşaklı
41fbf7117d
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
2017-10-25 18:21:54 -04:00
Barış Soner Uşaklı
a73c2628c4
cache improvements, stats
2017-10-25 18:20:44 -04:00
Barış Soner Uşaklı
316fe2773c
remove console.log
2017-10-25 10:49:17 -04:00
Barış Soner Uşaklı
2aaf6900d1
closes #5998
2017-10-25 10:48:12 -04:00
Barış Soner Uşaklı
056e4f0601
#6004
2017-10-25 09:08:03 -04:00
Barış Soner Uşaklı
ce3e1f31ab
fix for #6004
2017-10-24 17:55:45 -04:00
Peter Jaszkowiak
62ae171432
Merge remote-tracking branch 'origin/master' into develop
2017-10-23 17:13:35 -06:00
