Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-11 07:00:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
14,607 Commits 75 Branches 492 Tags
32d37465fb3efc67182dce51a056ec146bbd0a22
Commit Graph

459 Commits

Author SHA1 Message Date
Julian Lam
793555a344 Merge branch 'master' into develop 2017-03-07 14:35:49 -05:00
barisusakli
992e3128bd closes #5499 2017-03-07 13:09:19 +03:00
Julian Lam
af2d9fb85b Merge branch 'master' into develop 2017-03-06 09:51:11 -05:00
barisusakli
e85e35cf0c closes #5497 2017-03-05 00:46:18 +03:00
barisusakli
2188036148 controllers/users refactor 2017-03-02 00:14:30 +03:00
Julian Lam
ddea9f534e running eslint again 2017-02-24 12:47:46 -05:00
Julian Lam
72e77772db Merge branch 'master' into develop 2017-02-24 12:46:40 -05:00
Peter Jaszkowiak
dd2b930824 Resolve merge conflicts, minify only .js files 2017-02-23 18:31:49 -07:00
Julian Lam
8154e29ad5 Merge branch 'master' into develop 2017-02-23 13:08:20 -05:00
Barış Soner Uşaklı
9079ee5b14 style 2017-02-23 20:44:23 +03:00
Peter Jaszkowiak
4bb49a7171 ESlint no-unused-vars 2017-02-18 15:05:36 -07:00
Peter Jaszkowiak
09e868ce5f ESlint no-useless-escape, no-else-return 2017-02-18 14:27:26 -07:00
Peter Jaszkowiak
a0a50677da ESlint n-loop-func, yoda 2017-02-18 14:00:29 -07:00
Peter Jaszkowiak
c4bdb72941 ESlint no-unneeded-ternary 
and no-extend-native, no-sequences
 2017-02-18 12:59:46 -07:00
Peter Jaszkowiak
896c8c7343 ESlint object-curly-spacing 2017-02-18 12:30:49 -07:00
Peter Jaszkowiak
3b0dd2d1ef ESlint padded-blocks 2017-02-18 02:32:24 -07:00
Peter Jaszkowiak
feb8405f95 ESlint eol-last 2017-02-18 02:30:48 -07:00
Peter Jaszkowiak
41896e1fc7 ESlint lines-around-directive 2017-02-18 02:28:54 -07:00
Peter Jaszkowiak
a038c66549 ESlint quotes 2017-02-18 01:56:23 -07:00
Peter Jaszkowiak
604358ecc4 ESlint keyword-spacing, no-multi-spaces 2017-02-18 01:52:56 -07:00
Peter Jaszkowiak
a5a3f3089a ESlint no-mixed-operators 2017-02-18 01:51:11 -07:00
Peter Jaszkowiak
b1b486f729 ESlint quote-props 2017-02-18 01:19:20 -07:00
Peter Jaszkowiak
3361a72725 ESlint no-plusplus 
and no-empty, space-unary-ops
 2017-02-18 01:12:18 -07:00
Peter Jaszkowiak
52f2028206 ESlint no-multiple-empty-lines 2017-02-17 22:08:23 -07:00
Peter Jaszkowiak
2ba46808a1 ESlint one-var, fix comma-dangle 2017-02-17 20:20:42 -07:00
Peter Jaszkowiak
bc1d70c126 ESlint comma-dangle 2017-02-17 19:31:21 -07:00
Julian Lam
fcaefbadca Merge remote-tracking branch 'origin/master' into develop 2017-02-15 12:06:52 -05:00
barisusakli
30f35c42f6 fix eslint 2017-02-13 22:42:47 +03:00
barisusakli
a3cbe5e090 #5436 2017-02-13 22:24:26 +03:00
barisusakli
21eefb9760 closes #5436 2017-02-12 20:36:12 +03:00
Julian Lam
7f124a3ccf Merge branch 'master' into develop 2017-02-10 12:55:11 -05:00
Julian Lam
7ba111acdd Merge pull request #5420 from NodeBB/assets-route 
/assets/uploads
 2017-02-09 16:08:12 -05:00
Peter Jaszkowiak
aaacdb8413 Fix #5416, uploads path config setting 
- Finish moving uploads route to `/assets/uploads`
- Remove `upload_url` config setting, it was broken
 2017-02-08 11:41:34 -07:00
Julian Lam
8a0a74d95e Merge remote-tracking branch 'origin/master' into develop 2017-02-07 16:03:54 -05:00
Julian Lam
b5daedb7a3 Merge remote-tracking branch 'origin/master' into develop 2017-02-07 15:45:21 -05:00
Peter Jaszkowiak
bb1bfb0449 Merge branch 'master' into assets-route 2017-02-06 15:52:54 -07:00
barisusakli
a15aaaf389 closes #5394 
dont allow socket.emits during maintenance mode
 2017-02-03 19:02:43 +03:00
Julian Lam
bfd16d188e Merge branch 'master' into develop 2017-02-03 10:04:49 -05:00
Peter Jaszkowiak
360a35d0a6 Resolve merge conflicts 2017-02-02 22:15:26 -07:00
barisusakli
ae7f9bac98 prevent crash if uri is malformed 2017-02-02 13:11:33 +03:00
Julian Lam
ae279fe57f casting some values as int, in ensureSelfOrPrivileged middleware 2017-01-24 12:33:27 -05:00
Julian Lam
73879b824c Merge branch 'master' into develop 2017-01-20 12:33:17 -05:00
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=`
 2017-01-14 22:38:40 -07:00
Peter Jaszkowiak
2f07c18c5a All hail the glorious translation prebuilding 2017-01-14 14:08:52 -07:00
Julian Lam
9dcbe875a0 Merge branch 'master' into develop 2017-01-13 15:01:34 -05:00
Julian Lam
2a9088d571 updating checkGlobalPrivacySettings middleware to hook into write-api for auth 2017-01-12 15:55:56 -05:00
Julian Lam
d29361f4c9 added additional visibility masks for profile menu hook, also added isPrivileged user method, closes #5306 2017-01-11 15:06:28 -05:00
Peter Jaszkowiak
ffa2bd14f8 Fix reverse proxies breaking admin translations 2017-01-07 22:48:57 -07:00
barisusakli
53fe432d8a fix hook 2016-12-13 14:27:54 +03:00
barisusakli
97c0b33cf6 filter:middleware.render 2016-12-13 14:22:37 +03:00