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
Julian Lam
8154e29ad5
Merge branch 'master' into develop
2017-02-23 13:08:20 -05:00
Julian Lam
672d7352bb
Merge branch 'master' into develop
2017-02-23 12:32:03 -05:00
psychobunny
458cbfd603
show dashboard notice if forum is running in dev mode
2017-02-23 12:14:20 -05:00
Peter Jaszkowiak
4bb49a7171
ESlint no-unused-vars
2017-02-18 15:05:36 -07:00
Peter Jaszkowiak
32dc7c23ea
ESlint guard-for-in, no-nested-ternary
...
and operator-linebreak
2017-02-18 13:28:03 -07:00
Peter Jaszkowiak
896c8c7343
ESlint object-curly-spacing
2017-02-18 12:30:49 -07:00
Peter Jaszkowiak
1493afee2a
ESlint indent
2017-02-18 02:38:03 -07:00
Peter Jaszkowiak
3b0dd2d1ef
ESlint padded-blocks
2017-02-18 02:32:24 -07:00
Peter Jaszkowiak
feb8405f95
ESlint eol-last
2017-02-18 02:30:48 -07:00
Peter Jaszkowiak
a038c66549
ESlint quotes
2017-02-18 01:56:23 -07:00
Peter Jaszkowiak
604358ecc4
ESlint keyword-spacing, no-multi-spaces
2017-02-18 01:52:56 -07:00
Peter Jaszkowiak
2e031f3759
ESlint comma-spacing
2017-02-18 01:31:47 -07:00
Peter Jaszkowiak
277a7fb8b4
ESlint key-spacing, no-trailing-spaces
2017-02-18 01:27:46 -07:00
Peter Jaszkowiak
3361a72725
ESlint no-plusplus
...
and no-empty, space-unary-ops
2017-02-18 01:12:18 -07:00
Peter Jaszkowiak
52f2028206
ESlint no-multiple-empty-lines
2017-02-17 22:08:23 -07:00
Peter Jaszkowiak
2ba46808a1
ESlint one-var, fix comma-dangle
2017-02-17 20:20:42 -07:00
Peter Jaszkowiak
bc1d70c126
ESlint comma-dangle
2017-02-17 19:31:21 -07:00
Peter Jaszkowiak
9f15008247
Address review issues
2017-02-17 11:19:30 -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
7f124a3ccf
Merge branch 'master' into develop
2017-02-10 12:55:11 -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
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
Peter Jaszkowiak
c14a31644b
Merge branch 'master' into 'develop'
2017-01-30 15:41:14 -07:00
Stephan
0c6679ca9c
Update dashboard.js
2017-01-30 17:45:48 +01:00
Julian Lam
debffe385f
closes #5316
2017-01-27 16:29:42 -05:00
barisusakli
2a33991f0d
read usercount from global object
2017-01-25 01:32:29 +03:00
Stephan
af4df8e197
added missing translation
...
added missing language string in dashboard.js
2017-01-23 02:38:33 +01: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
Julian Lam
81ca10d72e
Merge pull request #5332 from pitaj/async@2
...
async v2 upgrade
2017-01-04 11:05:45 -05:00
Peter Jaszkowiak
11f7cc4163
Pass tests
2017-01-02 23:04:57 -07:00
Julian Lam
c640bdf2b9
Merge branch 'master' into develop
2016-12-20 13:29:44 -05:00
Peter Jaszkowiak
38eba81933
ACP menu and title translations
2016-12-19 15:51:43 -05:00
Julian Lam
753d4b0275
wrapped up basic functionality of list and detail for flags, filter support. #5232
2016-12-02 15:28:28 -05:00
Julian Lam
1aa70c57eb
WIP
2016-11-25 13:28:55 -05:00
Peter Jaszkowiak
c5237443cd
Standard language codes ( #5218 )
...
* Use standard language codes. Fallback for plugins.
* Fix transifex config
* Tab vs space here for some reason
* Remove redundancies
* config.relative_path instead of allcaps
* added upgrade script for existing users' accounts
2016-11-23 11:50:49 -05:00
Julian Lam
b1f23c8c4b
read req.uid instead of req.user.uid in admin groups list
2016-11-17 07:47:18 -05:00
barisusakli
f30b694545
gitInfo error doesnt block page
2016-11-04 20:02:24 +03:00
barisusakli
7a8de6169b
admin controller tests
2016-10-31 13:52:26 +03:00
Sergii Paryzhskyi
e515b791da
Fix eslint rules ( #5117 )
...
* Fix semi linter rule
* Fix semi-spacing linter rule
* Fix no-undef-init linter rule
* Fix space-before-blocks linter rule
2016-10-25 15:34:47 -04:00
barisusakli
8c7de0f239
fix eslint
2016-10-20 00:25:40 +03:00
barisusakli
1e486875f4
add top posters and most rep to acp
2016-10-20 00:08:41 +03:00
Julian Lam
3272c0b98c
linting
2016-10-13 16:01:26 -04:00
Julian Lam
ead4de6c6f
Merge branch 'fix-some-code-lint' of https://github.com/HeeL/NodeBB into HeeL-fix-some-code-lint
2016-10-13 14:43:28 -04:00
Julian Lam
e80400665e
closes #5111
2016-10-13 13:12:41 -04:00
HeeL
4a3c31b2dc
Fix space-before-function-paren linter rule
2016-10-13 11:43:39 +02:00
barisusakli
9a55498fc1
changes to manage/users
2016-10-07 17:35:33 +03:00
