Commit Graph

16569 Commits

Author SHA1 Message Date
Barış Soner Uşaklı
9079ee5b14 style 2017-02-23 20:44:23 +03: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
psychobunny
a2847dc851 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2017-02-23 12:01:25 -05:00
Julian Lam
d4c2fc3bc8 closes #5472 2017-02-23 11:54:51 -05:00
psychobunny
ebe5ed7560 Merge pull request #5470 from pichalite/acp-templates
Fix ACP templates markup
2017-02-23 11:46:02 -05:00
barisusakli
0de21cb3ff fix tab 2017-02-23 17:12:46 +03:00
barisusakli
09d0ce4778 post tests 2017-02-23 17:02:54 +03:00
barisusakli
4cd4414d19 small change 2017-02-23 15:29:35 +03:00
Barış Soner Uşaklı
026c32f32b Merge pull request #5462 from NodeBB/minify-modules
Minify all module scripts in production
2017-02-23 13:15:05 +02:00
Misty (Bot)
02cc988ae7 Latest translations and fallbacks 2017-02-23 09:22:14 +00:00
pichalite
aea40902b0 Fix markup in category privileges template 2017-02-23 00:28:54 +00:00
pichalite
f09f1f6ed8 Fix ACP templates markup 2017-02-23 00:20:42 +00:00
Julian Lam
6ea0fc4e2f changed file schema to be name only, storing them in object sets referencing their applicable versions 2017-02-22 15:57:31 -05:00
pichalite
dcb0f18422 ACP manage groups UI updates 2017-02-22 20:28:56 +00:00
Julian Lam
e887dda37a Merge pull request #5461 from pichalite/image-dimension
Use ACP profile image dimension setting in cropper
2017-02-22 14:53:40 -05:00
Julian Lam
9eed3abb1d added template to upgrades folder 2017-02-22 13:28:22 -05:00
Julian Lam
5b8c9503c3 refactor upgrade scripts to use individual files in src/upgrades/ as source of schema changes 2017-02-22 13:20:47 -05:00
barisusakli
2dac3d2292 closes #5465, blacklist tests 2017-02-22 14:53:44 +03:00
barisusakli
5c01c7b1c7 delayed notification test 2017-02-22 13:35:05 +03:00
Julian Lam
e427f1663e Merge pull request #5456 from NodeBB/sounds-refactor
Sound system improvements
2017-02-21 16:14:58 -05:00
Julian Lam
62e0f5f883 Merge remote-tracking branch 'origin/master' into develop 2017-02-21 11:21:51 -05:00
Barış Soner Uşaklı
89380824f8 navigation test 2017-02-21 17:00:54 +03:00
barisusakli
f2a795a9b7 fix tests 2017-02-21 15:18:01 +03:00
barisusakli
799f688503 closes #5463 , invitation tests 2017-02-21 15:08:17 +03:00
Misty (Bot)
4b21679d6f Latest translations and fallbacks 2017-02-21 09:24:38 +00:00
barisusakli
4ee7edad64 test uploadProfileImageFromUrl 2017-02-20 21:58:35 +03:00
barisusakli
ef90702049 closes #5459 2017-02-20 21:28:02 +03:00
Misty (Bot)
7d8477289d Latest translations and fallbacks 2017-02-20 09:22:34 +00:00
Peter Jaszkowiak
beb652ee43 Move minifier.js to src/meta 2017-02-20 00:44:04 -07:00
Peter Jaszkowiak
3e562ceb83 Update CONTRIBUTING.md 2017-02-19 16:37:00 -07:00
psychobunny
aaec279d75 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2017-02-19 11:07:39 -05:00
Anil Mandepudi
f302c0d739 Update gruntfile to build on initialization (#5458)
* Update gruntfile to build on initialization

* Skip option skips build
2017-02-19 11:01:38 -05:00
psychobunny
631592b818 Merge branch 'master' of https://github.com/NodeBB/NodeBB 2017-02-19 11:00:14 -05:00
Misty (Bot)
2e27ce640c Latest translations and fallbacks 2017-02-19 09:25:24 +00:00
Peter Jaszkowiak
9b1068e868 Minify all module scripts in production 2017-02-19 02:07:19 -07:00
pichalite
fd0f0beaf2 lint 2017-02-19 08:54:46 +00:00
pichalite
a99572fc48 Use ACP profile image dimension setting in cropper 2017-02-19 08:30:30 +00:00
Peter Jaszkowiak
23540afaeb Resolve merge conflicts 2017-02-18 19:14:39 -07:00
Peter Jaszkowiak
b227297ef3 ESlint no-use-before-define 2017-02-18 18:55:33 -07:00
Peter Jaszkowiak
93f38d4f30 ESlint no-multi-assign
and max-nested-callbacks, no-mixed-requires, max-statements-per-line
2017-02-18 18:06:28 -07:00
Barış Soner Uşaklı
1b43faba1a closes #5441 2017-02-19 02:44:38 +03:00
Peter Jaszkowiak
4bb49a7171 ESlint no-unused-vars 2017-02-18 15:05:36 -07:00
Peter Jaszkowiak
c18808fdeb ESlint no-useless-concat, no-mixed-spaces-and-tabs 2017-02-18 14:42:15 -07:00
Peter Jaszkowiak
fdf4f873bf ESlint eqeqeq
and require-jsdoc, no-negated-condition
2017-02-18 14:36:16 -07:00
Peter Jaszkowiak
144fa8698c Eslint no-lonely-if 2017-02-18 14:32:35 -07:00
Peter Jaszkowiak
57f89663aa ESlint radix 2017-02-18 14:29:52 -07:00
Peter Jaszkowiak
09e868ce5f ESlint no-useless-escape, no-else-return 2017-02-18 14:27:26 -07:00
Peter Jaszkowiak
11cb3a9554 ESlint operator-assignment, block-scoped-var 2017-02-18 14:20:58 -07:00
Peter Jaszkowiak
a0a50677da ESlint n-loop-func, yoda 2017-02-18 14:00:29 -07:00