Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-05 22:30:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,593 Commits 74 Branches 490 Tags
bc0645dc26022e496aa2212c168fe0f01ffe7ea3
Commit Graph

894 Commits

Author SHA1 Message Date
Baris Usakli
bc0645dc26 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-16 15:17:26 -04:00
Baris Usakli
a9b1a0bdc4 fix tpl name 2017-08-16 15:17:10 -04:00
Baris Usakli
0ce3e4b691 post-queue show category, send notification 2017-08-16 15:15:58 -04:00
Baris Usakli
5a968730d5 closes #5880 2017-08-15 14:43:43 -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
Barış Soner Uşaklı
7ab152e582 fix missing template var name 2017-08-12 20:36:39 -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
Baris Usakli
e0e783ec05 closes #5866 2017-08-09 10:48:26 -04:00
Baris Usakli
e836ddf6e2 fix link to topic 2017-08-03 14:14:05 -04:00
Julian Lam
4f9cbabec3 fixes #5853 2017-08-03 12:06:15 -04:00
Baris Usakli
de55c8e431 closes #4070 2017-08-02 13:03:39 -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
Julian Lam
84c1a182e5 Merge remote-tracking branch 'origin/master' into develop 2017-07-25 12:28:43 -04:00
Barış Soner Uşaklı
292d27716a closes #5842 2017-07-22 19:21: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
Baris Usakli
43a70270ef closes #5835 2017-07-18 11:31:18 -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
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
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
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
Julian Lam
7c6c1adb04 test email done 2017-07-13 12:54:54 -04:00
Julian Lam
0d0e0d7311 removed prerender text and used partials for header and footer 2017-07-13 12:50:09 -04:00
Julian Lam
6c768030cc using variable for urls again, welcome.tpl done I think 2017-07-13 12:39:58 -04:00
Julian Lam
10d23f5447 resized logo again 2017-07-13 12:21:24 -04:00
Julian Lam
a2627d2066 added default payload to emails, and adding nodebb logo for email header 2017-07-13 11:30:44 -04:00
Julian Lam
15d368c6b9 more changes to welcome.tpl 2017-07-13 10:43:27 -04:00
Julian Lam
020d3acfe9 WIP welcome email 2017-07-12 15:36:15 -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
Barış Soner Uşaklı
e9360347ea less padding, closes #5811 2017-07-09 16:08:06 -04:00