Commit Graph

712 Commits

Author SHA1 Message Date
barisusakli
65a65b19c0 tests for #5600 2017-04-16 14:46:02 -04:00
Julian Lam
7f8f197e60 Merge branch 'master' into develop 2017-03-16 14:58:39 -04:00
barisusakli
449352d899 wait for all routes to load before listening 2017-03-16 11:24:36 +03:00
Julian Lam
af2d9fb85b Merge branch 'master' into develop 2017-03-06 09:51:11 -05:00
barisusakli
b060bda8a0 some more refactors 2017-03-02 17:25:32 +03:00
Julian Lam
b1ceec7571 Merge remote-tracking branch 'origin/master' into develop 2017-02-25 21:43:50 -05:00
psychobunny
2a311d2ff6 printing initialization message twice for some reason 2017-02-24 16:37:30 -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
Peter Jaszkowiak
8b533bb431 Fixes #5474 2017-02-23 14:19:11 -07:00
Julian Lam
672d7352bb Merge branch 'master' into develop 2017-02-23 12:32:03 -05:00
Peter Jaszkowiak
a038c66549 ESlint quotes 2017-02-18 01:56:23 -07:00
Peter Jaszkowiak
52f2028206 ESlint no-multiple-empty-lines 2017-02-17 22:08:23 -07:00
Peter Jaszkowiak
bc1d70c126 ESlint comma-dangle 2017-02-17 19:31:21 -07:00
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
2017-02-16 22:58:15 -07:00
Julian Lam
8a0a74d95e Merge remote-tracking branch 'origin/master' into develop 2017-02-07 16:03:54 -05:00
Peter Jaszkowiak
360a35d0a6 Resolve merge conflicts 2017-02-02 22:15:26 -07:00
Julian Lam
48909e753c Merge branch 'master' into develop 2017-01-17 10:46:14 -05:00
Dominic Lennon
a06e39528f Code review change 2017-01-16 08:48:53 +00:00
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
2017-01-15 12:38:16 -07: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
Dominic Lennon
ed19454eca Adding more specific timing for session timings 2017-01-11 10:51:41 +00:00
Peter Jaszkowiak
11f7cc4163 Pass tests 2017-01-02 23:04:57 -07:00
barisusakli
853cea7fec removed emitter.js 2016-11-18 15:03:50 +03:00
barisusakli
4f0e93732a #5211
remove passing js/css between procs
2016-11-17 12:56:00 +03:00
Julian Lam
299fcb99f1 more progress on #5211 2016-11-16 20:54:57 -05:00
barisusakli
ce7513c347 allow cookieDomain from config.json 2016-11-04 20:02:24 +03:00
barisusakli
1a63672e66 more test fixes 2016-10-16 21:51:42 +03:00
barisusakli
817cd29f00 try require from root 2016-10-16 17:36:24 +03:00
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
2016-10-16 06:55:12 +03:00
HeeL
4a3c31b2dc Fix space-before-function-paren linter rule 2016-10-13 11:43:39 +02:00
barisusakli
102beb5f93 closes #5080 2016-10-07 11:04:21 +03:00
barisusakli
d60ab3c74c removed cacheStaticFiles 2016-09-21 12:00:37 +03:00
barisusakli
b0b6c66f77 fix unix domain socket 2016-09-21 11:36:02 +03:00
barisusakli
80c98e5ecf closes #4989 2016-08-30 13:25:20 +03:00
barisusakli
5cd6614d03 refactor 2016-08-27 16:16:54 +03:00
barisusakli
89f550ce7c moved middleware requires 2016-08-26 19:40:14 +03:00
barisusakli
df7cfe2146 missing favicon dep 2016-08-26 19:12:55 +03:00
barisusakli
8f408faf46 organize middlewares
removed app.locals.middleware
middlewares can be required anywhere, ie in controllers
2016-08-26 18:50:37 +03:00
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
2016-07-27 13:06:54 -04:00
Julian Lam
437770538c work-in-progress commit for #4655 2016-05-16 10:32:28 -04:00
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
2016-05-10 10:36:59 -04:00
Julian Lam
2ddcaa9ce1 added new hook for hotswap preparation 2016-04-14 11:16:12 -04:00
Julian Lam
94a505a6bb removed symlink logic and using route bridging instead.
Also allowed plugins to define modules from their plugin.json
2016-04-04 20:43:21 -04:00
Julian Lam
f91f705f90 Merge branch 'master' into fix-vendors 2016-04-04 18:46:24 -04:00
psychobunny
acd24d856f run tasks in series to speed up startup time 2016-03-30 14:37:00 -04:00
psychobunny
baeed22f20 grunt: only compile ACP less if that was changed, and vice versa with theme/plugin less 2016-03-24 12:37:17 -04:00
Julian Lam
184a2c4540 IP blacklist functionality -- re: #4367
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
2016-03-14 17:31:36 -04:00
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
2016-02-26 11:29:17 -05:00
psychobunny
42c0b973f1 closes #3134 2016-01-18 15:17:38 -05:00