108f84fd19
add type to dbal
7 years ago
c4310395c9
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# package.json
7 years ago
19dc7da42f
closes #5994
7 years ago
79598c32d3
remove unused function
7 years ago
d8dc79e3c7
closes #5992
7 years ago
6a6dc7ef06
closes #5990
7 years ago
8a499e09ed
fix nconf lowercasing
7 years ago
5e6d8ea566
handle 404 first
7 years ago
60a42aa651
Merge branch 'translator-optimization' into develop
7 years ago
cf289b9228
Merge remote-tracking branch 'origin/master' into develop
7 years ago
46fafb20b9
Remove string.js dependency
7 years ago
1c5bdcb670
Enable running multiple upgrades at once ( #5984 )
7 years ago
f9a1951ec5
Enable running multiple upgrades at once
7 years ago
6a93bc140b
Merge remote-tracking branch 'origin/master' into develop
7 years ago
b44cfacda1
resolve XSS vulnerability in flags pages
7 years ago
9101400264
closes #5961
7 years ago
c5f58f73a7
closes #5974
7 years ago
9cbf1597cd
Merge remote-tracking branch 'origin/master' into develop
7 years ago
68bcfb2883
closes #5975
7 years ago
cd6dcff38b
Split up customJS into customHTML and customJS for better organisation ( #5981 )
...
* WIP
* fixed customJS not actually working in footer
* Moving scripts to footer, #5980
* Added upgrade scripts for #5980
7 years ago
500c978a26
closes #5944
7 years ago
410e825bc0
fix upgrade script changing brand:logo to absolute path
7 years ago
645410131d
closes #5942
7 years ago
72502ff992
utilising whitelist instead of blacklisting javascript protocol
7 years ago
5863d64d27
prevent inline js payloads from executing in outgoing page
7 years ago
67ba6bb820
closes #5977
7 years ago
9e9de2edd0
closes #5976
7 years ago
1c35213934
Fix #5970 and forking while debugging ( #5965 )
...
* Fix forking while debugging
Debugger address in use no longer happens
* Fix cropper error
7 years ago
8d5ef79e9c
Smtp emailer change without restart ( #5957 )
...
* SMTP fallback transport setup during app startup and config update
* Verbose logging message to see when SMTP fallback transport is setup
7 years ago
227c245fb2
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# package.json
7 years ago
0de692188f
check topic.cid
7 years ago
38900a9964
Smtp emailer issue 5951 ( #5954 )
...
* Fixed typo at emailer.js line 66 (serice -> service)
* When custom SMTP user and password is empty no authentication is attempted
* Added options to choose custom smtp connection security
* Made custom smtp connection security strings translatable
* Changed switch to if-else for custom smtp security option
* Fixed emailer.js lint errors
* Move custom setting to top of list
7 years ago
6852c92ed6
Merge remote-tracking branch 'origin/develop'
7 years ago
1fd160a4e6
Add Support for Firefox OSD
7 years ago
2086a64a5e
fixes #5947
7 years ago
b70f328520
closes #5948
7 years ago
da9da8190f
Bump dependencies
...
Bumping eslint & configs meant making some linting fixes
For future reference, the `xmlhttprequest-ssl` library must be of equal versioning to the one in `engine.io-client`, otherwise it won't be deduped which causes the socket.io tests to fail
7 years ago
dc87d7fc0f
Use .js instead of .jst
...
Fix #5934
8 years ago
f989988178
closes #1668
8 years ago
2185480c4e
switch to eachSeries
8 years ago
8276e20254
closes #5937
8 years ago
852396e60d
closes #5903
8 years ago
4c0d430819
only return minimal info for pending and invited users
8 years ago
dea372a5c5
fixes #5932
8 years ago
8b0e6611d9
fixed incorrect parameter passed into hook
8 years ago
c373f85726
Merge remote-tracking branch 'origin/master' into develop
8 years ago
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
Barış Soner Uşaklı
Baris Usakli
Peter Jaszkowiak
Julian Lam
Dravere
RoiEX
psychobunny
Harmdhast
manolino