Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-19 22:12:54 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,742 Commits 69 Branches 489 Tags
da9da8190f1ca345b3da89b2ac5d4a9f1db403bb
Commit Graph

1438 Commits

Author SHA1 Message Date
Peter Jaszkowiak
da9da8190f Bump dependencies 
Bumping eslint & configs meant making some linting fixes

For future reference, the `xmlhttprequest-ssl` library must be of equal versioning to the one in `engine.io-client`, otherwise it won't be deduped which causes the socket.io tests to fail
 2017-10-02 09:24:27 -04:00
Peter Jaszkowiak
dc87d7fc0f Use .js instead of .jst 
Fix #5934
 2017-09-23 12:51:20 -06:00
Barış Soner Uşaklı
f989988178 closes #1668 2017-09-22 10:26:03 -04:00
Baris Usakli
852396e60d closes #5903 2017-09-21 13:50:24 -04:00
Julian Lam
38a7030639 Revert "Merge pull request #5923 from NodeBB/patch-5922" 
This reverts commit f8ddabc884, reversing
changes made to 4976d13013.
 2017-09-11 15:37:18 -04:00
Peter Jaszkowiak
f40d37ad48 Fix #5922 2017-09-08 13:23:30 -06:00
Baris Usakli
1358a89305 closes #5907 2017-09-01 18:40:34 -04:00
Peter Jaszkowiak
23e7222dfa Update Nodemailer to v4 
also filter out .jst files from email template dropdowns
 2017-08-30 14:26:41 -06:00
Barış Soner Uşaklı
5cc39e8546 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 
# Conflicts:
#	package.json
#	src/views/admin/manage/ip-blacklist.tpl
 2017-08-24 19:29:15 -04:00
Julian Lam
53ca6d1199 closes #5889 2017-08-24 12:39:57 -04:00
Julian Lam
81cf8f77d3 add blacklist test to onSuccessfulLogin as well 2017-08-23 12:14:14 -04:00
Barış Soner Uşaklı
fcce96efab style change 2017-08-21 16:51:42 -04:00
Barış Soner Uşaklı
ff88be91fa Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-18 20:09:40 -04:00
Barış Soner Uşaklı
5344edc2a7 closes #5885 2017-08-18 20:08:19 -04:00
Baris Usakli
dc9b21021a escape moderation notes 2017-08-18 11:23:20 -04:00
Baris Usakli
bc0645dc26 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-16 15:17:26 -04:00
Baris Usakli
0ce3e4b691 post-queue show category, send notification 2017-08-16 15:15:58 -04:00
Baris Usakli
575c9a41cd Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-15 13:00:18 -04:00
Barış Soner Uşaklı
f161bbf956 Post queue (#5878) 
* #5876

* add user to post queue table

* add time of post into queue

add posting restrictions to queue

* fix shouldQueueLogic for guests

* add test for post-queue route
 2017-08-15 12:59:40 -04:00
Barış Soner Uşaklı
fc0e5421d6 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-12 20:37:12 -04:00
Baris Usakli
c21f64c27f closes #5872 2017-08-11 14:22:02 -04:00
Baris Usakli
27a6b8a713 lint fixes 2017-08-11 11:55:46 -04:00
Baris Usakli
bc6b1a8f56 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 
# Conflicts:
#	public/src/admin/extend/plugins.js
 2017-08-11 11:33:06 -04:00
Julian Lam
d9ad26c7c5 the meat of #5862, making chat loading not require an ajaxification 2017-08-10 17:00:43 -04:00
Baris Usakli
de55c8e431 closes #4070 2017-08-02 13:03:39 -04:00
Baris Usakli
c0861277de closes #5775 2017-08-01 14:36:55 -04:00
Julian Lam
d06f114705 comma DANGLE 2017-07-28 16:50:18 -04:00
Julian Lam
f77f17dc20 just use emailLogo instead of doing logo with x50.png suffix 2017-07-28 15:07:44 -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
Barış Soner Uşaklı
7a405da60f group member search change 2017-07-28 00:55:02 -04:00
Julian Lam
61deb962e3 adding notifications.get hook 2017-07-27 22:17:56 -04:00
Baris Usakli
a9dbdc75af closes #5825 2017-07-26 14:32:53 -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