Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-06 07:40:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,672 Commits 72 Branches 488 Tags
0b520f8d65e8b2533be6cc5ffdb50f3984e0bab2
Commit Graph

15672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Anil Mandepudi
ff3ca28db8 update theme slick version (#5897) 
Slick theme updated with all changes necessary to be compatible with master branch changes.
 2017-08-23 12:49:30 -04:00
Julian Lam
81cf8f77d3 add blacklist test to onSuccessfulLogin as well 2017-08-23 12:14:14 -04:00
Baris Usakli
10c8666520 lower sleep to 15secs 2017-08-23 11:48:52 -04:00
Baris Usakli
18e0f1a9dd try to start mongod 2017-08-23 11:32:03 -04:00
Baris Usakli
a9e7f768e2 wait 30 secs 2017-08-23 11:19:29 -04:00
Baris Usakli
bd26cadb80 moved sleep before node setup 2017-08-23 11:10:25 -04:00
Baris Usakli
b2542c1e19 add missing return false 2017-08-23 10:54:00 -04:00
Baris Usakli
0b6902a03e testing mongodb wait script 2017-08-23 10:44:15 -04:00
Julian Lam
c71b7db646 remove messy regexes and a console.log 2017-08-22 16:55:47 -04:00
Julian Lam
5d2b3d3c39 remove dependency on ip-range-check and ip, use lower level ipaddr.js instead 
re: #5893
 2017-08-22 16:55:31 -04:00
psychobunny
cca8dca735 up slick theme 2017-08-22 15:22:41 -04:00
Julian Lam
8346130cdc introduced new hook filter:blacklist.test 2017-08-22 13:46:20 -04:00
Barış Soner Uşaklı
0498832317 closes #5888 2017-08-22 10:28:35 -04:00
psychobunny
714a7066ec add some styling to blacklist rules textarea 2017-08-21 19:05:37 -04:00
psychobunny
5699236fd2 added missing relative_path to view sitemap button 2017-08-21 18:58:01 -04:00
psychobunny
d5db97930d prevent "plugins" menu from being highlighted when going to Extend -> Plugins 2017-08-21 18:50:50 -04:00
psychobunny
c0c0a28f21 point to the correct section for user registration settings 2017-08-21 18:46:43 -04:00
psychobunny
e8c40c8dc6 scroll to the actual subsection in the ACP when clicking on links pointing to that hash 2017-08-21 18:46:03 -04:00
psychobunny
0e219a8c58 closes #5891 2017-08-21 17:48:58 -04:00