Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-18 11:41:06 +01:00
Code Issues Packages Projects Releases Wiki Activity
16,441 Commits 74 Branches 483 Tags
a5cceabc89b40e9df7442d4b51ef1c58155b439a
Commit Graph

16441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Misty (Bot)
4628c2d2f4 Latest translations and fallbacks 2017-09-03 09:23:09 +00:00
psychobunny
d4a11de07d move blacklist.less into admin/manage/ip-blacklist.less 2017-09-01 19:47:20 -04:00
psychobunny
fdffaf9ed2 re-organized ip blacklist page 2017-09-01 19:29:09 -04:00
Misty (Bot)
0587b98eca Latest translations and fallbacks 2017-09-01 23:20:36 +00:00
Baris Usakli
1358a89305 closes #5907 2017-09-01 18:40:34 -04:00
Baris Usakli
bf79857b7d closes #5908 2017-09-01 17:42:55 -04:00
Julian Lam
8e89eb80b7 up composer 2017-09-01 16:14:49 -04:00
Julian Lam
1034626896 Merge remote-tracking branch 'origin/develop' 2017-09-01 16:07:12 -04:00
Julian Lam
1829aa139d up themes 2017-09-01 16:07:00 -04:00
Peter Jaszkowiak
e5eaab3494 Merge pull request #5909 from harmdhast/patch-2 
Template - Benchpress | Variable call fix
 2017-09-01 11:50:52 -06:00
Misty (Bot)
412f844885 Latest translations and fallbacks 2017-09-01 09:23:19 +00:00
Harmdhast
0b520f8d65 Template - Benchpress | Variable call fix 
Change the way the var is called to match the new benchpressjs templating system.
Fixes the admin permission panel.
 2017-09-01 01:10:38 +02: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
Peter Jaszkowiak
e8aa8c62f6 Update jsdom 2017-08-30 13:27:59 -06:00
Peter Jaszkowiak
295bf7d115 Bump dependencies 2017-08-30 13:22:18 -06:00
Peter Jaszkowiak
cfba8970e1 Fix posts block usage in categories page 2017-08-30 12:43:11 -06:00
Peter Jaszkowiak
d9d0f3ffc7 Bump benchpress 2017-08-30 12:30:09 -06:00
Peter Jaszkowiak
9f9eace596 End support for Node 4, add Node 8 testing 2017-08-30 12:11:23 -06:00
Peter Jaszkowiak
b5acd796fb Remove public eslint templates global 2017-08-30 11:32:56 -06:00
Peter Jaszkowiak
c91dfb46f6 Switch module t.js usage to Benchpress 2017-08-30 11:32:23 -06:00
Peter Jaszkowiak
71aab79a9a Switch client t.js usage to Benchpress 2017-08-30 11:31:29 -06:00
Peter Jaszkowiak
dc3f89a505 ajaxify t.js usage to Benchpress 2017-08-30 10:51:25 -06:00
Peter Jaszkowiak
5885e37127 Switch admin t.js usage to Benchpress 2017-08-30 10:50:28 -06:00
Misty (Bot)
b3438bc695 Latest translations and fallbacks 2017-08-30 09:23:54 +00:00
Julian Lam
643ae05d68 closes #5868 2017-08-29 11:41:43 -04:00
Julian Lam
cd60d79a13 closes #5904 2017-08-29 09:28:18 -04:00
Misty (Bot)
a176582282 Latest translations and fallbacks 2017-08-29 09:23:29 +00:00
manolino
9cb098bb0b Implements Jimp exitRotate() new method (jimp 0.2.28) to sove incoherent rotations when scaling images. 2017-08-28 14:34:42 -04:00
Barış Soner Uşaklı
bc6edba6df change post queue test 2017-08-27 19:13:23 -04:00
Misty (Bot)
b2c16b2ba0 Latest translations and fallbacks 2017-08-27 09:23:16 +00:00
Misty (Bot)
fad64bf1f0 Latest translations and fallbacks 2017-08-26 09:23:18 +00:00
Andrew Rodrigues
60e0f4ced9 minor typo 2017-08-25 15:53:35 -04:00
psychobunny
ececfe9a77 Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop 2017-08-25 13:59:20 -04:00
psychobunny
01275787b6 added widgets.resetTemplate(s) 2017-08-25 13:59:14 -04: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
Peter Jaszkowiak
abffc29128 Use Benchpress (#5901) 
* Use Benchpress

* Use Benchpress.compileParse

* Error for template load failure

* Use benchpressjs package

* Compile templates on demand

* Fix user settings page

* Fix admin search to exclude `.jst` files

* Fix 500-embed

So ajaxify can still show an error if the server goes down
 2017-08-24 19:26:50 -04:00
psychobunny
864321f727 re-organize newbiePostDelay fields 2017-08-24 14:25:09 -04:00
Julian Lam
53ca6d1199 closes #5889 2017-08-24 12:39:57 -04:00
Misty (Bot)
3705251359 Latest translations and fallbacks 2017-08-24 09:23:25 +00:00
Julian Lam
73d4517d27 Revert "fixes #5894" 
This reverts commit e2b40ddf34.
 2017-08-23 21:38:58 -04:00
psychobunny
f1f5db4c99 remove redundant lines in watch directories 2017-08-23 20:13:52 -04:00
psychobunny
70887c5f78 fix grunt paths for core less files 2017-08-23 20:11:24 -04:00
Julian Lam
9d2bf4746c Revert "fix reload loop for guests" 
This reverts commit a67a0b0a08.
 2017-08-23 19:32:10 -04:00
Julian Lam
a67a0b0a08 fix reload loop for guests 2017-08-23 19:30:30 -04:00
psychobunny
a13a5c02e9 closes #5899 2017-08-23 18:14:59 -04:00
Julian Lam
cdd139b327 increment blacklist analytics on blacklist block 2017-08-23 16:16:27 -04:00
Julian Lam
00c25d47f9 blacklist should not use data.result anymore, just err is fine 2017-08-23 16:14:08 -04:00
Baris Usakli
19ae2b3eb4 dont join online_users and uid_ if user does not exist 2017-08-23 15:30:13 -04:00
Baris Usakli
0d0ea0977f check error 2017-08-23 15:29:27 -04:00
Julian Lam
e2b40ddf34 fixes #5894 2017-08-23 15:11:15 -04:00