609 Commits (63a741cfb3a71013996e8aac101f2e526d683dd9)

Author SHA1 Message Date
Baris Usakli 47143a4a09 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Barış Soner Uşaklı a11058bce2 closes #6004 7 years ago
Barış Soner Uşaklı 41fbf7117d Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Barış Soner Uşaklı 056e4f0601 #6004 7 years ago
Barış Soner Uşaklı ce3e1f31ab fix for #6004 7 years ago
Julian Lam 9cbf1597cd Merge remote-tracking branch 'origin/master' into develop 7 years ago
Baris Usakli 68bcfb2883 closes #5975 7 years ago
Julian Lam 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
Julian Lam 6852c92ed6 Merge remote-tracking branch 'origin/develop' 8 years ago
Peter Jaszkowiak dc87d7fc0f Use .js instead of .jst
Fix #5934
8 years ago
Julian Lam dea372a5c5 fixes #5932 8 years ago
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
8 years ago
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
8 years ago
Barış Soner Uşaklı 0498832317 closes #5888 8 years ago
Julian Lam 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
Baris Usakli 4ac8d29f06 closes #5847 8 years ago
Barış Soner Uşaklı 493cd16f39 closes #5848 8 years ago
Julian Lam f59f48c6e1 use setImmediate 8 years ago
Julian Lam c9c27b86c4 added back logic to strip leading slashes, but after the fix to app.all 8 years ago
Baris Usakli e9639833c5 add router.all 8 years ago
Julian Lam 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
Baris Usakli dc110e2e3f closes #5818 8 years ago
Baris Usakli 59aeee6516 remove addExpiresHeaders 8 years ago
Barış Soner Uşaklı 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
Baris Usakli e0de922ede Revert "widgets refactor"
This reverts commit 9e94edb5aa.
8 years ago
Baris Usakli 9e94edb5aa widgets refactor
render widgets server side
widgets can use all the data the template can use
8 years ago
Baris Usakli 7538210b07 #5772
load correct timeago settings on cold load instead of after page load
8 years ago
Marc-Aurèle DARCHE 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
Barış Soner Uşaklı b64ba40c67 closes #5772 8 years ago
Barış Soner Uşaklı 22131640fd closes #5749 8 years ago
psychobunny 50367a971e req should be req. 👍 8 years ago
Barış Soner Uşaklı 08aaabd33c closes #5642 8 years ago
Baris Usakli 062bced3dd cleanup and tests 8 years ago
Barış Soner Uşaklı f57b5f4e4c refactor 8 years ago
Barış Soner Uşaklı 29135dfed3 timeago locale test 8 years ago
Barış Soner Uşaklı 01e2263c01 more tests 8 years ago
Barış Soner Uşaklı 608a7d120c error handler tests 8 years ago
Barış Soner Uşaklı 3a1eba2537 merge 8 years ago
psychobunny b3bd70235a refactor ban messaging; add ban duration to message; use bootbox instead of alert 8 years ago
Barış Soner Uşaklı 4900f21dd5 fix crash in header 8 years ago
barisusakli 33e8ecc1f4 closes #5404 8 years ago
Peter Jaszkowiak 64bf542d17 Fix HTML `lang` attribute using the `defaultLang`
Themes need `lang="{function.localeToHTML, userLang, defaultLang}"` in
their header.tpl file
8 years ago
Julian Lam d18cfced96 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Peter Jaszkowiak 1ed571189c Make utils and translator easier to require
Move utils.walk to file.walk, backwards compatible
8 years ago
psychobunny 5985a8a7a3 closes #5574 8 years ago
psychobunny e121a5a798 closes #5574 8 years ago
Julian Lam 1ebbbdd3f9 Merge remote-tracking branch 'origin/master' into develop 8 years ago
barisusakli 27b030a71c test for #5523 8 years ago
Julian Lam 860999fa6c Merge remote-tracking branch 'origin/master' into develop 8 years ago
barisusakli 74d2835a1f escape body class parts 8 years ago
Julian Lam 793555a344 Merge branch 'master' into develop 8 years ago
barisusakli 992e3128bd closes #5499 8 years ago
Julian Lam af2d9fb85b Merge branch 'master' into develop 8 years ago
barisusakli e85e35cf0c closes #5497 8 years ago
barisusakli 2188036148 controllers/users refactor 8 years ago
Julian Lam ddea9f534e running eslint again 8 years ago
Julian Lam 72e77772db Merge branch 'master' into develop 8 years ago
Peter Jaszkowiak dd2b930824 Resolve merge conflicts, minify only `.js` files 8 years ago
Julian Lam 8154e29ad5 Merge branch 'master' into develop 8 years ago
Barış Soner Uşaklı 9079ee5b14 style 8 years ago
Peter Jaszkowiak 4bb49a7171 ESlint no-unused-vars 8 years ago
Peter Jaszkowiak 09e868ce5f ESlint no-useless-escape, no-else-return 8 years ago
Peter Jaszkowiak a0a50677da ESlint n-loop-func, yoda 8 years ago
Peter Jaszkowiak c4bdb72941 ESlint no-unneeded-ternary
and no-extend-native, no-sequences
8 years ago
Peter Jaszkowiak 896c8c7343 ESlint object-curly-spacing 8 years ago
Peter Jaszkowiak 3b0dd2d1ef ESlint padded-blocks 8 years ago
Peter Jaszkowiak feb8405f95 ESlint eol-last 8 years ago
Peter Jaszkowiak 41896e1fc7 ESlint lines-around-directive 8 years ago
Peter Jaszkowiak a038c66549 ESlint quotes 8 years ago
Peter Jaszkowiak 604358ecc4 ESlint keyword-spacing, no-multi-spaces 8 years ago
Peter Jaszkowiak a5a3f3089a ESlint no-mixed-operators 8 years ago
Peter Jaszkowiak b1b486f729 ESlint quote-props 8 years ago
Peter Jaszkowiak 3361a72725 ESlint no-plusplus
and no-empty, space-unary-ops
8 years ago
Peter Jaszkowiak 52f2028206 ESlint no-multiple-empty-lines 8 years ago
Peter Jaszkowiak 2ba46808a1 ESlint one-var, fix comma-dangle 8 years ago
Peter Jaszkowiak bc1d70c126 ESlint comma-dangle 8 years ago
Julian Lam fcaefbadca Merge remote-tracking branch 'origin/master' into develop 8 years ago
barisusakli 30f35c42f6 fix eslint 8 years ago
barisusakli a3cbe5e090 #5436 8 years ago
barisusakli 21eefb9760 closes #5436 8 years ago
Julian Lam 7f124a3ccf Merge branch 'master' into develop 8 years ago
Julian Lam 7ba111acdd Merge pull request #5420 from NodeBB/assets-route
/assets/uploads
8 years ago
Peter Jaszkowiak 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
Julian Lam 8a0a74d95e Merge remote-tracking branch 'origin/master' into develop 8 years ago
Julian Lam b5daedb7a3 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Peter Jaszkowiak bb1bfb0449 Merge branch 'master' into assets-route 8 years ago
barisusakli a15aaaf389 closes #5394
dont allow socket.emits during maintenance mode
8 years ago
Julian Lam bfd16d188e Merge branch 'master' into develop 8 years ago
Peter Jaszkowiak 360a35d0a6 Resolve merge conflicts 8 years ago
barisusakli ae7f9bac98 prevent crash if uri is malformed 8 years ago
Julian Lam ae279fe57f casting some values as int, in ensureSelfOrPrivileged middleware 8 years ago
Julian Lam 73879b824c Merge branch 'master' into develop 8 years ago
Peter Jaszkowiak 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
Peter Jaszkowiak 2f07c18c5a All hail the glorious translation prebuilding 8 years ago
Julian Lam 9dcbe875a0 Merge branch 'master' into develop 8 years ago
Julian Lam 2a9088d571 updating checkGlobalPrivacySettings middleware to hook into write-api for auth 8 years ago
Julian Lam d29361f4c9 added additional visibility masks for profile menu hook, also added isPrivileged user method, closes #5306 8 years ago
Peter Jaszkowiak ffa2bd14f8 Fix reverse proxies breaking admin translations 8 years ago
barisusakli 53fe432d8a fix hook 8 years ago
barisusakli 97c0b33cf6 filter:middleware.render 8 years ago
Julian Lam acf2e4078b fixes #5263 8 years ago
Julian Lam 33ff5e09bb updated revoke session middleware to allow self or admin or global mod invocation, tweaked tests a bit 8 years ago
Julian Lam 23cdeeb344 linting :shipit: 8 years ago
Julian Lam a1b49a98e7 locking down session deletion route to admins and global mods only 8 years ago
barisusakli 6beacdb80c fix headers for new installs
encodeURI(undefined) === "undefined"
8 years ago
Julian Lam b7fa8c1db1 fixes #5230 8 years ago
Peter Jaszkowiak 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
8 years ago
barisusakli 17f8afd0dc closes #5230 8 years ago
barisusakli 38bc8ad5ae maintenance tests 8 years ago
barisusakli 2476ab3684 closes #5202 8 years ago
barisusakli ce9be7e694 closes #5132 8 years ago
Julian Lam 663f05b972 adding back banReason to header rendering, as it regressed in 1f10e0b 8 years ago
Julian Lam 1f10e0b287 fixed #5166 8 years ago
Julian Lam f97f45a138 logic to show a modal to banned users when they try to log in via SSO 8 years ago
Sergii Paryzhskyi 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
8 years ago
barisusakli a995afbfe0 fix style 8 years ago
Julian Lam 2463e85c0d allowing moderators access to the account info page 8 years ago
Barış Soner Uşaklı 041022db63 #5145
dont crash if res.locals.config is undefined
8 years ago
barisusakli c972a339e6 fix value 8 years ago
barisusakli 862678eefe encodeURIComponent header values 8 years ago
Julian Lam ead4de6c6f Merge branch 'fix-some-code-lint' of https://github.com/HeeL/NodeBB into HeeL-fix-some-code-lint 8 years ago
Julian Lam eb16eb318e exposing links to moderator tools pages in user logged-in dropdown, closes #5113 8 years ago
HeeL 4a3c31b2dc Fix space-before-function-paren linter rule 8 years ago
HeeL 3fa1c1f927 Fix space-infix-ops linter rule 8 years ago
barisusakli 98fff29869 closes #5082 9 years ago
barisusakli 15409f92cd escape history data, hide moderation note in api 9 years ago
barisusakli 282ac56bf6 adde expose methods back
used by plugins
9 years ago
barisusakli aefba6e2b1 removed some methods
helpers.getBaseUser
exposeUid, exposeGroupName
9 years ago
barisusakli 478da29423 closes #5020 9 years ago
barisusakli 07fe5057e1 make sure validator.escape() receives strings only 9 years ago
barisusakli a0f2e8a8ec use req.uid 👍 9 years ago
barisusakli 8f408faf46 organize middlewares
removed app.locals.middleware
middlewares can be required anywhere, ie in controllers
9 years ago
barisusakli f7540a7edc closes #4811 9 years ago
barisusakli 409621c661 closes #4843 9 years ago
Mathias Schreck ce9ee62fa0 Handle callback errors 9 years ago
barisusakli 2103880d61 only extend 5mins if less than 5mins left 9 years ago
barisusakli 514c12aa68 closes #4885 9 years ago
barisusakli 2606844d98 closes #4868 9 years ago
Julian Lam 71a5e4a8a1 better error handling for session revocation if no login session is present, #4214 9 years ago
Ben Lubar 40b57d6cbe add "Admin Approval for IPs", which works like Normal for new users and Admin Approval for sockpuppet accounts (#4882) 9 years ago
barisusakli fcf145fc81 403 if not logged in, show error 9 years ago
psychobunny f3c48eb14a oops, #4832 9 years ago
psychobunny 6df3157748 closes #4832 9 years ago
barisusakli 8ea5752b50 added url property to all routes 9 years ago
akhoury 46a57f5d5c rm cls because it's not ready yet 9 years ago
Julian Lam f03018b7cc updated middlewares so if you have not completed registration, you will be required to do so 9 years ago
barisusakli bdc23b4a8d add reputation to app.user 9 years ago
Julian Lam 149565169b closes #4658 9 years ago
Nate Lee 07c59ae174 changed cls.getItem to equal cls.get from cls.set
based off of naming schema
9 years ago
Dravere 2fd6391081 Made the session cookie aware of the possible relative path (#4663) 9 years ago