Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-06 20:41:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,902 Commits 74 Branches 492 Tags
f4fca746e89d8c8b9515515bdbc42d449ebe0194
Commit Graph

15902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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ı
0316f51cdb show values if test fails 2017-11-05 10:16:02 -05:00
Barış Soner Uşaklı
43370c1ced up composer-default 2017-11-05 10:11:18 -05:00
Barış Soner Uşaklı
fae8ee83e8 closes #6039 2017-11-05 09:54:59 -05:00
Misty (Bot)
6958ec1f1f Latest translations and fallbacks 2017-11-05 09:25:31 +00: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
Misty (Bot)
9728b80c38 Latest translations and fallbacks 2017-11-04 09:24:51 +00:00
Barış Soner Uşaklı
80ecd4ba6d closes #6036 2017-11-03 16:32:33 -04:00
Barış Soner Uşaklı
760c061b1d closes #5993 2017-11-03 14:23:34 -04:00
Julian Lam
2a97772aae up mentions 2017-11-03 14:05:01 -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
Julian Lam
8edbb4f8f6 update Dockerfile as per #6010 and #6008 2017-11-03 11:18:41 -04:00
Misty (Bot)
9fce645d80 Latest translations and fallbacks 2017-11-03 09:24:11 +00: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
Barış Soner Uşaklı
8810f0f2a9 remove dupe meta 2017-11-02 14:55:09 -04:00
Julian Lam
d998d53902 update themes for #5980 and 733 2017-11-02 14:22:28 -04: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ı
6c6d177a31 up themes 2017-11-02 13:45:14 -04:00
Barış Soner Uşaklı
b74fe98dc4 closes #6031 2017-11-02 13:35:49 -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
Julian Lam
2123e2f74c updated tinycon lib 2017-11-02 12:29:14 -04:00
Barış Soner Uşaklı
3dd83237b8 add some debug for failed tests 2017-11-02 08:58:51 -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
Misty (Bot)
3853c741d3 Latest translations and fallbacks 2017-11-02 09:25:12 +00: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
Andrew Rodrigues
b7cda02830 added security email 2017-11-01 15:02:56 -04:00
Baris Usakli
e3a7649290 closes #6027 2017-11-01 12:31:15 -04:00
Baris Usakli
c9465403f5 closes #6023 2017-11-01 12:05:06 -04:00
Chế Tiệp Chân Khoa
2b99fb0c38 update node version requirement on README (#6025) 2017-11-01 08:20:04 -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
Julian Lam
e42ff47e5c closes #6018 2017-10-31 12:19:28 -04:00
Barış Soner Uşaklı
25cd21fba8 closes #6019 2017-10-31 10:53:28 -04:00
Barış Soner Uşaklı
b3227c7742 up composer 2017-10-31 10:02:27 -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