Commit Graph

14904 Commits (14f3907aa40cd6ce44c7f19ede4bcc8d60da88cb)
 

Author SHA1 Message Date
Julian Lam 74728a1328 Merge branch 'develop' into upgrades-refactor
Misty (Bot) 00a67b97ce Incremented version number
Julian Lam 15542f1382 removing old tests that got added back in due to git being silly
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 b5f8fc815e re-allowing pluplus in for loops
Julian Lam e71bd7a27f Merge branch 'master' into styleguide
barisusakli 048eb8a320 some helper tests
barisusakli 04b07e292c thumb tests
barisusakli ca1fe557c7 topic controller tests
barisusakli 3a87f2566a more group tests
barisusakli b7d5bc7dc8 more group tests
Misty (Bot) 3509e12748 Latest translations and fallbacks
Peter Jaszkowiak f7a964474d Ignore log files
Peter Jaszkowiak dd2b930824 Resolve merge conflicts, minify only `.js` files
Peter Jaszkowiak ee9d7584e4 Fix test, misc
Julian Lam cfc8884c9c Merge pull request from NodeBB/favicon-fix
Fixes 
Peter Jaszkowiak 8b533bb431 Fixes
Julian Lam 4163ce0218 Merge pull request from pichalite/acp-tags
ACP manage tags page UI changes
pichalite 1d5b3cc73f ACP manage tags page UI changes
Barış Soner Uşaklı 35ff71c37d more tests
Julian Lam 14398a2d90 up markdown
Barış Soner Uşaklı b4a32ee96f style changes
Julian Lam c09f994b0a Merge remote-tracking branch 'origin/master' into develop
Julian Lam a9f144230e Merge branch 'master' into develop
Barış Soner Uşaklı 743f758f75 set origin header to url
Julian Lam 25f6293821 using io.origins instead
Julian Lam 91d3ce1abc Revert "adding origin to new local ioConfig var, as per @barisusakli, re: #5472"
This reverts commit c1b1ff5c6e.
Barış Soner Uşaklı c168ed43d4 up build timeout
psychobunny 7b7565ee8e Merge pull request from pichalite/acp-groups
ACP manage groups UI updates
Julian Lam a4c00663ff Revert "adding origin to new local ioConfig var, as per @barisusakli, re: #5472"
This reverts commit c1b1ff5c6e.
Julian Lam 8154e29ad5 Merge branch 'master' into develop
Julian Lam c1b1ff5c6e adding origin to new local ioConfig var, as per @barisusakli, re:
Barış Soner Uşaklı 9079ee5b14 style
Julian Lam 672d7352bb Merge branch 'master' into develop
psychobunny 458cbfd603 show dashboard notice if forum is running in dev mode
psychobunny a2847dc851 Merge branch 'master' of https://github.com/NodeBB/NodeBB
Julian Lam d4c2fc3bc8 closes
psychobunny ebe5ed7560 Merge pull request from pichalite/acp-templates
Fix ACP templates markup
barisusakli 0de21cb3ff fix tab
barisusakli 09d0ce4778 post tests
barisusakli 4cd4414d19 small change
Barış Soner Uşaklı 026c32f32b Merge pull request from NodeBB/minify-modules
Minify all module scripts in production
Misty (Bot) 02cc988ae7 Latest translations and fallbacks
pichalite aea40902b0 Fix markup in category privileges template
pichalite f09f1f6ed8 Fix ACP templates markup
Julian Lam 6ea0fc4e2f changed file schema to be name only, storing them in object sets referencing their applicable versions
pichalite dcb0f18422 ACP manage groups UI updates