Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-28 02:09:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
21,328 Commits 71 Branches 489 Tags
18ae7cf719fba7dab4a7461894de9de1364b87ac
Commit Graph

11415 Commits

Author SHA1 Message Date
Baris Usakli
541b78c26d fix ipMatch data 2017-07-26 13:39:34 -04:00
Julian Lam
ab8d765f4f Merge branch 'master' into develop 2017-07-25 14:13:51 -04:00
Julian Lam
f59f48c6e1 use setImmediate 2017-07-25 14:11:54 -04:00
Julian Lam
c9c27b86c4 added back logic to strip leading slashes, but after the fix to app.all 2017-07-25 13:50:37 -04:00
Baris Usakli
6087f3c8cd test router fix 2017-07-25 12:54:23 -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
233297367b strip leading slashes from path if double-slash is accidentally used, stripping trailing slash from relative path retrieved from config.json 2017-07-25 10:39:57 -04:00
Julian Lam
36e02780fe updates to email logo usage 2017-07-25 09:45:49 -04:00
Baris Usakli
91c79506b5 add tagwhitelist to topic api 2017-07-24 12:17:55 -04:00
Barış Soner Uşaklı
292d27716a closes #5842 2017-07-22 19:21:22 -04:00
Barış Soner Uşaklı
9d69224329 up themes fix altenate_logins to be bool 2017-07-22 19:05:22 -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
94c84cdc5b moving email logo upgrade script to 1.6.0 2017-07-20 16:23:55 -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
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
43a70270ef closes #5835 2017-07-18 11:31:18 -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
Barış Soner Uşaklı
b983be2919 fix colspans in category privilege tab 2017-07-17 15:29:36 -04:00
Julian Lam
44851f97ac added logic for hiding logo if none is set, preventing crash on startup if no logo is set 2017-07-17 14:51:12 -04:00
Julian Lam
d9ace1723c removed references to libs that aren't used 2017-07-17 12:40:50 -04:00
Julian Lam
f29b9f29f9 added missing setImmediate 2017-07-17 12:23:11 -04:00
Julian Lam
63ec3b6a55 upgrade script to generate and set email logo+sizes in config 2017-07-17 12:16:14 -04:00
Julian Lam
5cec946871 fixed bug with logo being stretched in emails 2017-07-17 11:03:12 -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
Barış Soner Uşaklı
67ca1881bd closes #5831 2017-07-15 16:24:46 -04:00
Julian Lam
f2f4f07570 Merge branch 'revamped-email-templates' into develop 2017-07-14 16:37:57 -04:00
Julian Lam
39e78a8a12 forgot the css :rage2: 2017-07-14 16:35:43 -04:00
Julian Lam
bcdfba653a tweaking hero image 2017-07-14 16:32:37 -04:00
Julian Lam
5f24d63005 digest tpl 2017-07-14 16:30:37 -04:00
Baris Usakli
f8bfe79cf4 remove tid from recent_tids 2017-07-14 16:23:20 -04:00
Julian Lam
4c0135e188 fixed missing payload items in invitation email 2017-07-14 15:50:59 -04:00
Julian Lam
0b8b3fafbf banned and invitation 2017-07-14 15:43:55 -04:00
Julian Lam
065b3a3a03 notif_chat tpl 2017-07-14 15:36:18 -04:00
Julian Lam
a9540a13a1 fixing url in footer 2017-07-14 14:54:56 -04:00
Julian Lam
f0f856fe6b more padding adjustments 2017-07-14 14:46:31 -04:00
Julian Lam
f9233d5c9b more padding fixes 2017-07-14 14:43:06 -04:00
Julian Lam
b7d0ea900e who knew you couldn't put two paragraphs inside a td 2017-07-14 14:37:13 -04:00
Julian Lam
733f694cf3 adjusted some margins 2017-07-14 14:31:43 -04:00
Julian Lam
f128f988f3 slimmed down some data, testing notif_post again 2017-07-14 14:21:58 -04:00
Julian Lam
82dda3e2e6 added email closing back to notif_post 2017-07-14 14:02:34 -04:00
Julian Lam
582dd1ed2e testing new footer with new_post tpl 2017-07-14 13:09:35 -04:00
Julian Lam
51349bb71f more email templates updated 2017-07-14 12:55:34 -04:00
Baris Usakli
5a9ae8f4c7 rearrange menu items 2017-07-13 17:18:01 -04:00
Baris Usakli
72cafd55cf 2 new hooks for changing direction and set name 2017-07-13 16:09:01 -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