Commit Graph

313 Commits (8a87311d5c35c259e0d4f6b5889d78675dec32d1)

Author SHA1 Message Date
Julian Lam 6e7b505ea7 more linting
Julian Lam ddea9f534e running eslint again
Julian Lam 72e77772db Merge branch 'master' into develop
Julian Lam 995f8296a4 linting
Julian Lam e71bd7a27f Merge branch 'master' into styleguide
barisusakli 048eb8a320 some helper tests
barisusakli 04b07e292c thumb tests
barisusakli ca1fe557c7 topic controller tests
barisusakli 3a87f2566a more group tests
barisusakli b7d5bc7dc8 more group tests
Peter Jaszkowiak dd2b930824 Resolve merge conflicts, minify only `.js` files
Peter Jaszkowiak ee9d7584e4 Fix test, misc
Barış Soner Uşaklı 35ff71c37d more tests
Julian Lam c09f994b0a Merge remote-tracking branch 'origin/master' into develop
Julian Lam a9f144230e Merge branch 'master' into develop
Barış Soner Uşaklı 743f758f75 set origin header to url
Barış Soner Uşaklı c168ed43d4 up build timeout
Julian Lam 672d7352bb Merge branch 'master' into develop
barisusakli 09d0ce4778 post tests
barisusakli 2dac3d2292 closes , blacklist tests
barisusakli 5c01c7b1c7 delayed notification test
Julian Lam 62e0f5f883 Merge remote-tracking branch 'origin/master' into develop
Barış Soner Uşaklı 89380824f8 navigation test
barisusakli f2a795a9b7 fix tests
barisusakli 799f688503 closes , invitation tests
barisusakli 4ee7edad64 test uploadProfileImageFromUrl
barisusakli ef90702049 closes
Peter Jaszkowiak 23540afaeb Resolve merge conflicts
Peter Jaszkowiak 93f38d4f30 ESlint no-multi-assign
and max-nested-callbacks, no-mixed-requires, max-statements-per-line
Peter Jaszkowiak 4bb49a7171 ESlint no-unused-vars
Peter Jaszkowiak c18808fdeb ESlint no-useless-concat, no-mixed-spaces-and-tabs
Peter Jaszkowiak fdf4f873bf ESlint eqeqeq
and require-jsdoc, no-negated-condition
Peter Jaszkowiak 09e868ce5f ESlint no-useless-escape, no-else-return
Peter Jaszkowiak 896c8c7343 ESlint object-curly-spacing
barisusakli 7842c3411c remove logs
barisusakli b33d34f7cf refactor user/picture.js
Peter Jaszkowiak 1493afee2a ESlint indent
Peter Jaszkowiak 3b0dd2d1ef ESlint padded-blocks
Peter Jaszkowiak feb8405f95 ESlint eol-last
Peter Jaszkowiak f3a8256f35 ESlint strict
Peter Jaszkowiak a038c66549 ESlint quotes
Peter Jaszkowiak 604358ecc4 ESlint keyword-spacing, no-multi-spaces
Peter Jaszkowiak 2e031f3759 ESlint comma-spacing
Peter Jaszkowiak 277a7fb8b4 ESlint key-spacing, no-trailing-spaces
Peter Jaszkowiak 34e233fe1d ESlint spaced-comment
Peter Jaszkowiak 532951c24f ESlint space-in-parens, block-spacing
Peter Jaszkowiak 3361a72725 ESlint no-plusplus
and no-empty, space-unary-ops
Peter Jaszkowiak d7526b5e44 ESlint array-bracket-spacing
and object-property-newline
Peter Jaszkowiak 52f2028206 ESlint no-multiple-empty-lines
Peter Jaszkowiak b09b3aef7f ESlint no-undef, remove global comments
Peter Jaszkowiak 2ba46808a1 ESlint one-var, fix comma-dangle
Peter Jaszkowiak bc1d70c126 ESlint comma-dangle
pichalite aacd8a2422 Fix return and tests
Julian Lam fcaefbadca Merge remote-tracking branch 'origin/master' into develop
barisusakli 4d8d23830d utils tests
barisusakli 4bbf517af3 rewards test
barisusakli 9f67142786 closes
Julian Lam 7f124a3ccf Merge branch 'master' into develop
barisusakli f4a6527ce6 getRecentPosterUids test
Julian Lam 7ba111acdd Merge pull request from NodeBB/assets-route
/assets/uploads
Julian Lam a17c26ea45 Merge branch 'master' into develop
barisusakli 667582744e fix eslint
barisusakli ab7867d4b5 topic follow tests, fix filterIgnoring
Peter Jaszkowiak aaacdb8413 Fix , uploads path config setting
- Finish moving uploads route to `/assets/uploads`
- Remove `upload_url` config setting, it was broken
Julian Lam 8a0a74d95e Merge remote-tracking branch 'origin/master' into develop
Julian Lam b5daedb7a3 Merge remote-tracking branch 'origin/master' into develop
Peter Jaszkowiak bb1bfb0449 Merge branch 'master' into assets-route
barisusakli 959315c8f7 test admin/search
Peter Jaszkowiak fdad66f58e Revert "Fix tests to use default activated plugin"
This reverts commit 44a59ac435.
Peter Jaszkowiak 44a59ac435 Fix tests to use default activated plugin
Julian Lam bfd16d188e Merge branch 'master' into develop
barisusakli e3a2e13438 build test
Peter Jaszkowiak 360a35d0a6 Resolve merge conflicts
Peter Jaszkowiak 553567c3b2 Refactor `nodebb`, move `build.js`, add `--dev`
barisusakli 5c217e873e build all targets before test
barisusakli 366ab103a4 closes
barisusakli f1f00b63fb closes
Peter Jaszkowiak 001aa3d1a8 Fix tests, npm Windows fixes
Julian Lam 48909e753c Merge branch 'master' into develop
Dominic Lennon 691b46d38b Fixing lint issues
Dominic Lennon f0add97cf9 Fixing tests
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=`
Julian Lam 10f270d016 adding byPid zset for flags
Julian Lam 3861b2dd80 Merge remote-tracking branch 'origin/master' into develop
Julian Lam 541f51e947 restrict flags interface so that moderators only see flags from cids they can actually moderate
barisusakli 6b2dde02b5 closes
pichalite a0ff3734cf Add more user tests
pichalite 0ea477abde Add more user tests
Julian Lam 29c7ae7645 Merge remote-tracking branch 'origin/master' into develop
Barış Soner Uşaklı c4d4d2385b closes closes
barisusakli a1af59def3 add missing return, fix tests
Julian Lam c640bdf2b9 Merge branch 'master' into develop
barisusakli 988c485874 post tools test
barisusakli a0c217446a fix missing semicolon
barisusakli caacae093d fix tests
barisusakli f8d958e065 rooms.getAll test
barisusakli 1fed01fe43 ability to filter search by tags
Julian Lam 76bcc1c327 Merge branch 'flagging-refactor' into develop
Julian Lam 07ac7dce84 minor tweaks to test to be redis-compatible
Julian Lam 5e52cfdf86 removed one more old flag test for