Commit Graph

550 Commits (df86c2ff3fabaeeb7c0411c6f391d548edd094ae)

Author SHA1 Message Date
Baris Usakli bc6b1a8f56 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	public/src/admin/extend/plugins.js
Baris Usakli 24bbf8fe00 closes
Baris Usakli de55c8e431 closes
Baris Usakli e071f94173 test debugParams.js
Julian Lam 303f1146b2 added upload_url to nconf vars @pitaj
Baris Usakli 875672522e Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	src/search.js
Baris Usakli a9dbdc75af closes
Barış Soner Uşaklı b3f6c423c6 fix test
Baris Usakli 5ce9f898b2 fix test
Julian Lam 84c1a182e5 Merge remote-tracking branch 'origin/master' into develop
Baris Usakli e9639833c5 add router.all
Julian Lam 1247b4b53b linting
Baris Usakli 28073cc91a lint
Peter Jaszkowiak 904f22522e Merge pull request from NodeBB/scoped-plugins
Support scoped plugin npm packages
Also fix logging in VS Code with the inspector debugger
Julian Lam 184dacf1d7 Merge branch 'master' into develop
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 5a7f81185e8f9bd7d2d011c3d495988be7e437a3
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 f159d0d9ef1b7f600e830a96fdb4b9c87c79bb4a
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Thu Jul 6 12:16:38 2017 -0300

    Prevent form submit

    Required for theme change

commit d37b95cb71d32d4483190609798e244c331db165
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 9fd542d8970b7d1a4126f4edc4b44eab7d708fb0
Author: André Zanghelini <an_dz@simutrans-forum>
Date:   Wed Jul 5 19:57:56 2017 -0300

    Fix tests

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

    Update error handling

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

    Remove async waterfall

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

    Set noscript compose as noscript at start

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

    Remove last useless next

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

    Last function requires no next

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

    Remove more useless next calls

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

    Remove useless next calls

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

    Support old themes

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

    Moved all error handling into helpers function

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

    ESLint - Fix mixed conditionals

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

    Compose without scripts

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

    Register without scripts

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

    Logout without scripts

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

    Login without script
Peter Jaszkowiak dc324b36b2 Add test for Plugins.showInstalled
Baris Usakli 18181260e7 closes
Baris Usakli f1f8a587d4 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	package.json
Barış Soner Uşaklı 0f5be5ae25 remove plugin.hook check
Julian Lam c2f1d254cc Merge branch 'master' into develop
Barış Soner Uşaklı 923bd86662 Widgets refactor ()
* widgets refactor

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

