Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 03:26:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,309 Commits 74 Branches 483 Tags
5bfcd34c2529211f8efb51a239c99cde511af692
Commit Graph

1498 Commits

Author SHA1 Message Date
Baris Usakli
de55c8e431 closes #4070 2017-08-02 13:03:39 -04:00
Baris Usakli
e071f94173 test debugParams.js 2017-08-01 16:51:21 -04:00
Julian Lam
303f1146b2 added upload_url to nconf vars @pitaj 2017-07-28 17:16:05 -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
Baris Usakli
a9dbdc75af closes #5825 2017-07-26 14:32:53 -04:00
Barış Soner Uşaklı
b3f6c423c6 fix test 2017-07-25 18:23:21 -04:00
Baris Usakli
5ce9f898b2 fix test 2017-07-25 16:23:43 -04:00
Julian Lam
84c1a182e5 Merge remote-tracking branch 'origin/master' into develop 2017-07-25 12:28:43 -04:00
Baris Usakli
e9639833c5 add router.all 2017-07-25 12:11:11 -04:00
Julian Lam
1247b4b53b linting 2017-07-25 11:07:48 -04:00
Baris Usakli
28073cc91a lint 2017-07-24 12:28:14 -04:00
Peter Jaszkowiak
904f22522e Merge pull request #5821 from NodeBB/scoped-plugins 
Support scoped plugin npm packages
Also fix logging in VS Code with the inspector debugger
 2017-07-21 10:28:46 -06:00
Julian Lam
184dacf1d7 Merge branch 'master' into develop 2017-07-20 13:19:41 -04:00
Julian Lam
c4fbed24f8 Squashed commit of the following: 
commit 9c86d9b2904e14927cd7e9679b92aec0951d1063
Merge: ebfa63a 5a7f811
Author: Julian Lam <julian@nodebb.org>
Date:   Thu Jul 20 08:41:39 2017 -0400

    Merge branch 'noscript-login' of https://github.com/An-dz/NodeBB into noscript

commit 5a7f81185e
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Mon Jul 17 23:07:14 2017 -0300

    Rename clashing variable 'next'

commit ebfa63a984073a58c17aa408c363cdb03ef89985
Merge: c1801cd f159d0d
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Jul 17 16:30:40 2017 -0400

    Merge branch 'noscript-logout' of https://github.com/An-dz/NodeBB into noscript

commit c1801cda14e6363491e30b659902e2ae71f7e1f7
Merge: 7a5f9f3 9fd542d
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Jul 17 16:30:31 2017 -0400

    Merge branch 'noscript-register' of https://github.com/An-dz/NodeBB into noscript

commit 7a5f9f35abc834bb72ddddc9ca07d34f2fde8353
Merge: 44851f9 d37b95c
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Jul 17 16:30:10 2017 -0400

    Merge branch 'noscript-compose' of https://github.com/An-dz/NodeBB into noscript

commit f159d0d9ef
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Thu Jul 6 12:16:38 2017 -0300

    Prevent form submit

    Required for theme change

commit d37b95cb71
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Thu Jul 6 01:49:52 2017 -0300

    Prevent link action with scripts

    Required for the theme change that changes the buttons to `a` tags.

commit 9fd542d897
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Wed Jul 5 19:57:56 2017 -0300

    Fix tests

commit cdad5bf8c2
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Wed Jul 5 19:09:17 2017 -0300

    Update error handling

commit 4ff11cd136
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Wed Jul 5 17:29:08 2017 -0300

    Remove async waterfall

commit df01d44e82
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Wed Jul 5 16:59:43 2017 -0300

    Set noscript compose as noscript at start

commit 4bcc380da7
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Wed Jul 5 16:59:12 2017 -0300

    Remove last useless next

commit b5eac6fea1
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sun Jul 2 18:35:08 2017 -0300

    Last function requires no next

commit 20a5cce6e6
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sun Jul 2 18:06:58 2017 -0300

    Remove more useless next calls

commit 85ee22a79b
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sun Jul 2 17:46:07 2017 -0300

    Remove useless next calls

commit 7d984c47ad
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sun Jul 2 15:45:31 2017 -0300

    Support old themes

commit 4a09dfbd08
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sun Jul 2 15:37:23 2017 -0300

    Moved all error handling into helpers function

commit 391aa6e67e
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Thu Jun 8 15:37:37 2017 -0300

    ESLint - Fix mixed conditionals

commit 80ccc6fd58
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sat Jun 3 18:08:15 2017 -0300

    Compose without scripts

commit 2aca811256
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sat Jun 3 18:00:44 2017 -0300

    Register without scripts

commit 097bb51577
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sat Jun 3 16:42:15 2017 -0300

    Logout without scripts

commit d497e08109
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Sat Jun 3 16:27:10 2017 -0300

    Login without script
 2017-07-20 08:51:04 -04:00
Peter Jaszkowiak
dc324b36b2 Add test for Plugins.showInstalled 2017-07-19 12:18:57 -06:00
Baris Usakli
18181260e7 closes #5836 2017-07-18 13:36:21 -04:00
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