Commit Graph

655 Commits (a2662f8b696918f52a712a0623fe0b2a55b13573)

Author SHA1 Message Date
Julian Lam 72e77772db Merge branch 'master' into develop
Peter Jaszkowiak dd2b930824 Resolve merge conflicts, minify only `.js` files
Peter Jaszkowiak 8b533bb431 Fixes
Julian Lam 672d7352bb Merge branch 'master' into develop
Peter Jaszkowiak a038c66549 ESlint quotes
Peter Jaszkowiak 52f2028206 ESlint no-multiple-empty-lines
Peter Jaszkowiak bc1d70c126 ESlint comma-dangle
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
Julian Lam 8a0a74d95e Merge remote-tracking branch 'origin/master' into develop
Peter Jaszkowiak 360a35d0a6 Resolve merge conflicts
Julian Lam 48909e753c Merge branch 'master' into develop
Dominic Lennon a06e39528f Code review change
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
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=`
Dominic Lennon ed19454eca Adding more specific timing for session timings
Peter Jaszkowiak 11f7cc4163 Pass tests
barisusakli 853cea7fec removed emitter.js
barisusakli 4f0e93732a
remove passing js/css between procs
Julian Lam 299fcb99f1 more progress on
barisusakli ce7513c347 allow cookieDomain from config.json
barisusakli 1a63672e66 more test fixes
barisusakli 817cd29f00 try require from root
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
HeeL 4a3c31b2dc Fix space-before-function-paren linter rule
barisusakli 102beb5f93 closes
barisusakli d60ab3c74c removed cacheStaticFiles
barisusakli b0b6c66f77 fix unix domain socket
barisusakli 80c98e5ecf closes
barisusakli 5cd6614d03 refactor
barisusakli 89f550ce7c moved middleware requires
barisusakli df7cfe2146 missing favicon dep
barisusakli 8f408faf46 organize middlewares
removed app.locals.middleware
middlewares can be required anywhere, ie in controllers
Anil Mandepudi c666a7efda add static:assets.prepare hook ()
* 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
Julian Lam 437770538c work-in-progress commit for
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
Julian Lam 2ddcaa9ce1 added new hook for hotswap preparation
Julian Lam 94a505a6bb removed symlink logic and using route bridging instead.
Also allowed plugins to define modules from their plugin.json
Julian Lam f91f705f90 Merge branch 'master' into fix-vendors
psychobunny acd24d856f run tasks in series to speed up startup time
psychobunny baeed22f20 grunt: only compile ACP less if that was changed, and vice versa with theme/plugin less
Julian Lam 184a2c4540 IP blacklist functionality -- re:
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
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
psychobunny 42c0b973f1 closes
psychobunny f17fa3ca11 minify flag not actually being used
Julian Lam f77f39e937 Fixed
Also updated port local variable to be a Number, since all of the
conditional checks assume it is a number, when all along it has
been a string.... heh.
barisusakli ca294fc6ec closes
Julian Lam 160cf93802 Fix regression caused by 4f766ac
Julian Lam 4f766ac7b5 Updated cache buster logic
Removed css and script busters in favour of a uuid/guid cache
buster that is generated when the app starts.

This change means that in the event your NodeBB crashes often,
users will not be able to rely on their browser cache to serve
an unchanged style/js file, but if that's the case, you've
got bigger problems anyway.

re: 
Julian Lam 7e6703c18e more line ending conversion
barisusakli 93fd938913 removed setTimeout