Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-27 09:49:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,502 Commits 71 Branches 489 Tags
61deb962e374cb38ce279f7e86fc59848ed9fed6
Commit Graph

1407 Commits

Author SHA1 Message Date
Julian Lam
61deb962e3 adding notifications.get hook 2017-07-27 22:17:56 -04:00
Julian Lam
84c1a182e5 Merge remote-tracking branch 'origin/master' into develop 2017-07-25 12:28:43 -04:00
Barış Soner Uşaklı
9d69224329 up themes fix altenate_logins to be bool 2017-07-22 19:05:22 -04: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
Barış Soner Uşaklı
eecc680761 style 2017-07-17 18:16:23 -04:00
dbolack-ab
c1452db0ba Adds the filter:uploadStored hook which fires after the file is saved… (#5798) 
* Adds the filter:uploadStored hook which fires after the file is saved in the async waterfall and passes:
                       var storedFile = {
                       url: nconf.get('relative_path') + upload.url,
                       path: upload.path,
                       name: uploadedFile.name,
               }
               plugins.fireHook( 'filter:uploadStored', { uploadedFile: uploadedFile, storedFile: storedFile } );

* Corrections per PR. Should match style guide.

* Correction attempts take 2.

Per:

/home/travis/build/NodeBB/NodeBB/src/controllers/uploads.js

  234:5    error  Missing semicolon                            semi

  235:3    error  Expected indentation of 3 tabs but found 2   indent

  235:19   error  There should be no spaces inside this paren  space-in-parens

  235:105  error  There should be no spaces inside this paren  space-in-parens

  236:3    error  Expected indentation of 3 tabs but found 2   indent

* next() shouldn't fire twice, but I see no documentation suggesting that the paramaters will fire correctly.

Previous comments imply it is preferred to have fireHook fire fof the callback rather than having it happen next,  so I'm wrapping next in an anonymous function to ensure it passes the parameters.

If this is not the preferred method, please provide a thorough correction.

* Meh. Figuring out this style requirement is so hit and miss.

* Corrected for proper callback? technique.

Might blow up on style. Will watch.
 2017-07-17 18:15:24 -04:00
Julian Lam
c40b11aa6e updated site upload logic so that site logo is resized for email header, implemented site logo in email header 2017-07-17 10:47:56 -04:00
Barış Soner Uşaklı
cc4f4e7282 style changes 2017-07-15 16:57:41 -04:00
Baris Usakli
ea29e3e250 simpler call to validateFilters 2017-07-13 15:01:29 -04:00
Baris Usakli
30199f921e Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-07-11 15:47:54 -04:00
Julian Lam
701ba73883 updated homepage route logic so that it is all contained in the local function (and plugin hook receives all entries, including custom) @barisusakli 2017-07-11 15:40:47 -04:00
Julian Lam
c2f1d254cc Merge branch 'master' into develop 2017-07-10 16:36:09 -04:00
Baris Usakli
e036e26238 closes #5813 2017-07-10 14:55:57 -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
b7e8ecc6d3 updated mentions version and changed topics filter to take its translation from global hash instead 2017-07-05 16:43:46 -04:00
Barış Soner Uşaklı
b807d3750c encodeURI redirect url 2017-07-05 11:36:35 -04:00
Julian Lam
3f2c183cbd Merge branch 'master' into develop 2017-07-04 10:39:51 -04:00
Peter Jaszkowiak
6cb8440715 Fix #5793 
Use a custom header instead
 2017-06-30 23:38:31 -06:00
Julian Lam
8a7950bfd5 add new hook to allow plugins to modify list of valid filters 2017-06-29 14:17:29 -04:00
Barış Soner Uşaklı
e6cbaf6d85 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-06-26 15:38:31 -04:00
Baris Usakli
1f5b3ba636 closes #5771 2017-06-23 15:57:23 -04:00
Barış Soner Uşaklı
0f234601f1 style changes 2017-06-22 19:03:49 -04:00
Barış Soner Uşaklı
78005d6124 show old groups first 2017-06-22 18:12:35 -04:00
Baris Usakli
1b0c6741f8 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-06-22 14:52:49 -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
psychobunny
228e9ab8e3 proof of concept for #5740 2017-06-20 16:12:55 -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
Ben Lubar
07982a3fa2 Fix uploading a file with no extension resulting in invalid-extension even if the file extension list is blank (allow all) 2017-06-16 10:37:23 -05:00
Barış Soner Uşaklı
d9e84b1db8 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-06-13 20:58:19 -04:00
Barış Soner Uşaklı
b13ed26587 closes #5755 2017-06-13 20:15:48 -04:00
Baris Usakli
982184740d small refactor of category controller 2017-06-08 12:39:12 -04:00
Baris Usakli
037a0e5239 closes #5742 
also fix reverse infinite scroll when sorting is changed
 2017-06-06 16:40:32 -04:00
Peter Jaszkowiak
44e55d2a98 Less synchronous stuffs 2017-06-01 14:14:43 -06:00
Baris Usakli
da8b1b605c #5723 2017-05-30 17:21:34 -04:00
psychobunny
88d5f97280 closes #5717 2017-05-29 17:12:02 -04:00
Baris Usakli
d7684b042f fix tab 2017-05-29 14:52:10 -04:00
Baris Usakli
1fa52267d4 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/src/admin/manage/category.js
 2017-05-29 14:48:25 -04:00
Baris Usakli
de5fe25e57 closes #5715 2017-05-29 14:47:01 -04:00
Barış Soner Uşaklı
59b1d8fbae Merge pull request #5710 from NodeBB/_lodash 
Switch from underscore to lodash
 2017-05-29 13:38:21 -04:00
Baris Usakli
dc0971c122 up composer 2017-05-29 13:13:16 -04:00
Barış Soner Uşaklı
9664033b73 add memory usage to info page 2017-05-28 18:40:32 -04:00
Barış Soner Uşaklı
08aaabd33c closes #5642 2017-05-27 23:32:55 -04:00
Peter Jaszkowiak
3c2d4fe649 Switch from underscore to lodash 2017-05-27 14:51:45 -06:00
Barış Soner Uşaklı
bcc566fb68 remove unnecessary checks 2017-05-27 00:47:04 -04:00
Baris Usakli
11d9410229 fix test and image normalize test 2017-05-26 16:37:31 -04:00
Baris Usakli
081ac6535c style change 2017-05-26 16:14:25 -04:00