6852c92ed6
Merge remote-tracking branch 'origin/develop'
8 years ago
dc87d7fc0f
Use .js instead of .jst
...
Fix #5934
8 years ago
dea372a5c5
fixes #5932
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
0498832317
closes #5888
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
4ac8d29f06
closes #5847
8 years ago
493cd16f39
closes #5848
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
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
dc110e2e3f
closes #5818
8 years ago
59aeee6516
remove addExpiresHeaders
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
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
7538210b07
#5772
...
load correct timeago settings on cold load instead of after page load
8 years ago
6248e5562f
Fix /apple-touch-icon not sending uploaded file
...
This fixes the following error:
$ wget https://nodebb.yourdomain/apple-touch-icon
28/6 09:57:06 [28332] - error: /apple-touch-icon
Error: ENOENT: no such file or directory, stat '/home/sweet/nodebb/public/assets/uploads/system/touchicon-orig.png'
at Error (native)
8 years ago
b64ba40c67
closes #5772
8 years ago
22131640fd
closes #5749
8 years ago
50367a971e
req should be req. 👍
8 years ago
08aaabd33c
closes #5642
8 years ago
062bced3dd
cleanup and tests
8 years ago
f57b5f4e4c
refactor
8 years ago
29135dfed3
timeago locale test
8 years ago
01e2263c01
more tests
8 years ago
608a7d120c
error handler tests
8 years ago
3a1eba2537
merge
8 years ago
b3bd70235a
refactor ban messaging; add ban duration to message; use bootbox instead of alert
8 years ago
4900f21dd5
fix crash in header
8 years ago
33e8ecc1f4
closes #5404
8 years ago
64bf542d17
Fix HTML `lang` attribute using the `defaultLang`
...
Themes need `lang="{function.localeToHTML, userLang, defaultLang}"` in
their header.tpl file
8 years ago
d18cfced96
Merge remote-tracking branch 'origin/master' into develop
8 years ago
1ed571189c
Make utils and translator easier to require
...
Move utils.walk to file.walk, backwards compatible
8 years ago
5985a8a7a3
closes #5574
8 years ago
e121a5a798
closes #5574
8 years ago
1ebbbdd3f9
Merge remote-tracking branch 'origin/master' into develop
8 years ago
27b030a71c
test for #5523
8 years ago
860999fa6c
Merge remote-tracking branch 'origin/master' into develop
8 years ago
74d2835a1f
escape body class parts
8 years ago
793555a344
Merge branch 'master' into develop
8 years ago
992e3128bd
closes #5499
8 years ago
af2d9fb85b
Merge branch 'master' into develop
8 years ago
e85e35cf0c
closes #5497
8 years ago
2188036148
controllers/users refactor
8 years ago
ddea9f534e
running eslint again
8 years ago
72e77772db
Merge branch 'master' into develop
8 years ago
dd2b930824
Resolve merge conflicts, minify only `.js` files
8 years ago
8154e29ad5
Merge branch 'master' into develop
8 years ago
9079ee5b14
style
8 years ago
4bb49a7171
ESlint no-unused-vars
8 years ago
09e868ce5f
ESlint no-useless-escape, no-else-return
8 years ago
a0a50677da
ESlint n-loop-func, yoda
8 years ago
c4bdb72941
ESlint no-unneeded-ternary
...
and no-extend-native, no-sequences
8 years ago
896c8c7343
ESlint object-curly-spacing
8 years ago
3b0dd2d1ef
ESlint padded-blocks
8 years ago
feb8405f95
ESlint eol-last
8 years ago
41896e1fc7
ESlint lines-around-directive
8 years ago
a038c66549
ESlint quotes
8 years ago
604358ecc4
ESlint keyword-spacing, no-multi-spaces
8 years ago
a5a3f3089a
ESlint no-mixed-operators
8 years ago
b1b486f729
ESlint quote-props
8 years ago
3361a72725
ESlint no-plusplus
...
and no-empty, space-unary-ops
8 years ago
52f2028206
ESlint no-multiple-empty-lines
8 years ago
2ba46808a1
ESlint one-var, fix comma-dangle
8 years ago
bc1d70c126
ESlint comma-dangle
8 years ago
fcaefbadca
Merge remote-tracking branch 'origin/master' into develop
8 years ago
30f35c42f6
fix eslint
8 years ago
a3cbe5e090
#5436
8 years ago
21eefb9760
closes #5436
8 years ago
7f124a3ccf
Merge branch 'master' into develop
8 years ago
7ba111acdd
Merge pull request #5420 from NodeBB/assets-route
...
/assets/uploads
8 years ago
aaacdb8413
Fix #5416 , uploads path config setting
...
- Finish moving uploads route to `/assets/uploads`
- Remove `upload_url` config setting, it was broken
8 years ago
8a0a74d95e
Merge remote-tracking branch 'origin/master' into develop
8 years ago
b5daedb7a3
Merge remote-tracking branch 'origin/master' into develop
8 years ago
bb1bfb0449
Merge branch 'master' into assets-route
8 years ago
a15aaaf389
closes #5394
...
dont allow socket.emits during maintenance mode
8 years ago
bfd16d188e
Merge branch 'master' into develop
8 years ago
360a35d0a6
Resolve merge conflicts
8 years ago
ae7f9bac98
prevent crash if uri is malformed
8 years ago
ae279fe57f
casting some values as int, in ensureSelfOrPrivileged middleware
8 years ago
73879b824c
Merge branch 'master' into develop
8 years ago
05b68391dd
Use `/assets` for client assets
...
- Route `/assets` -> `build/public`, falling back on `public`
- Moved destinations for `nodebb.min.js`, `acp.min.js`, `admin.css`, `stylesheet.css`, `templates`, and `sounds` to `build/public`
- r.js modules previously routed through express are now symlinked into `public/build/src/modules`
- minfiles no longer served from a memory cache
- use config `views_dir` setting everywhere template directory is used
- fix cache buster `v=v=`
8 years ago
2f07c18c5a
All hail the glorious translation prebuilding
8 years ago
9dcbe875a0
Merge branch 'master' into develop
8 years ago
2a9088d571
updating checkGlobalPrivacySettings middleware to hook into write-api for auth
8 years ago
d29361f4c9
added additional visibility masks for profile menu hook, also added isPrivileged user method, closes #5306
8 years ago
ffa2bd14f8
Fix reverse proxies breaking admin translations
8 years ago
53fe432d8a
fix hook
8 years ago
97c0b33cf6
filter:middleware.render
8 years ago
acf2e4078b
fixes #5263
8 years ago
33ff5e09bb
updated revoke session middleware to allow self or admin or global mod invocation, tweaked tests a bit
8 years ago
23cdeeb344
linting :shipit:
8 years ago
a1b49a98e7
locking down session deletion route to admins and global mods only
8 years ago
6beacdb80c
fix headers for new installs
...
encodeURI(undefined) === "undefined"
9 years ago
b7fa8c1db1
fixes #5230
9 years ago
c5237443cd
Standard language codes ( #5218 )
...
* Use standard language codes. Fallback for plugins.
* Fix transifex config
* Tab vs space here for some reason
* Remove redundancies
* config.relative_path instead of allcaps
* added upgrade script for existing users' accounts
9 years ago
17f8afd0dc
closes #5230
9 years ago
38bc8ad5ae
maintenance tests
9 years ago
2476ab3684
closes #5202
9 years ago
ce9be7e694
closes #5132
9 years ago
663f05b972
adding back banReason to header rendering, as it regressed in 1f10e0b
9 years ago
1f10e0b287
fixed #5166
9 years ago
f97f45a138
logic to show a modal to banned users when they try to log in via SSO
9 years ago
e515b791da
Fix eslint rules ( #5117 )
...
* Fix semi linter rule
* Fix semi-spacing linter rule
* Fix no-undef-init linter rule
* Fix space-before-blocks linter rule
9 years ago
a995afbfe0
fix style
9 years ago
2463e85c0d
allowing moderators access to the account info page
9 years ago
041022db63
#5145
...
dont crash if res.locals.config is undefined
9 years ago
c972a339e6
fix value
9 years ago
862678eefe
encodeURIComponent header values
9 years ago
ead4de6c6f
Merge branch 'fix-some-code-lint' of https://github.com/HeeL/NodeBB into HeeL-fix-some-code-lint
9 years ago
eb16eb318e
exposing links to moderator tools pages in user logged-in dropdown, closes #5113
9 years ago
4a3c31b2dc
Fix space-before-function-paren linter rule
9 years ago
3fa1c1f927
Fix space-infix-ops linter rule
9 years ago
98fff29869
closes #5082
9 years ago
15409f92cd
escape history data, hide moderation note in api
9 years ago
282ac56bf6
adde expose methods back
...
used by plugins
9 years ago
aefba6e2b1
removed some methods
...
helpers.getBaseUser
exposeUid, exposeGroupName
9 years ago
478da29423
closes #5020
9 years ago
07fe5057e1
make sure validator.escape() receives strings only
9 years ago
a0f2e8a8ec
use req.uid 👍
9 years ago
8f408faf46
organize middlewares
...
removed app.locals.middleware
middlewares can be required anywhere, ie in controllers
9 years ago
f7540a7edc
closes #4811
9 years ago
409621c661
closes #4843
9 years ago
ce9ee62fa0
Handle callback errors
9 years ago
2103880d61
only extend 5mins if less than 5mins left
9 years ago
514c12aa68
closes #4885
9 years ago
2606844d98
closes #4868
9 years ago
71a5e4a8a1
better error handling for session revocation if no login session is present, #4214
9 years ago
40b57d6cbe
add "Admin Approval for IPs", which works like Normal for new users and Admin Approval for sockpuppet accounts ( #4882 )
9 years ago
fcf145fc81
403 if not logged in, show error
9 years ago
f3c48eb14a
oops, #4832
9 years ago
6df3157748
closes #4832
9 years ago
8ea5752b50
added url property to all routes
9 years ago
46a57f5d5c
rm cls because it's not ready yet
9 years ago
f03018b7cc
updated middlewares so if you have not completed registration, you will be required to do so
9 years ago
bdc23b4a8d
add reputation to app.user
9 years ago
149565169b
closes #4658
9 years ago
07c59ae174
changed cls.getItem to equal cls.get from cls.set
...
based off of naming schema
9 years ago
2fd6391081
Made the session cookie aware of the possible relative path ( #4663 )
9 years ago
ef4a94857d
fixed admin lockout timer for subfolder installs @barisusakli :trollface:
9 years ago
437770538c
work-in-progress commit for #4655
9 years ago
16ba7ee840
fix #1972
9 years ago
2e0763b0a8
closes #1972
9 years ago
621e0d145e
closes #4617
...
Serving english timeago strings from server instead of round-trip
re-request on failure.
9 years ago
f0685468f8
Merge pull request #4162 from akhoury/master
...
add continuation-local-storage (CLS) support
9 years ago
702597d759
change /user/uid to /uid/:uid
...
so it doesn't conflict with actual user routes
was causing incorrect redirects if a user had a numeric userslug
@julianlam
9 years ago
4cdeae33e5
don't add "page-xxx-" class if trailing slash exists
9 years ago
eb0aea6390
add /user/<uid> and /post/<pid> redirects
...
change notifications to use new redirects
9 years ago
cef7fb545b
closes #1972
9 years ago
25f3a31ff1
closes #4587
9 years ago
2e2c8b8e77
fixes #4584
9 years ago
01ee020750
bring back disconnect only for CLS purposes
9 years ago
53e9627001
unify request as a store key for both http and websockets calls
9 years ago
c5e62f9a58
fixes #4454
9 years ago
86106971c4
closes #4382
9 years ago
3c607f2612
fix two crashes
9 years ago
c71ffed69c
closes #4362
9 years ago
b1284f900d
up toobusy default
9 years ago
184a2c4540
IP blacklist functionality -- re: #4367
...
Squashed commit of the following:
commit 5c42fd732d091fa66cf5b45a2af5e1697cc1efcd
Author: Julian Lam <julian@nodebb.org>
Date: Mon Mar 14 17:29:45 2016 -0400
allowing blacklist.test to be called synchronously
commit 979faf2dba5e6f6e2ae1bd07341e63678438daf1
Author: Julian Lam <julian@nodebb.org>
Date: Mon Mar 14 17:01:14 2016 -0400
added plain ipv6 support and finished middleware logic
commit d4b72fc1aadff34df3ed7dec52ca8d3c3728a078
Author: Julian Lam <julian@designcreateplay.com>
Date: Fri Mar 11 16:05:31 2016 -0500
WIP IP Banning logic middleware
commit f08b2553890c5522b6a1eaf521fe4e94df40574a
Author: Julian Lam <julian@designcreateplay.com>
Date: Fri Mar 11 15:26:27 2016 -0500
tweaks to ACP, rule validator
commit 868abacaa494e6b8a88bd4ea429b1b066a9ecb2e
Author: Julian Lam <julian@designcreateplay.com>
Date: Fri Mar 11 13:50:05 2016 -0500
IP Banning ACP page, styling, save&load functionality
9 years ago
c156d1cb34
closes #4344
9 years ago
07586c9023
merge
9 years ago
088940d4c7
Squashed commit of the following:
...
commit 49e6c0040cc82c1e2684933a8e167ef14854aff8
Author: Julian Lam <julian@designcreateplay.com>
Date: Thu Feb 25 16:12:15 2016 -0500
added recording and charts for topic and post counts globally and by cid
commit e02ff70757f778aa016fbc42ef10a5da2d07a9d9
Author: Julian Lam <julian@designcreateplay.com>
Date: Thu Feb 25 15:35:49 2016 -0500
added labels to charts
commit e75d83bf3886e5183bcf5fcd848d71c513761e01
Author: Julian Lam <julian@designcreateplay.com>
Date: Thu Feb 25 13:30:47 2016 -0500
added per category graphs to ACP management page
commit e3f543200950925cc9e8bf33cccb592f949a100e
Author: Julian Lam <julian@designcreateplay.com>
Date: Thu Feb 25 12:36:11 2016 -0500
updated analytics to move helper methods to analytics lib and sending per category analytics to ACP page
commit 01891d8f7c408925fcdad18dcaa941e5ebbeb9b2
Author: Julian Lam <julian@designcreateplay.com>
Date: Wed Feb 24 16:48:55 2016 -0500
saving per-category analytics, and updated the writeData method to use async for "clarity"
9 years ago
bdc8e6f04f
Merge remote-tracking branch 'upstream/master'
9 years ago
88e4591f88
closes #4194
9 years ago
496e5ae8bf
comment
9 years ago
7f0c46b3a7
Merge remote-tracking branch 'upstream/master'
9 years ago
4245cb2739
adding cls support for ws
9 years ago
d7df6c0b06
remove more from config
9 years ago
852a1a178e
oops
9 years ago
61c76e4aba
add continuation-local-storage support
9 years ago
f94cd21f83
#3875 filter:scripts.get now acts like filter:admin.scripts.get; does not get minified
9 years ago
9430a626f4
#3875
9 years ago
00a22e945d
closes #3899
9 years ago
7ad90b4ef6
closes #2659
9 years ago
ad9a1d0f2c
closes #3989
...
Squashed commit of the following:
commit 23de0708708ed190eafbcd6ea93d43333cb87aa3
Author: Julian Lam <julian@designcreateplay.com>
Date: Wed Dec 23 10:48:16 2015 -0500
wired up session revocation, #3989
commit 45a3f18321b74a9b6893d404b6c870f1ec4d95cd
Author: Julian Lam <julian@designcreateplay.com>
Date: Wed Dec 23 09:49:27 2015 -0500
session deletion via session uuid
commit 2bf87338cf9bfa2df0b299639421d8da7553c69a
Author: Julian Lam <julian@designcreateplay.com>
Date: Tue Dec 22 13:53:35 2015 -0500
WIP #3989
commit 623f45c3fa8b96f8b6eec0613eb7f9463348ab93
Author: Julian Lam <julian@designcreateplay.com>
Date: Tue Dec 22 10:22:24 2015 -0500
saving more metadata and displaying sessions in UCP #3989
commit d0567ed7cc33a1aea66e921b657f782038f32191
Author: Julian Lam <julian@designcreateplay.com>
Date: Tue Dec 22 10:21:38 2015 -0500
updated fontawesome to v4.5.0
commit 7131c97fe8ab42838eb2915a04e74f80f3d9a133
Author: Julian Lam <julian@designcreateplay.com>
Date: Tue Dec 22 09:39:16 2015 -0500
saving user-agent metadata into user session #3989
commit 661b7e6dba774b80b5dc6d04f89a79f809ff791e
Author: Julian Lam <julian@designcreateplay.com>
Date: Tue Dec 22 09:23:24 2015 -0500
New user auth methods to add/revoke sessions, #3989
9 years ago
cc4997aeca
fixes #3940
9 years ago
3a520cdfbf
Successful web installer now doesn't show 503
10 years ago
9589de551e
added toggler to disable toobusy if necessary
10 years ago
33f07b82f9
closes #3893
10 years ago
ecd777b659
closes https://github.com/NodeBB/nodebb-theme-persona/issues/206
10 years ago
5a9edf5973
closes #3881
10 years ago
c55abdd095
closes #3815
10 years ago
016aef1716
too busy check on prod
10 years ago
b8b9da2c30
Squashed commit of the following:
...
commit 62d59620d26bc97c7d689e9af57cd8bff654c79e
Author: Julian Lam <julian@designcreateplay.com>
Date: Wed Nov 4 11:04:27 2015 -0500
tweaked 503 template
commit 15a61cbc239c9d654691d91cdadce59e13d97586
Author: Julian Lam <julian@designcreateplay.com>
Date: Wed Nov 4 10:58:19 2015 -0500
added text about reloading being required if threshold values are changed
commit 3fe87699332ef0628b4db31f4afef245802a7bc0
Author: Julian Lam <julian@designcreateplay.com>
Date: Wed Nov 4 10:53:35 2015 -0500
added ACP settings for toobusy
commit f6a9964baff051072052e6ef99da9e1ffba014df
Author: Julian Lam <julian@designcreateplay.com>
Date: Wed Nov 4 08:53:53 2015 -0500
removed unused 503a template
commit e6d444736baf4c676f8461d30a5504c6e45df163
Author: Julian Lam <julian@designcreateplay.com>
Date: Wed Nov 4 02:01:11 2015 -0500
updated code to send static 503 instead of maintenance-style page
commit 11089ae2bb833e068b01ee77ee745d9fd5344805
Author: Julian Lam <julian@designcreateplay.com>
Date: Wed Nov 4 01:18:45 2015 -0500
added toobusy support so the Node process doesn't fall over at high load
10 years ago
ca4440b8af
closes #3799
10 years ago
f4bfcc7351
removed icon:bgColor and icon:text from db calls
...
calculates from username on the fly
10 years ago
8d4209d42c
Merge remote-tracking branch 'origin/master' into user-icons
10 years ago
9bef54b5ed
fix title for dashboard
10 years ago
526afc0910
Merge remote-tracking branch 'origin/master' into user-icons
10 years ago
07c50cba7d
titles for ACP routes
10 years ago
b52475c270
Merge remote-tracking branch 'origin/master' into user-icons
...
Conflicts:
public/src/client/account/edit.js
src/middleware/middleware.js
src/socket.io/meta.js
src/socket.io/user/picture.js
src/user.js
src/views/admin/manage/group.tpl
10 years ago
751a6c6839
got rid of extra call to user.getSettings
10 years ago
f2d6f931af
closes #3505
10 years ago
f5e7d1ce01
private uploads
10 years ago
3a3c5486b7
expose method
10 years ago
94129287d0
moved non-async code
10 years ago
17dd1ff485
fix next
10 years ago
Julian Lam
Peter Jaszkowiak
Barış Soner Uşaklı
Baris Usakli
Marc-Aurèle DARCHE
psychobunny
Sergii Paryzhskyi
Mathias Schreck
Ben Lubar
akhoury
Nate Lee
Dravere
Julian Lam
pichalite
Ben Lubar