Commit Graph

6372 Commits (43bf422cba7aee968f8bb6198ff7c3c0625ddf4d)

Author SHA1 Message Date
Julian Lam 58cbf44143 Merge branch 'master' into develop
Misty (Bot) 2bbf3c4f66 Latest translations and fallbacks
Peter Jaszkowiak 007051c14c Fix
Julian Lam b1ceec7571 Merge remote-tracking branch 'origin/master' into develop
barisusakli 347761173a helpers tests
Misty (Bot) a22909dbe8 Latest translations and fallbacks
psychobunny 09a1ed0869 Merge pull request from kingjan1999/master
Update FontAwesome to 4.7.0
Julian Lam 6e7b505ea7 more linting
Julian Lam ddea9f534e running eslint again
Julian Lam 72e77772db Merge branch 'master' into develop
Julian Lam 995f8296a4 linting
Julian Lam e71bd7a27f Merge branch 'master' into styleguide
barisusakli 048eb8a320 some helper tests
Misty (Bot) 3509e12748 Latest translations and fallbacks
Peter Jaszkowiak dd2b930824 Resolve merge conflicts, minify only `.js` files
Peter Jaszkowiak ee9d7584e4 Fix test, misc
pichalite 1d5b3cc73f ACP manage tags page UI changes
Julian Lam a9f144230e Merge branch 'master' into develop
psychobunny 7b7565ee8e Merge pull request from pichalite/acp-groups
ACP manage groups UI updates
Julian Lam 8154e29ad5 Merge branch 'master' into develop
Julian Lam 672d7352bb Merge branch 'master' into develop
psychobunny 458cbfd603 show dashboard notice if forum is running in dev mode
psychobunny ebe5ed7560 Merge pull request from pichalite/acp-templates
Fix ACP templates markup
Misty (Bot) 02cc988ae7 Latest translations and fallbacks
pichalite f09f1f6ed8 Fix ACP templates markup
pichalite dcb0f18422 ACP manage groups UI updates
Julian Lam e887dda37a Merge pull request from pichalite/image-dimension
Use ACP profile image dimension setting in cropper
Julian Lam e427f1663e Merge pull request from NodeBB/sounds-refactor
Sound system improvements
Julian Lam 62e0f5f883 Merge remote-tracking branch 'origin/master' into develop
Misty (Bot) 4b21679d6f Latest translations and fallbacks
Misty (Bot) 7d8477289d Latest translations and fallbacks
Misty (Bot) 2e27ce640c Latest translations and fallbacks
pichalite fd0f0beaf2 lint
pichalite a99572fc48 Use ACP profile image dimension setting in cropper
Peter Jaszkowiak 23540afaeb Resolve merge conflicts
Peter Jaszkowiak b227297ef3 ESlint no-use-before-define
Peter Jaszkowiak 93f38d4f30 ESlint no-multi-assign
and max-nested-callbacks, no-mixed-requires, max-statements-per-line
Peter Jaszkowiak 4bb49a7171 ESlint no-unused-vars
Peter Jaszkowiak c18808fdeb ESlint no-useless-concat, no-mixed-spaces-and-tabs
Peter Jaszkowiak fdf4f873bf ESlint eqeqeq
and require-jsdoc, no-negated-condition
Peter Jaszkowiak 144fa8698c Eslint no-lonely-if
Peter Jaszkowiak 57f89663aa ESlint radix
Peter Jaszkowiak 09e868ce5f ESlint no-useless-escape, no-else-return
Peter Jaszkowiak 11cb3a9554 ESlint operator-assignment, block-scoped-var
Peter Jaszkowiak a0a50677da ESlint n-loop-func, yoda
Peter Jaszkowiak 04bb6513b0 ESlint no-cond-assign, no-void, valid-jsdoc
Peter Jaszkowiak 32dc7c23ea ESlint guard-for-in, no-nested-ternary
and operator-linebreak
Peter Jaszkowiak c4bdb72941 ESlint no-unneeded-ternary
and no-extend-native, no-sequences
Peter Jaszkowiak 64a6322002 ESlint no-extra-boolean-cast
and no-shadow-restricted-names
Peter Jaszkowiak daa169c094 ESlint no-unused-expressions