663 Commits (59d081507345566fd43aed9029955f0e6fa56215)

Author SHA1 Message Date
barisusakli 38e16ca8f6 Merge branch 'master' into develop 8 years ago
barisusakli 65a65b19c0 tests for #5600 8 years ago
Julian Lam 7f8f197e60 Merge branch 'master' into develop 8 years ago
barisusakli 449352d899 wait for all routes to load before listening 8 years ago
Julian Lam af2d9fb85b Merge branch 'master' into develop 8 years ago
barisusakli b060bda8a0 some more refactors 8 years ago
Julian Lam b1ceec7571 Merge remote-tracking branch 'origin/master' into develop 8 years ago
psychobunny 2a311d2ff6 printing initialization message twice for some reason 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
Peter Jaszkowiak 8b533bb431 Fixes #5474 8 years ago
Julian Lam 672d7352bb Merge branch 'master' into develop 8 years ago
Peter Jaszkowiak a038c66549 ESlint quotes 8 years ago
Peter Jaszkowiak 52f2028206 ESlint no-multiple-empty-lines 8 years ago
Peter Jaszkowiak bc1d70c126 ESlint comma-dangle 8 years ago
Peter Jaszkowiak c75391f9f5 Sound system improvements
- Fix sound ACP uploads
- Display soundpack names with sound files
- Soundpacks can have sounds with identical names
- Link sounds during build step
- Generate map of sound name to file name during build step
- Change how soundpacks work. It's now done via a field in plugin.json
8 years ago
Julian Lam 8a0a74d95e Merge remote-tracking branch 'origin/master' into develop 8 years ago
Peter Jaszkowiak 360a35d0a6 Resolve merge conflicts 8 years ago
Julian Lam 48909e753c Merge branch 'master' into develop 8 years ago
Dominic Lennon a06e39528f Code review change 8 years ago
Peter Jaszkowiak 8c86b2e32c Build pipeline improvements
- Refactor meta/css
- `fs.link` usage consolidated to `file.link`
- rimraf built modules directory to fix error
- Remove `local-assets` flag
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
Dominic Lennon ed19454eca Adding more specific timing for session timings 8 years ago
Peter Jaszkowiak 11f7cc4163 Pass tests 8 years ago
barisusakli 853cea7fec removed emitter.js 8 years ago
barisusakli 4f0e93732a #5211
remove passing js/css between procs
8 years ago
Julian Lam 299fcb99f1 more progress on #5211 8 years ago
barisusakli ce7513c347 allow cookieDomain from config.json 8 years ago
barisusakli 1a63672e66 more test fixes 8 years ago
barisusakli 817cd29f00 try require from root 8 years ago
barisusakli b8a3ca98cb added callback to webserver.listen
wait for webserver to be ready to run tests
added topic restore test
added test to load topic via controller
8 years ago
HeeL 4a3c31b2dc Fix space-before-function-paren linter rule 8 years ago
barisusakli 102beb5f93 closes #5080 8 years ago
barisusakli d60ab3c74c removed cacheStaticFiles 8 years ago
barisusakli b0b6c66f77 fix unix domain socket 8 years ago
barisusakli 80c98e5ecf closes #4989 9 years ago
barisusakli 5cd6614d03 refactor 9 years ago
barisusakli 89f550ce7c moved middleware requires 9 years ago
barisusakli df7cfe2146 missing favicon dep 9 years ago
barisusakli 8f408faf46 organize middlewares
removed app.locals.middleware
middlewares can be required anywhere, ie in controllers
9 years ago
Anil Mandepudi c666a7efda add static:assets.prepare hook (#4889)
* add static:assets.prepare hook

add static:assets.prepare hook to be called before css minification so that themes/plugins can modify less vars.

* change parameter
9 years ago
Julian Lam 437770538c work-in-progress commit for #4655 9 years ago
Julian Lam f1deaa6fa5 Exposing middleware to app/req, organisation.
Organisation -- moved 404 and error controllers into the
controllers file instead of as local variables in routes/index
9 years ago
Julian Lam 2ddcaa9ce1 added new hook for hotswap preparation 9 years ago
Julian Lam 94a505a6bb removed symlink logic and using route bridging instead.
Also allowed plugins to define modules from their plugin.json
9 years ago
Julian Lam f91f705f90 Merge branch 'master' into fix-vendors 9 years ago
psychobunny acd24d856f run tasks in series to speed up startup time 9 years ago
psychobunny baeed22f20 grunt: only compile ACP less if that was changed, and vice versa with theme/plugin less 9 years ago
Julian Lam 184a2c4540 IP blacklist functionality -- re: #4367
Squashed commit of the following:

commit 5c42fd732d091fa66cf5b45a2af5e1697cc1efcd
Author: Julian Lam <[email protected]>
Date:   Mon Mar 14 17:29:45 2016 -0400

    allowing blacklist.test to be called synchronously

commit 979faf2dba5e6f6e2ae1bd07341e63678438daf1
Author: Julian Lam <[email protected]>
Date:   Mon Mar 14 17:01:14 2016 -0400

    added plain ipv6 support and finished middleware logic

commit d4b72fc1aadff34df3ed7dec52ca8d3c3728a078
Author: Julian Lam <[email protected]>
Date:   Fri Mar 11 16:05:31 2016 -0500

    WIP IP Banning logic middleware

commit f08b2553890c5522b6a1eaf521fe4e94df40574a
Author: Julian Lam <[email protected]>
Date:   Fri Mar 11 15:26:27 2016 -0500

    tweaks to ACP, rule validator

commit 868abacaa494e6b8a88bd4ea429b1b066a9ecb2e
Author: Julian Lam <[email protected]>
Date:   Fri Mar 11 13:50:05 2016 -0500

    IP Banning ACP page, styling, save&load functionality
9 years ago
Julian Lam e1323c0295 Updated js code so vendors can be added to the modules folder, so
they can be required properly and we can finally get rid of that
really annoying "mismatched anonymous" error in Require.js.

First module to make the transition: Chart.js
9 years ago