Commit Graph

  • 6aa8c8aa94 merge barisusakli 2017-02-25 11:17:56 +03:00
  • fa08498a9e closes #5480 barisusakli 2017-02-25 11:01:35 +03:00
  • 2a311d2ff6 printing initialization message twice for some reason psychobunny 2017-02-24 16:37:30 -05:00
  • 09a1ed0869 Merge pull request #5371 from kingjan1999/master psychobunny 2017-02-24 16:33:38 -05:00
  • 74728a1328 Merge branch 'develop' into upgrades-refactor Julian Lam 2017-02-24 15:23:02 -05:00
  • 00a67b97ce Incremented version number Misty (Bot) 2017-02-24 15:45:36 +00:00
  • 15542f1382 removing old tests that got added back in due to git being silly Julian Lam 2017-02-24 13:30:07 -05:00
  • 6e7b505ea7 more linting Julian Lam 2017-02-24 12:55:07 -05:00
  • ddea9f534e running eslint again Julian Lam 2017-02-24 12:47:46 -05:00
  • 72e77772db Merge branch 'master' into develop Julian Lam 2017-02-24 12:46:40 -05:00
  • 995f8296a4 linting Julian Lam 2017-02-24 12:03:47 -05:00
  • b5f8fc815e re-allowing pluplus in for loops Julian Lam 2017-02-24 11:53:00 -05:00
  • e71bd7a27f Merge branch 'master' into styleguide Julian Lam 2017-02-24 11:45:04 -05:00
  • 92691782e6 Incremented version number v1.4.4 Misty (Bot) 2017-02-24 15:45:36 +00:00
  • fe582d8a7b Merge commit '048eb8a320a217c5e692c598c86a7661bd5eb2c5' into v1.x.x Misty (Bot) 2017-02-24 15:45:36 +00:00
  • 048eb8a320 some helper tests barisusakli 2017-02-24 18:06:23 +03:00
  • 04b07e292c thumb tests barisusakli 2017-02-24 17:34:34 +03:00
  • ca1fe557c7 topic controller tests barisusakli 2017-02-24 16:26:19 +03:00
  • 3a87f2566a more group tests barisusakli 2017-02-24 15:05:00 +03:00
  • b7d5bc7dc8 more group tests barisusakli 2017-02-24 12:54:16 +03:00
  • 3509e12748 Latest translations and fallbacks Misty (Bot) 2017-02-24 09:22:21 +00:00
  • f7a964474d Ignore log files Peter Jaszkowiak 2017-02-23 20:00:30 -07:00
  • dd2b930824 Resolve merge conflicts, minify only .js files Peter Jaszkowiak 2017-02-23 18:31:49 -07:00
  • ee9d7584e4 Fix test, misc Peter Jaszkowiak 2017-02-23 17:29:08 -07:00
  • cfc8884c9c Merge pull request #5475 from NodeBB/favicon-fix Julian Lam 2017-02-23 17:11:11 -05:00
  • 8b533bb431 Fixes #5474 Peter Jaszkowiak 2017-02-23 14:18:07 -07:00
  • 4163ce0218 Merge pull request #5473 from pichalite/acp-tags Julian Lam 2017-02-23 15:49:32 -05:00
  • 1d5b3cc73f ACP manage tags page UI changes pichalite 2017-02-23 20:45:05 +00:00
  • 35ff71c37d more tests Barış Soner Uşaklı 2017-02-23 23:05:51 +03:00
  • 14398a2d90 up markdown Julian Lam 2017-02-23 14:54:49 -05:00
  • b4a32ee96f style changes Barış Soner Uşaklı 2017-02-23 22:42:45 +03:00
  • c09f994b0a Merge remote-tracking branch 'origin/master' into develop Julian Lam 2017-02-23 14:24:15 -05:00
  • a9f144230e Merge branch 'master' into develop Julian Lam 2017-02-23 13:57:46 -05:00
  • 743f758f75 set origin header to url Barış Soner Uşaklı 2017-02-23 21:29:28 +03:00
  • 25f6293821 using io.origins instead Julian Lam 2017-02-23 13:26:49 -05:00
  • 91d3ce1abc Revert "adding origin to new local ioConfig var, as per @barisusakli, re: #5472" Julian Lam 2017-02-23 13:10:38 -05:00
  • c168ed43d4 up build timeout Barış Soner Uşaklı 2017-02-23 21:25:20 +03:00
  • 7b7565ee8e Merge pull request #5468 from pichalite/acp-groups psychobunny 2017-02-23 13:22:57 -05:00
  • a4c00663ff Revert "adding origin to new local ioConfig var, as per @barisusakli, re: #5472" Julian Lam 2017-02-23 13:13:59 -05:00
  • 8154e29ad5 Merge branch 'master' into develop Julian Lam 2017-02-23 13:08:20 -05:00
  • c1b1ff5c6e adding origin to new local ioConfig var, as per @barisusakli, re: #5472 Julian Lam 2017-02-23 12:46:59 -05:00
  • 9079ee5b14 style Barış Soner Uşaklı 2017-02-23 20:44:14 +03:00
  • 672d7352bb Merge branch 'master' into develop Julian Lam 2017-02-23 12:32:03 -05:00
  • 458cbfd603 show dashboard notice if forum is running in dev mode psychobunny 2017-02-23 12:14:20 -05:00
  • a2847dc851 Merge branch 'master' of https://github.com/NodeBB/NodeBB psychobunny 2017-02-23 12:01:25 -05:00
  • d4c2fc3bc8 closes #5472 Julian Lam 2017-02-23 11:54:46 -05:00
  • ebe5ed7560 Merge pull request #5470 from pichalite/acp-templates psychobunny 2017-02-23 11:46:02 -05:00
  • 0de21cb3ff fix tab barisusakli 2017-02-23 17:12:46 +03:00
  • 09d0ce4778 post tests barisusakli 2017-02-23 17:02:54 +03:00
  • 4cd4414d19 small change barisusakli 2017-02-23 15:29:35 +03:00
  • 026c32f32b Merge pull request #5462 from NodeBB/minify-modules Barış Soner Uşaklı 2017-02-23 13:15:05 +02:00
  • 02cc988ae7 Latest translations and fallbacks Misty (Bot) 2017-02-23 09:22:14 +00:00
  • aea40902b0 Fix markup in category privileges template pichalite 2017-02-23 00:28:54 +00:00
  • f09f1f6ed8 Fix ACP templates markup pichalite 2017-02-23 00:20:42 +00:00
  • 6ea0fc4e2f changed file schema to be name only, storing them in object sets referencing their applicable versions Julian Lam 2017-02-22 15:57:31 -05:00
  • dcb0f18422 ACP manage groups UI updates pichalite 2017-02-22 20:28:56 +00:00
  • e887dda37a Merge pull request #5461 from pichalite/image-dimension Julian Lam 2017-02-22 14:53:40 -05:00
  • 9eed3abb1d added template to upgrades folder Julian Lam 2017-02-22 13:28:22 -05:00
  • 5b8c9503c3 refactor upgrade scripts to use individual files in src/upgrades/ as source of schema changes Julian Lam 2017-02-22 13:20:47 -05:00
  • 2dac3d2292 closes #5465, blacklist tests barisusakli 2017-02-22 14:53:44 +03:00
  • 5c01c7b1c7 delayed notification test barisusakli 2017-02-22 13:34:57 +03:00
  • e427f1663e Merge pull request #5456 from NodeBB/sounds-refactor Julian Lam 2017-02-21 16:14:58 -05:00
  • 62e0f5f883 Merge remote-tracking branch 'origin/master' into develop Julian Lam 2017-02-21 11:21:51 -05:00
  • 89380824f8 navigation test Barış Soner Uşaklı 2017-02-21 17:00:54 +03:00
  • f2a795a9b7 fix tests barisusakli 2017-02-21 15:18:01 +03:00
  • 799f688503 closes #5463 , invitation tests barisusakli 2017-02-21 15:08:11 +03:00
  • 4b21679d6f Latest translations and fallbacks Misty (Bot) 2017-02-21 09:24:38 +00:00
  • 4ee7edad64 test uploadProfileImageFromUrl barisusakli 2017-02-20 21:58:35 +03:00
  • ef90702049 closes #5459 barisusakli 2017-02-20 21:27:56 +03:00
  • 7d8477289d Latest translations and fallbacks Misty (Bot) 2017-02-20 09:22:34 +00:00
  • beb652ee43 Move minifier.js to src/meta Peter Jaszkowiak 2017-02-20 00:44:04 -07:00
  • 3e562ceb83 Update CONTRIBUTING.md Peter Jaszkowiak 2017-02-19 16:37:00 -07:00
  • aaec279d75 Merge branch 'master' of https://github.com/NodeBB/NodeBB psychobunny 2017-02-19 11:07:39 -05:00
  • f302c0d739 Update gruntfile to build on initialization (#5458) Anil Mandepudi 2017-02-19 08:01:38 -08:00
  • 631592b818 Merge branch 'master' of https://github.com/NodeBB/NodeBB psychobunny 2017-02-19 11:00:14 -05:00
  • 2e27ce640c Latest translations and fallbacks Misty (Bot) 2017-02-19 09:25:24 +00:00
  • 9b1068e868 Minify all module scripts in production Peter Jaszkowiak 2017-02-19 02:07:19 -07:00
  • fd0f0beaf2 lint pichalite 2017-02-19 08:54:46 +00:00
  • a99572fc48 Use ACP profile image dimension setting in cropper pichalite 2017-02-19 08:30:30 +00:00
  • 23540afaeb Resolve merge conflicts Peter Jaszkowiak 2017-02-18 19:14:39 -07:00
  • b227297ef3 ESlint no-use-before-define Peter Jaszkowiak 2017-02-18 18:55:33 -07:00
  • 93f38d4f30 ESlint no-multi-assign and max-nested-callbacks, no-mixed-requires, max-statements-per-line Peter Jaszkowiak 2017-02-18 18:06:28 -07:00
  • 1b43faba1a closes #5441 Barış Soner Uşaklı 2017-02-19 02:44:38 +03:00
  • 4bb49a7171 ESlint no-unused-vars Peter Jaszkowiak 2017-02-18 15:05:36 -07:00
  • c18808fdeb ESlint no-useless-concat, no-mixed-spaces-and-tabs Peter Jaszkowiak 2017-02-18 14:42:15 -07:00
  • fdf4f873bf ESlint eqeqeq and require-jsdoc, no-negated-condition Peter Jaszkowiak 2017-02-18 14:36:16 -07:00
  • 144fa8698c Eslint no-lonely-if Peter Jaszkowiak 2017-02-18 14:32:35 -07:00
  • 57f89663aa ESlint radix Peter Jaszkowiak 2017-02-18 14:29:52 -07:00
  • 09e868ce5f ESlint no-useless-escape, no-else-return Peter Jaszkowiak 2017-02-18 14:27:26 -07:00
  • 11cb3a9554 ESlint operator-assignment, block-scoped-var Peter Jaszkowiak 2017-02-18 14:20:58 -07:00
  • a0a50677da ESlint n-loop-func, yoda Peter Jaszkowiak 2017-02-18 14:00:29 -07:00
  • 04bb6513b0 ESlint no-cond-assign, no-void, valid-jsdoc Peter Jaszkowiak 2017-02-18 13:51:26 -07:00
  • 5a45087fc8 ESlint no-unreachable, no-redeclare Peter Jaszkowiak 2017-02-18 13:31:19 -07:00
  • 32dc7c23ea ESlint guard-for-in, no-nested-ternary and operator-linebreak Peter Jaszkowiak 2017-02-18 13:28:03 -07:00
  • c4bdb72941 ESlint no-unneeded-ternary and no-extend-native, no-sequences Peter Jaszkowiak 2017-02-18 12:59:46 -07:00
  • 64a6322002 ESlint no-extra-boolean-cast and no-shadow-restricted-names Peter Jaszkowiak 2017-02-18 12:51:13 -07:00
  • 239d7f84dd ESlint no-path-concat Peter Jaszkowiak 2017-02-18 12:47:58 -07:00
  • daa169c094 ESlint no-unused-expressions Peter Jaszkowiak 2017-02-18 12:40:57 -07:00
  • ac2f69f7af ESlint no-return-assign and no-restricted-modules Peter Jaszkowiak 2017-02-18 12:35:49 -07:00
  • 896c8c7343 ESlint object-curly-spacing Peter Jaszkowiak 2017-02-18 12:30:49 -07:00