9f4e92fa13
closes #5925
8 years ago
1019feb569
fix method name
8 years ago
f42119673f
fix string cids in post summaries
8 years ago
38a7030639
Revert "Merge pull request #5923 from NodeBB/patch-5922"
...
This reverts commit f8ddabc8844976d13013
8 years ago
f8ddabc884
Merge pull request #5923 from NodeBB/patch-5922
...
Fix #5922
8 years ago
f40d37ad48
Fix #5922
8 years ago
b56d6f8b50
make call to db in /ping and /sping
8 years ago
a6b993ef6c
updating 500-embed to load after page is fully loaded, #5733
8 years ago
26d4c18340
Merge remote-tracking branch 'origin/master' into develop
8 years ago
2c2a28c5b6
closes #5919
8 years ago
4976d13013
removed console log
8 years ago
f7d78771f8
fixes #5921
8 years ago
a4532f011a
Blacklist fix ( #5918 )
...
* closes #5917
* fix callback for upgrade script
* delete key even if falsy, could be empty string
* DRYer ternary
8 years ago
302f06df95
fixes #5914
8 years ago
61b0f0c4c3
Catch uglify errors
8 years ago
d4a11de07d
move blacklist.less into admin/manage/ip-blacklist.less
8 years ago
fdffaf9ed2
re-organized ip blacklist page
8 years ago
1358a89305
closes #5907
8 years ago
1034626896
Merge remote-tracking branch 'origin/develop'
8 years ago
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.
8 years ago
23e7222dfa
Update Nodemailer to v4
...
also filter out .jst files from email template dropdowns
8 years ago
9cb098bb0b
Implements Jimp exitRotate() new method (jimp 0.2.28) to sove incoherent rotations when scaling images.
8 years ago
ececfe9a77
Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop
8 years ago
01275787b6
added widgets.resetTemplate(s)
8 years ago
5cc39e8546
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# package.json
# src/views/admin/manage/ip-blacklist.tpl
8 years ago
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
8 years ago
864321f727
re-organize newbiePostDelay fields
8 years ago
53ca6d1199
closes #5889
8 years ago
73d4517d27
Revert "fixes #5894"
...
This reverts commit e2b40ddf34
8 years ago
cdd139b327
increment blacklist analytics on blacklist block
8 years ago
00c25d47f9
blacklist should not use data.result anymore, just err is fine
8 years ago
19ae2b3eb4
dont join online_users and uid_ if user does not exist
8 years ago
0d0ea0977f
check error
8 years ago
e2b40ddf34
fixes #5894
8 years ago
81cf8f77d3
add blacklist test to onSuccessfulLogin as well
8 years ago
b2542c1e19
add missing return false
8 years ago
c71b7db646
remove messy regexes and a console.log
8 years ago
5d2b3d3c39
remove dependency on ip-range-check and ip, use lower level ipaddr.js instead
...
re: #5893
8 years ago
8346130cdc
introduced new hook filter:blacklist.test
8 years ago
0498832317
closes #5888
8 years ago
714a7066ec
add some styling to blacklist rules textarea
8 years ago
5699236fd2
added missing relative_path to view sitemap button
8 years ago
c0c0a28f21
point to the correct section for user registration settings
8 years ago
0e219a8c58
closes #5891
8 years ago
fcce96efab
style change
8 years ago
a46db9616c
fix message delete and add test
8 years ago
1875764aca
fix typo in delete
8 years ago
62c81ca0d3
fix lint
8 years ago
329bfeeb3b
convert min/max to float
8 years ago
74caf191f5
fix typo
8 years ago
ff88be91fa
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
5344edc2a7
closes #5885
8 years ago
5dfb2fb83a
up themes, fix notif test
8 years ago
c1d7b06ded
Fixes #5873
...
- Notifications.getMultiple now takes an optional uid parameter
- If a notification link in dropdown points to a topic and you're
in said topic, you will be scrolled to the post instead of
ajaxified to it.
8 years ago
1159abf9ec
fixes #5879
8 years ago
dc9b21021a
escape moderation notes
8 years ago
753f1576ce
processSortedSet
8 years ago
bc0645dc26
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
a9b1a0bdc4
fix tpl name
8 years ago
0ce3e4b691
post-queue show category, send notification
8 years ago
f56578ab50
remove reset tokens if target user email changes
8 years ago
6ec1bfd660
added artificial delay on reset route so that the heat death of the universe will arrive before you manage to identify a valid reset code
8 years ago
df069ee78d
escape teaser content
8 years ago
c3b1f31a5f
email logo: prevent crash if source image doesn't exist
8 years ago
5a968730d5
closes #5880
8 years ago
575c9a41cd
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
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
8 years ago
7162f5db62
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
2053726c81
up spam-be-gone
8 years ago
fc0e5421d6
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
7ab152e582
fix missing template var name
8 years ago
ed84794c1f
fix lint
8 years ago
48165b9011
closes #5875
8 years ago
c21f64c27f
closes #5872
8 years ago
27a6b8a713
lint fixes
8 years ago
bc6b1a8f56
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# public/src/admin/extend/plugins.js
8 years ago
d9ad26c7c5
the meat of #5862 , making chat loading not require an ajaxification
8 years ago
24bbf8fe00
closes #5869
8 years ago
e0e783ec05
closes #5866
8 years ago
82b5246b28
fix process.env.url if it was changed
8 years ago
e836ddf6e2
fix link to topic
8 years ago
4f9cbabec3
fixes #5853
8 years ago
29e7bdbc99
expose license info in plugin API for installed plugins
8 years ago
c0f390322c
https://github.com/Schamper/nodebb-plugin-poll/issues/86
8 years ago
e9f8cdc7f0
closes #5855
8 years ago
bd5edc55aa
closes #5086
8 years ago
de55c8e431
closes #4070
8 years ago
5fc6fe1c80
closes #5162
8 years ago
e071f94173
test debugParams.js
8 years ago
c0861277de
closes #5775
8 years ago
9dc0069ce7
closes #5845
8 years ago
4ac8d29f06
closes #5847
8 years ago
493cd16f39
closes #5848
8 years ago
c0fa404b6c
fix test
8 years ago
d06f114705
comma DANGLE
8 years ago
d68a3b6862
fixed emailer init if no logo saved
8 years ago
0ff413e5f8
simplifying logic
8 years ago
f77f17dc20
just use emailLogo instead of doing logo with x50.png suffix
8 years ago
000f8b8d92
fixed incorrect library module ref
8 years ago
875672522e
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# src/search.js
8 years ago
e0862be3c8
added new search hook to allow for enumeration after query
8 years ago
7a405da60f
group member search change
8 years ago
61deb962e3
adding notifications.get hook
8 years ago
911eb32e70
fix var names
8 years ago
f646e08a6e
update tags/links for 1.5.4
8 years ago
533b044ad1
Added new hook "filter:search.inContent"
...
This hook is fired after the search query returns a collection of
pids, but before those pids' summaries are retrieved. It is
useful to add a hook in here if you want to enumerate over the
matched results before they are truncated in the response payload.
8 years ago
6cd0582b42
add filter:user.saveSettings
8 years ago
a9dbdc75af
closes #5825
8 years ago
949595fdf3
fix eslint
8 years ago
541b78c26d
fix ipMatch data
8 years ago
ab8d765f4f
Merge branch 'master' into develop
8 years ago
f59f48c6e1
use setImmediate
8 years ago
c9c27b86c4
added back logic to strip leading slashes, but after the fix to app.all
8 years ago
6087f3c8cd
test router fix
8 years ago
84c1a182e5
Merge remote-tracking branch 'origin/master' into develop
8 years ago
e9639833c5
add router.all
8 years ago
233297367b
strip leading slashes from path if double-slash is accidentally used, stripping trailing slash from relative path retrieved from config.json
8 years ago
36e02780fe
updates to email logo usage
8 years ago
91c79506b5
add tagwhitelist to topic api
8 years ago
292d27716a
closes #5842
8 years ago
9d69224329
up themes fix altenate_logins to be bool
8 years ago
904f22522e
Merge pull request #5821 from NodeBB/scoped-plugins
...
Support scoped plugin npm packages
Also fix logging in VS Code with the inspector debugger
8 years ago
94c84cdc5b
moving email logo upgrade script to 1.6.0
8 years ago
184dacf1d7
Merge branch 'master' into develop
8 years ago
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 5a7f81185e8f9bd7d2d011c3d495988be7e437a3
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: 44851f9https://github.com/An-dz/NodeBB into noscript
commit f159d0d9ef1b7f600e830a96fdb4b9c87c79bb4a
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Thu Jul 6 12:16:38 2017 -0300
Prevent form submit
Required for theme change
commit d37b95cb71d32d4483190609798e244c331db165
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 9fd542d8970b7d1a4126f4edc4b44eab7d708fb0
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Wed Jul 5 19:57:56 2017 -0300
Fix tests
commit cdad5bf8c2891ad76f7441fd4d8a74b058a14e6d
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Wed Jul 5 19:09:17 2017 -0300
Update error handling
commit 4ff11cd136a4fb98483f837e2cebc741380dfe76
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Wed Jul 5 17:29:08 2017 -0300
Remove async waterfall
commit df01d44e821a70c984b89e9585a325c3e02c6e37
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Wed Jul 5 16:59:43 2017 -0300
Set noscript compose as noscript at start
commit 4bcc380da72239b8315cc849a77a3036e06e4a12
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Wed Jul 5 16:59:12 2017 -0300
Remove last useless next
commit b5eac6fea11e209934c0648a7e75ad07a2167123
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sun Jul 2 18:35:08 2017 -0300
Last function requires no next
commit 20a5cce6e6e32a454c304c448383707ec44c75a8
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sun Jul 2 18:06:58 2017 -0300
Remove more useless next calls
commit 85ee22a79bcbbb1995106f43d4c74d6ba9206cab
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sun Jul 2 17:46:07 2017 -0300
Remove useless next calls
commit 7d984c47ad24faac1fe537dee4a5a7d697e8634c
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sun Jul 2 15:45:31 2017 -0300
Support old themes
commit 4a09dfbd08253115c342a9e829c4e6940cecb8cc
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sun Jul 2 15:37:23 2017 -0300
Moved all error handling into helpers function
commit 391aa6e67ef9ab67304005e14ac0633cdb630713
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Thu Jun 8 15:37:37 2017 -0300
ESLint - Fix mixed conditionals
commit 80ccc6fd581d791f31e7ab62de8de611837bfc3c
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sat Jun 3 18:08:15 2017 -0300
Compose without scripts
commit 2aca811256721238ca0cede4954213d369009885
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sat Jun 3 18:00:44 2017 -0300
Register without scripts
commit 097bb51577fb26f8e22f86dc274cb670ab606a8a
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sat Jun 3 16:42:15 2017 -0300
Logout without scripts
commit d497e08109891079656fee1c145043a9c0e55f2e
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sat Jun 3 16:27:10 2017 -0300
Login without script
8 years ago
dc324b36b2
Add test for Plugins.showInstalled
8 years ago
18181260e7
closes #5836
8 years ago
43a70270ef
closes #5835
8 years ago
eecc680761
style
8 years ago
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.
8 years ago
b983be2919
fix colspans in category privilege tab
8 years ago
44851f97ac
added logic for hiding logo if none is set, preventing crash on startup if no logo is set
8 years ago
d9ace1723c
removed references to libs that aren't used
8 years ago
f29b9f29f9
added missing setImmediate
8 years ago
63ec3b6a55
upgrade script to generate and set email logo+sizes in config
8 years ago
5cec946871
fixed bug with logo being stretched in emails
8 years ago
c40b11aa6e
updated site upload logic so that site logo is resized for email header, implemented site logo in email header
8 years ago
cc4f4e7282
style changes
8 years ago
67ca1881bd
closes #5831
8 years ago
f2f4f07570
Merge branch 'revamped-email-templates' into develop
8 years ago
39e78a8a12
forgot the css :rage2:
8 years ago
bcdfba653a
tweaking hero image
8 years ago
5f24d63005
digest tpl
8 years ago
f8bfe79cf4
remove tid from recent_tids
8 years ago
4c0135e188
fixed missing payload items in invitation email
8 years ago
0b8b3fafbf
banned and invitation
8 years ago
065b3a3a03
notif_chat tpl
8 years ago
a9540a13a1
fixing url in footer
8 years ago
f0f856fe6b
more padding adjustments
8 years ago
f9233d5c9b
more padding fixes
8 years ago
b7d0ea900e
who knew you couldn't put two paragraphs inside a td
8 years ago
733f694cf3
adjusted some margins
8 years ago
f128f988f3
slimmed down some data, testing notif_post again
8 years ago
82dda3e2e6
added email closing back to notif_post
8 years ago
582dd1ed2e
testing new footer with new_post tpl
8 years ago
51349bb71f
more email templates updated
8 years ago
5a9ae8f4c7
rearrange menu items
8 years ago
72cafd55cf
2 new hooks for changing direction and set name
8 years ago
f1f8a587d4
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# package.json
8 years ago
ea29e3e250
simpler call to validateFilters
8 years ago
7c6c1adb04
test email done
8 years ago
0d0e0d7311
removed prerender text and used partials for header and footer
8 years ago
6c768030cc
using variable for urls again, welcome.tpl done I think
8 years ago
10d23f5447
resized logo again
8 years ago
a2627d2066
added default payload to emails, and adding nodebb logo for email header
8 years ago
15d368c6b9
more changes to welcome.tpl
8 years ago
ee5895f534
Fix #5488 Support scoped plugin npm packages
8 years ago
5888a5ffc4
closes #5010
...
init plugin hooks before resetting widgets, the areas are returned by
`filter:widgets.getAreas`
8 years ago
4056283fd5
always return array
8 years ago
0f5be5ae25
remove plugin.hook check
8 years ago
020d3acfe9
WIP welcome email
8 years ago
9c71da1577
sending callback with welcome email test
8 years ago
71e3fea55b
closes #5802
8 years ago
0e0d961f7c
dont change templateData
8 years ago
30199f921e
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
701ba73883
updated homepage route logic so that it is all contained in the local function (and plugin hook receives all entries, including custom) @barisusakli
8 years ago
2d875a99cb
fix data
8 years ago
dc110e2e3f
closes #5818
8 years ago
c2f1d254cc
Merge branch 'master' into develop
8 years ago
59aeee6516
remove addExpiresHeaders
8 years ago
e036e26238
closes #5813
8 years ago
923bd86662
Widgets refactor ( #5817 )
...
* widgets refactor
render widgets server side
widgets can use all the data the template can use
* fix tests
8 years ago
80ea9e9797
fix lint
8 years ago
6485108dfd
faster getReplies
8 years ago
feecf0b61c
dont make db call if guest
8 years ago
e9360347ea
less padding, closes #5811
8 years ago
e0de922ede
Revert "widgets refactor"
...
This reverts commit 9e94edb5aa
8 years ago
9e94edb5aa
widgets refactor
...
render widgets server side
widgets can use all the data the template can use
8 years ago
121a629de6
linting
8 years ago
09621a3a3d
fixes #5776
8 years ago
fbddb665b0
make tests pass
8 years ago
e309ac5040
fixes #5790
8 years ago
7538210b07
#5772
...
load correct timeago settings on cold load instead of after page load
8 years ago
d469f53eba
using async in batch
...
removed unused code in debug
8 years ago
b7e8ecc6d3
updated mentions version and changed topics filter to take its translation from global hash instead
8 years ago
14bda343b3
use direct db call to get rss_token instead
8 years ago
0d60b17be1
use direct db call to get rss_token instead
8 years ago
6cb0d6f8c1
wipe existing rss tokens
8 years ago
b807d3750c
encodeURI redirect url
8 years ago
d44090ba18
Merge remote-tracking branch 'refs/remotes/origin/private-feeds'
8 years ago
Julian Lam
Barış Soner Uşaklı
Peter Jaszkowiak
Baris Usakli
psychobunny
Harmdhast
manolino
dbolack-ab