* fix tests
Baris Usakli e0de922ede Revert "widgets refactor"
This reverts commit 9e94edb5aa.
Baris Usakli 9e94edb5aa widgets refactor
render widgets server side
widgets can use all the data the template can use
Julian Lam 121a629de6 linting
Julian Lam 09621a3a3d fixes
Julian Lam 3f2c183cbd Merge branch 'master' into develop
Peter Jaszkowiak 1471fbdc14 Fix tests
Baris Usakli 5167c1aa4f Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Baris Usakli 2f8f69d6af test monthly digest
Baris Usakli 74ed033e4a fix digest test
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)
Baris Usakli 1b0c6741f8 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Barış Soner Uşaklı 8d8f0a391f Merge pull request from NodeBB/private-feeds
Private feeds, closes 
Baris Usakli 77994dcf69 fix link tag url
Baris Usakli ef9e656f34 closes
added token to topic page as well
check privilege even if token is provided
tests
Julian Lam d98b3e8056 automatically lowercasing env vars in nconf, fixes
Barış Soner Uşaklı 7fe9366103 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Barış Soner Uşaklı be79b85526 fix test
Barış Soner Uşaklı d65f494c6d closes
Baris Usakli 0ea4ee7dda Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Baris Usakli 4903585d88 refactor userPrivileges and groupPrivileges
Baris Usakli 037a0e5239 closes
also fix reverse infinite scroll when sorting is changed
Barış Soner Uşaklı e56178f72e remove init socket.io
Barış Soner Uşaklı 4f31dec82c reduce usage of io.emit in tests
Barış Soner Uşaklı 5a55c882ab convert NaN uids to 0
Barış Soner Uşaklı 92376a1589 fix calls
Barış Soner Uşaklı eb0faf1e4a change test to use new signature
Barış Soner Uşaklı 932247f440 up deps
Barış Soner Uşaklı 3049f5cf1f test
Barış Soner Uşaklı 08aaabd33c closes
Barış Soner Uşaklı f1b8492164 remove unnecessary checks
Barış Soner Uşaklı 3d1b1a9423 closes
Barış Soner Uşaklı 9ec65db539 closes
Barış Soner Uşaklı 271c10c9d7 dont create indices after every test
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
Baris Usakli 61eb7aa68b more tests
Baris Usakli 11d9410229 fix test and image normalize test
Baris Usakli 9efa46c65a more account tests
Peter Jaszkowiak 5f36156e0d Fix tests on Windows with CRLF
Peter Jaszkowiak 8901dad6f2 Revert "fix concat test on windows"
This reverts commit d1dd0cd6df.
Baris Usakli 69b5bb39ec unread tests
Baris Usakli d1dd0cd6df fix concat test on windows
Barış Soner Uşaklı 466e6d7c53 make renameGroup public for
Barış Soner Uşaklı f6ac92111b style changes
Barış Soner Uşaklı 79a48cec5f controllers/category tests
Baris Usakli 062bced3dd cleanup and tests
Peter Jaszkowiak 9ef2b5a003 Don't use uglify compress
Peter Jaszkowiak 53eced6be0 uglify-js@3, JS source maps 🍰
Julian Lam fc4f016932 Merge pull request from NodeBB/plugin-load-ref
Plugin load refactor
Peter Jaszkowiak c85bf9202d Fix tests sometimes failing
Barış Soner Uşaklı d301139644 logger test
Barış Soner Uşaklı b0dd1ad4d7 admin navigation test
Barış Soner Uşaklı 5cb53406fe more picture tests
Peter Jaszkowiak 3dd282b7b9 Load languages with other plugin data
- Added more tests
- Should speed up builds
- Allows for incremental builds in the future
Barış Soner Uşaklı 29135dfed3 timeago locale test
Barış Soner Uşaklı 8205d6c897 test login after lock
Barış Soner Uşaklı 2bddd57a2e test account lock
Barış Soner Uşaklı b29745aa44 more auth tests
Barış Soner Uşaklı b8cc67dfff social tests
Peter Jaszkowiak cd1f0ddc79 Resolve merge conflicts
Barış Soner Uşaklı b2cef4846c Merge pull request from NodeBB/build-tests
Tests for `./nodebb build`
Barış Soner Uşaklı e4714a0c58 more auth tests
Barış Soner Uşaklı 1e83d33283 tests for login
Peter Jaszkowiak 62546bc4fd Build tests
Peter Jaszkowiak d988e8a50f Test minifier
Barış Soner Uşaklı 64c7907e6c added recent.rss
Barış Soner Uşaklı a4ba88dc60 more feed tests
Barış Soner Uşaklı c5c755fbb0 more notification tests
Barış Soner Uşaklı 9af252b899 notifications tests
Barış Soner Uşaklı c364cebbe4 more tests
Barış Soner Uşaklı 7fb45cc148 more tests
Barış Soner Uşaklı 769d2b00b1 change test method call
Barış Soner Uşaklı 9fdd313e30 tweak test
Barış Soner Uşaklı 4b94446cd9 more user search tests
Barış Soner Uşaklı fe0a5aaf28 fix redis tests
Barış Soner Uşaklı fd0043f36a more tests
Barış Soner Uşaklı 77894915eb closes
Barış Soner Uşaklı 8f8e7202e5 fix lint
Barış Soner Uşaklı fd47e23057 test login for non-existant user
Barış Soner Uşaklı 95196ceedc closes
Barış Soner Uşaklı 4ab514a422 test for .delete with zset
Peter Jaszkowiak 90da6d889d Only load necessary plugin data
Fix tests to work in this case
Add more verbose messages to plugins/data
Barış Soner Uşaklı e49f33317d digest cleanup and tests
Julian Lam d3d58b77d9 added test for custom date range ACP,
Barış Soner Uşaklı ed9a429ca9 test invalid expiry
Barış Soner Uşaklı a28b76861d perma and temp ban test
Barış Soner Uşaklı 33023ea419 create a notif before pruning
Barış Soner Uşaklı 6fdad4b002 fix test on redis
Barış Soner Uşaklı 8920523e06 more tests
Barış Soner Uşaklı 5e3946a6be teaser tests
Barış Soner Uşaklı 376c71adda group search tests
Barış Soner Uşaklı 6049c46f15 meta dependecy tests
Barış Soner Uşaklı 01e2263c01 more tests
Julian Lam 4c00a5ece6 fixing tests
Baris Usakli 0f05ae4ac1 filterpidsbycid tests
Baris Usakli 51a85031f7 utils tests
Julian Lam c64f0065bc Merge pull request from banyudu/patch-1
fix indent
Julian Lam 5ea8145cff Merge pull request from NodeBB/sounds-fix
Fix soundpacks not working, auto install dependencies, defer logging in tests
Barış Soner Uşaklı 052afb10f7 show output if upload fails
Barış Soner Uşaklı e252c5195d coverPhoto tests
Barış Soner Uşaklı 608a7d120c error handler tests
Barış Soner Uşaklı 73f31640d7 more tests
Barış Soner Uşaklı 873801e9f3 fix test on nodev4 remove console.logs
Barış Soner Uşaklı 66dee3452f more tests for admin uploads
Peter Jaszkowiak 970c7a8caa Defer winston logging until after tests
Barış Soner Uşaklı 17b57be835 Merge pull request from NodeBB/utils-rtrim
Deprecate non-standard `String.prototype.rtrim`
Peter Jaszkowiak 2b2544a4b1 Deprecate non-standard `String.prototype.rtrim`
Barış Soner Uşaklı ca17975422 osd route test
Barış Soner Uşaklı bf78786a68 flag controller tests
Barış Soner Uşaklı 36a2ac0ebd add test for user settings cache issue
Barış Soner Uşaklı 6fcd12eafe fix tests
Barış Soner Uşaklı 7ac031775a locale test change
Barış Soner Uşaklı 3a1eba2537 merge
Yudu Ban a76a8b57cd fix indent
Use space instead of Tab
Barış Soner Uşaklı 7a6b685aa0 if the main and last post is purged, purge the topic as well
Peter Jaszkowiak 6432c02ab8 Add tests
barisusakli d8170d5d1c fix tests
barisusakli 38e16ca8f6 Merge branch 'master' into develop
barisusakli 65a65b19c0 tests for
barisusakli 4d1b8d7460 fix lint
barisusakli 92343eb2e1 fix mongo setObject if key/value is empty string
barisusakli da7bc5bb7a test fix
barisusakli b8c606cbbd closes
Julian Lam a141835cf8 Merge branch 'master' into develop
barisusakli 7ce6c1d0ad closes
Peter Jaszkowiak 1fb48ef7a7 Fix ()
* Fix 
Escape translation tokens in topic titles, descriptions, profile about, and post contents

* Fix tests
Peter Jaszkowiak 484a800327 Merge branch master into develop
Peter Jaszkowiak 980e9026f3 Fix , translator ignores unclosed tokens
Julian Lam 0e157d93ea Merge remote-tracking branch 'origin/master' into develop