Julian Lam
fcaefbadca
Merge remote-tracking branch 'origin/master' into develop
2017-02-15 12:06:52 -05:00
barisusakli
8b006fb1ab
closes #5434
2017-02-12 20:11:49 +03:00
Julian Lam
7f124a3ccf
Merge branch 'master' into develop
2017-02-10 12:55:11 -05:00
Julian Lam
7ba111acdd
Merge pull request #5420 from NodeBB/assets-route
...
/assets/uploads
2017-02-09 16:08:12 -05:00
Peter Jaszkowiak
aaacdb8413
Fix #5416 , uploads path config setting
...
- Finish moving uploads route to `/assets/uploads`
- Remove `upload_url` config setting, it was broken
2017-02-08 11:41:34 -07:00
Julian Lam
87e02b264c
Merge branch 'master' into develop
2017-02-08 11:23:44 -05:00
Julian Lam
ce2bda0648
utilising async series if OS reports that system only contains one CPU processor
2017-02-08 10:42:55 -05:00
Julian Lam
8a0a74d95e
Merge remote-tracking branch 'origin/master' into develop
2017-02-07 16:03:54 -05:00
Julian Lam
b5daedb7a3
Merge remote-tracking branch 'origin/master' into develop
2017-02-07 15:45:21 -05:00
Peter Jaszkowiak
b530701cff
Fix tabs 😡
2017-02-06 15:54:21 -07:00
Peter Jaszkowiak
bb1bfb0449
Merge branch 'master' into assets-route
2017-02-06 15:52:54 -07:00
psychobunny
dbc3113940
Merge pull request #5412 from pichalite/cropperjs
...
Ability to crop profile images before uploading
2017-02-06 14:33:49 -05:00
barisusakli
e3a2e13438
build test
2017-02-03 11:39:31 +03:00
Peter Jaszkowiak
360a35d0a6
Resolve merge conflicts
2017-02-02 22:15:26 -07:00
Peter Jaszkowiak
553567c3b2
Refactor nodebb, move build.js, add --dev
2017-02-02 19:15:01 -07:00
pichalite
de28ff5d43
Ability to crop profile images before uploading
2017-02-03 00:47:09 +00:00
Peter Jaszkowiak
f4147f7922
Generate cache buster on build
2017-01-24 20:24:28 -07:00
Julian Lam
ea7d61e2e4
handling err in src/meta/languages.js
2017-01-23 11:40:51 -05:00
Julian Lam
372138c789
Revert "fixing bug that caused plugin language files to not be parsed"
...
This reverts commit b2bb1a7c24
2017-01-23 11:27:35 -05:00
Julian Lam
b2bb1a7c24
fixing bug that caused plugin language files to not be parsed
2017-01-23 11:25:19 -05:00
Julian Lam
a7aaf8ea96
fixing bug that caused plugin language files to not be parsed
2017-01-23 11:25:05 -05:00
Julian Lam
fcec6fd41d
Merge remote-tracking branch 'origin/master' into develop
2017-01-23 11:18:10 -05:00
Peter Jaszkowiak
186209a0a3
Build plugin staticDirs
...
- route `/plugins` -> `build/public/plugins`
- symlink `staticDirs` directories into `build/public/plugins`
- remove custom `/plugins` route handling
2017-01-21 18:57:27 -07:00
Peter Jaszkowiak
df77890c2a
Plugin defaultLang defaults to en-GB
2017-01-20 11:15:06 -07:00
Julian Lam
73879b824c
Merge branch 'master' into develop
2017-01-20 12:33:17 -05:00
Peter Jaszkowiak
7c88a55153
Fix empty lines in language selectors
2017-01-19 19:07:53 -07:00
Peter Jaszkowiak
7f2ded17ab
Comments, misc
2017-01-17 20:41:04 -07:00
Peter Jaszkowiak
65b866192e
Fix failing tests
2017-01-16 16:48:56 -07:00
Peter Jaszkowiak
aff53cccc5
Plugin language fallback support
2017-01-16 16:31:16 -07: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
Peter Jaszkowiak
b4b3be3d97
Cache bust translations, query param name
2017-01-14 14:09:46 -07:00
Peter Jaszkowiak
2f07c18c5a
All hail the glorious translation prebuilding
2017-01-14 14:08:52 -07:00
Julian Lam
81ca10d72e
Merge pull request #5332 from pitaj/async@2
...
async v2 upgrade
2017-01-04 11:05:45 -05:00
Peter Jaszkowiak
ec544518e8
Use async v2
2017-01-02 22:23:17 -07:00
Julian Lam
29c7ae7645
Merge remote-tracking branch 'origin/master' into develop
2016-12-22 09:21:32 -05:00
Barış Soner Uşaklı
c4d4d2385b
closes #3973 closes #5303
2016-12-22 01:48:41 +03:00
Julian Lam
c640bdf2b9
Merge branch 'master' into develop
2016-12-20 13:29:44 -05:00
Peter Jaszkowiak
0b4c39338e
Translation bootbox wrapper
...
- Replaced minfied bootbox file with unminified one since it's minified at build anyways
- Removed existing override
- Made translator more verbose in dev mode; it now warns about missing translations
2016-12-19 15:51:43 -05:00
barisusakli
9ace5c6e17
moved next() of out try/catch
2016-12-19 21:46:28 +03:00
barisusakli
1fed01fe43
ability to filter search by tags
2016-12-19 21:40:16 +03:00
Julian Lam
76bcc1c327
Merge branch 'flagging-refactor' into develop
2016-12-19 13:00:31 -05:00
barisusakli
009da723c5
meta.configs tests
2016-12-16 15:55:34 +03:00
Julian Lam
451c2838d0
Merge remote-tracking branch 'origin/master' into flagging-refactor
2016-12-13 09:37:19 -05:00
barisusakli
c32e6aaabb
use build module instead of forking
2016-12-13 15:43:20 +03:00
Julian Lam
e227f5842a
Merge remote-tracking branch 'origin/master' into flagging-refactor
2016-12-12 11:21:30 -05:00
barisusakli
1c6cee207f
meta/settings test
2016-12-10 00:51:50 +03:00
Julian Lam
dc508fa0cb
Merge remote-tracking branch 'origin/master' into flagging-refactor
2016-12-09 14:54:01 -05:00
barisusakli
0b9829850c
closes #5273
2016-12-09 18:53:08 +03:00
Julian Lam
5d63c0aa3b
Merge remote-tracking branch 'origin/master' into flagging-refactor
2016-12-08 14:25:53 -05:00
