Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-14 17:56:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,829 Commits 74 Branches 483 Tags
cb80c7729b5afaf3c110d5926cb07b35ab4caffe
Commit Graph

482 Commits

Author SHA1 Message Date
Baris Usakli
f1f8a587d4 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 
# Conflicts:
#	package.json
 2017-07-13 15:02:23 -04:00
Barış Soner Uşaklı
0f5be5ae25 remove plugin.hook check 2017-07-12 19:44:35 -04:00
Julian Lam
c2f1d254cc Merge branch 'master' into develop 2017-07-10 16:36:09 -04:00
Barış Soner Uşaklı
923bd86662 Widgets refactor (#5817) 
* widgets refactor

render widgets server side
widgets can use all the data the template can use

* fix tests
 2017-07-10 12:54:45 -04:00
Baris Usakli
e0de922ede Revert "widgets refactor" 
This reverts commit 9e94edb5aa.
 2017-07-07 15:35:06 -04:00
Baris Usakli
9e94edb5aa widgets refactor 
render widgets server side
widgets can use all the data the template can use
 2017-07-07 15:33:16 -04:00
Julian Lam
121a629de6 linting 2017-07-07 12:10:42 -04:00
Julian Lam
09621a3a3d fixes #5776 2017-07-07 11:56:28 -04:00
Julian Lam
3f2c183cbd Merge branch 'master' into develop 2017-07-04 10:39:51 -04:00
Peter Jaszkowiak
1471fbdc14 Fix tests 2017-07-02 16:26:31 -06:00
Baris Usakli
5167c1aa4f Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-06-28 14:19:29 -04:00
Baris Usakli
2f8f69d6af test monthly digest 2017-06-28 13:27:47 -04:00
Baris Usakli
74ed033e4a fix digest test 2017-06-28 13:18:37 -04:00
Marc-Aurèle DARCHE
6248e5562f Fix /apple-touch-icon not sending uploaded file 
This fixes the following error:

$ wget https://nodebb.yourdomain/apple-touch-icon

28/6 09:57:06 [28332] - error: /apple-touch-icon
 Error: ENOENT: no such file or directory, stat '/home/sweet/nodebb/public/assets/uploads/system/touchicon-orig.png'
    at Error (native)
 2017-06-28 15:02:17 +02:00
Baris Usakli
1b0c6741f8 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-06-22 14:52:49 -04:00
Barış Soner Uşaklı
8d8f0a391f Merge pull request #5769 from NodeBB/private-feeds 
Private feeds, closes #5740
 2017-06-22 13:20:41 -04:00
Baris Usakli
77994dcf69 fix link tag url 2017-06-22 13:04:24 -04:00
Baris Usakli
ef9e656f34 closes #5740 
added token to topic page as well
check privilege even if token is provided
tests
 2017-06-22 12:44:37 -04:00
Julian Lam
d98b3e8056 automatically lowercasing env vars in nconf, fixes #2544 2017-06-22 11:10:23 -04:00
Barış Soner Uşaklı
7fe9366103 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-06-16 17:35:45 -04:00
Barış Soner Uşaklı
be79b85526 fix test 2017-06-16 15:02:06 -04:00
Barış Soner Uşaklı
d65f494c6d closes #5127 2017-06-16 14:25:40 -04:00
Baris Usakli
0ea4ee7dda Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-06-15 14:05:45 -04:00
Baris Usakli
4903585d88 refactor userPrivileges and groupPrivileges 2017-06-15 14:02:51 -04:00
Baris Usakli
037a0e5239 closes #5742 
also fix reverse infinite scroll when sorting is changed
 2017-06-06 16:40:32 -04:00
Barış Soner Uşaklı
e56178f72e remove init socket.io 2017-06-02 17:18:58 -04:00
Barış Soner Uşaklı
4f31dec82c reduce usage of io.emit in tests 2017-06-02 16:51:36 -04:00
Barış Soner Uşaklı
5a55c882ab convert NaN uids to 0 2017-06-01 16:17:08 -04:00
Barış Soner Uşaklı
92376a1589 fix calls 2017-05-31 13:13:16 -04:00
Barış Soner Uşaklı
eb0faf1e4a change test to use new signature 2017-05-31 13:08:45 -04:00
Barış Soner Uşaklı
932247f440 up deps 2017-05-28 17:21:49 -04:00
Barış Soner Uşaklı
3049f5cf1f #5522 test 2017-05-28 01:26:56 -04:00
Barış Soner Uşaklı
08aaabd33c closes #5642 2017-05-27 23:32:55 -04:00
Barış Soner Uşaklı
f1b8492164 remove unnecessary checks 2017-05-27 00:30:07 -04:00
Barış Soner Uşaklı
3d1b1a9423 closes #5706 2017-05-26 23:21:46 -04:00
Barış Soner Uşaklı
9ec65db539 closes #5711 2017-05-26 21:52:08 -04:00
Barış Soner Uşaklı
271c10c9d7 dont create indices after every test 2017-05-26 21:14:52 -04:00
Peter Jaszkowiak
b171f3072b Fix many "duplicate key" errors 
- Reset defaults after every test
- Remove individual `after(db.emptydb)` calls
- Fix async.every in groups test
- Update plugin list in socket tests
 2017-05-26 17:16:59 -06:00
Baris Usakli
61eb7aa68b more tests 2017-05-26 16:56:26 -04:00
Baris Usakli
11d9410229 fix test and image normalize test 2017-05-26 16:37:31 -04:00
Baris Usakli
9efa46c65a more account tests 2017-05-26 16:11:47 -04:00
Peter Jaszkowiak
5f36156e0d Fix tests on Windows with CRLF 2017-05-26 12:51:05 -06:00
Peter Jaszkowiak
8901dad6f2 Revert "fix concat test on windows" 
This reverts commit d1dd0cd6df.
 2017-05-26 12:49:38 -06:00
Baris Usakli
69b5bb39ec unread tests 2017-05-26 14:25:19 -04:00
Baris Usakli
d1dd0cd6df fix concat test on windows 2017-05-26 13:12:17 -04:00
Barış Soner Uşaklı
466e6d7c53 make renameGroup public for #5706 2017-05-26 00:26:25 -04:00
Barış Soner Uşaklı
f6ac92111b style changes 2017-05-26 00:02:20 -04:00
Barış Soner Uşaklı
79a48cec5f controllers/category tests 2017-05-25 20:01:07 -04:00
Baris Usakli
062bced3dd cleanup and tests 2017-05-25 16:40:07 -04:00
Peter Jaszkowiak
9ef2b5a003 Don't use uglify compress 2017-05-25 12:18:35 -06:00