Commit Graph

446 Commits

Author SHA1 Message Date
Barış Soner Uşaklı
ff88be91fa Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-18 20:09:40 -04:00
Julian Lam
1159abf9ec fixes #5879 2017-08-18 15:05:49 -04:00
Baris Usakli
bc6b1a8f56 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	public/src/admin/extend/plugins.js
2017-08-11 11:33:06 -04:00
Julian Lam
5fc6fe1c80 closes #5162 2017-08-02 12:27:27 -04:00
Baris Usakli
e071f94173 test debugParams.js 2017-08-01 16:51:21 -04:00
Baris Usakli
875672522e Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	src/search.js
2017-07-28 14:19:09 -04:00
Barış Soner Uşaklı
911eb32e70 fix var names 2017-07-27 19:45:54 -04:00
Barış Soner Uşaklı
f646e08a6e update tags/links for 1.5.4 2017-07-27 19:40:11 -04:00
Julian Lam
f29b9f29f9 added missing setImmediate 2017-07-17 12:23:11 -04:00
Julian Lam
c40b11aa6e updated site upload logic so that site logo is resized for email header, implemented site logo in email header 2017-07-17 10:47:56 -04:00
Baris Usakli
2d875a99cb fix data 2017-07-11 13:59:29 -04:00
Baris Usakli
dc110e2e3f closes #5818 2017-07-11 13:44:51 -04:00
Barış Soner Uşaklı
091fec8d6f removed unnecessary code 2017-07-04 17:54:51 -04:00
Baris Usakli
cf444755df closes #5729 2017-06-20 14:23:21 -04:00
Julian Lam
3e6a779dbc Merge remote-tracking branch 'origin/master' 2017-06-02 15:06:44 -04:00
Julian Lam
6728e9a5cc #5729 2017-06-02 15:01:24 -04:00
Barış Soner Uşaklı
14ea9a0dd6 Merge pull request #5716 from NodeBB/import-export-ref
Import export cleanup
2017-06-02 13:37:16 -04:00
Peter Jaszkowiak
8e5bcf6105 Fix #5727 2017-06-01 14:16:07 -06:00
Peter Jaszkowiak
e71fb9ab24 Fix node --inspect 2017-06-01 14:15:40 -06:00
Peter Jaszkowiak
9a3b684228 Remove dependency, ignore package-lock.json 2017-06-01 14:15:30 -06:00
Peter Jaszkowiak
b60dbe7d1e Unwrap meta modules 2017-05-31 16:24:23 -06:00
psychobunny
c94365aefd closes #5721 2017-05-31 16:35:18 -04:00
Baris Usakli
da8b1b605c #5723 2017-05-30 17:21:34 -04:00
Peter Jaszkowiak
3c2d4fe649 Switch from underscore to lodash 2017-05-27 14:51:45 -06:00
Barış Soner Uşaklı
890c2eff70 style changes 2017-05-27 01:44:26 -04:00
Peter Jaszkowiak
8901dad6f2 Revert "fix concat test on windows"
This reverts commit d1dd0cd6df.
2017-05-26 12:49:38 -06:00
Baris Usakli
d1dd0cd6df fix concat test on windows 2017-05-26 13:12:17 -04:00
Peter Jaszkowiak
9ef2b5a003 Don't use uglify compress 2017-05-25 12:18:35 -06:00
Peter Jaszkowiak
53eced6be0 uglify-js@3, JS source maps 🍰 2017-05-25 01:33:04 -06:00
Julian Lam
fc4f016932 Merge pull request #5689 from NodeBB/plugin-load-ref
Plugin load refactor
2017-05-24 22:18:28 -04:00
Peter Jaszkowiak
8ce35c3cc2 async.apply -_- 2017-05-24 16:55:23 -06:00
Barış Soner Uşaklı
2faf175739 refactor 2017-05-24 16:13:23 -04:00
Peter Jaszkowiak
3dd282b7b9 Load languages with other plugin data
- Added more tests
- Should speed up builds
- Allows for incremental builds in the future
2017-05-23 21:55:23 -06:00
Peter Jaszkowiak
b8baac1aad async.apply 2017-05-23 18:07:13 -06:00
Peter Jaszkowiak
cd1f0ddc79 Resolve merge conflicts 2017-05-23 18:00:52 -06:00
Peter Jaszkowiak
2a9cdb7be2 Add --threads=# option for setting max threads
Make grunt NODE_ENV development by default
2017-05-23 15:49:14 -06:00
Peter Jaszkowiak
d988e8a50f Test minifier 2017-05-21 18:20:01 -06:00
Peter Jaszkowiak
4c1e25c8ce Link instead of copying files
Only mkdirp the necessary directories
2017-05-19 14:27:52 -06:00
Peter Jaszkowiak
9f5ce24993 Minify modules in a batch 2017-05-18 21:20:04 -06:00
Peter Jaszkowiak
e8caee3c4c Restrict total threads
So machines with a small amount of cores build faster
2017-05-18 19:12:30 -06:00
Peter Jaszkowiak
90da6d889d Only load necessary plugin data
Fix tests to work in this case
Add more verbose messages to plugins/data
2017-05-18 01:32:20 -06:00
Peter Jaszkowiak
b0645cc67d Plugin load refactor 2017-05-18 00:49:42 -06:00
Peter Jaszkowiak
7ccfb5cdc0 Build refactor
- Target aliases and bundles
- More concurrency
- Use `--series` to force series processing
- Minifier self-hosted threading
- meta/css delegates to minifier
2017-05-17 16:37:10 -06:00
Barış Soner Uşaklı
6049c46f15 meta dependecy tests 2017-05-12 19:18:11 -04:00
Barış Soner Uşaklı
66dee3452f more tests for admin uploads 2017-05-10 15:34:36 -04:00
Barış Soner Uşaklı
3a1eba2537 merge 2017-05-08 13:49:35 -04:00
Barış Soner Uşaklı
029e2ea8da 404 logging change
dont write to db on every 404
dont log 404 if route is empty
2017-04-30 16:32:14 -04:00
Barış Soner Uşaklı
1d4923a606 limit # of results returned 2017-04-30 15:52:19 -04:00
barisusakli
085d8c2f92 fix lint 2017-04-25 16:48:54 -04:00
Barış Soner Uşaklı
9d229ae960 fix path to log file if base_dir is undefined 2017-04-24 18:52:59 -04:00