Commit graph

  • ca8e6c74f6 build(deps): bump sass from 1.23.3 to 1.23.6 in /website/client (#11556) dependabot-preview[bot] 2019-11-18 08:55:50 +0100
  • b9dbc0f829 build(deps): bump eslint-plugin-vue in /website/client (#11557) dependabot-preview[bot] 2019-11-18 08:55:22 +0100
  • 789248a8a4 build(deps): bump core-js from 3.4.0 to 3.4.1 in /website/client (#11558) dependabot-preview[bot] 2019-11-18 08:54:57 +0100
  • 0731dcd453 Fix: lint Xaz16 2019-11-17 23:57:42 +0300
  • 960985dee5 Merge branch 'develop' into fix-antidotes-from-revert Xaz16 2019-11-17 23:54:09 +0300
  • eb991ae5eb Merge remote-tracking branch 'upstream/develop' into develop Xaz16 2019-11-17 23:53:44 +0300
  • eaad244181 Refactoring & Fix: editing group and challenges from user dashboard (#11418) Aleksey 2019-11-16 20:36:27 +0300
  • a859dbd646 updated tier styles so that they maintain their color on hover and click (#11513) Adam Fitzgibbon 2019-11-16 11:16:23 -0600
  • 106290a11e Changes for fixing issue 11420 (#11521) Vamsi Jada 2019-11-16 22:44:10 +0530
  • 3fa0bac36f hatching modal auto height to accommodate longer strings (#11538) citrusella 2019-11-16 12:10:34 -0500
  • b40dee9e68 Update isFreeRebirth.js (#11505) mistergij 2019-11-16 11:58:37 -0500
  • 6a9ffae758 Merge branch 'develop' of github.com:HabitRPG/habitica into develop Matteo Pagliazzi 2019-11-16 17:57:24 +0100
  • f1ce7f23c3 fix padding on various pages (#11493) Adam Fitzgibbon 2019-11-16 10:55:30 -0600
  • f093634cb2 Merge branch '9603_FixLeftPadding' of https://github.com/adamfitzgibbon/habitica into develop Matteo Pagliazzi 2019-11-16 17:54:58 +0100
  • 5f0672f3a6 Allow update webhook label with an empty string (#11479) Evelyn Stender 2019-11-16 16:52:27 +0000
  • eca1d8501c Hook up label to input for dontShowAgain checkbox (#11455) Collin Styles 2019-11-16 08:50:24 -0800
  • 3fc0fec95e 11457 fix(task): remove z-index (#11460) Tanmoy Bhowmik 2019-11-16 22:13:29 +0530
  • f4f1eac92d Merge branch 'Markkop-firefox-extension-link' into develop Matteo Pagliazzi 2019-11-16 17:39:00 +0100
  • 0e679f0fea settings fixes: show description for other extensions and remove unwanted changes from locales Matteo Pagliazzi 2019-11-16 17:38:48 +0100
  • d55d3fc56d Merge branch 'firefox-extension-link' of https://github.com/Markkop/habitica into Markkop-firefox-extension-link Matteo Pagliazzi 2019-11-16 17:33:10 +0100
  • 9a6347afb6 Merge branch 'origin/develop' into Weblate. Melior 2019-11-14 22:16:06 +0100
  • 20fa676fae Translated using Weblate (Norwegian Bokmål) Melior 2019-11-14 22:14:46 +0100
  • 4e627aad41 4.121.0 Sabe Jones 2019-11-14 15:09:24 -0600
  • 27d8ad32e6 Merge branch 'develop' into release Sabe Jones 2019-11-14 15:09:18 -0600
  • 39fd60267c chore(sprites): compile Sabe Jones 2019-11-14 15:08:57 -0600
  • 645f40f7e0 feat(content): Delightful Dinos Bundle Sabe Jones 2019-11-14 15:08:45 -0600
  • 2842087a43
    Achievements Fixes (#11540) Matteo Pagliazzi 2019-11-13 21:59:48 +0100
  • 3c4d8949de Merge branch 'origin/develop' into Weblate. Melior 2019-11-12 22:39:28 +0100
  • 2a7f4c0551 Translated using Weblate (English (Pirate)) Melior 2019-11-12 22:38:35 +0100
  • 5212e72e77 Merge branch 'release' into develop Sabe Jones 2019-11-12 15:36:18 -0600
  • d49c89eff8 4.120.2 Sabe Jones 2019-11-12 15:31:22 -0600
  • dc303fb1de feat(content): enable some Magic Hatching Potions Sabe Jones 2019-11-12 15:31:17 -0600
  • 1883a0aca3 build(deps): bump mongoose from 5.7.7 to 5.7.9 (#11533) dependabot-preview[bot] 2019-11-11 14:08:20 +0100
  • 06339a1504 build(deps): bump @babel/preset-env from 7.6.3 to 7.7.1 (#11530) dependabot-preview[bot] 2019-11-11 14:08:00 +0100
  • 71b5db1461 build(deps): bump stripe from 7.11.0 to 7.13.0 (#11532) dependabot-preview[bot] 2019-11-11 13:16:22 +0100
  • 8420a2cf23 build(deps): bump aws-sdk from 2.562.0 to 2.568.0 (#11535) dependabot-preview[bot] 2019-11-11 13:15:40 +0100
  • 67b19f0658 build(deps): bump @babel/core from 7.6.4 to 7.7.2 (#11534) dependabot-preview[bot] 2019-11-11 13:15:26 +0100
  • 0f34103a58 build(deps): bump @babel/register from 7.6.2 to 7.7.0 (#11529) dependabot-preview[bot] 2019-11-11 12:05:04 +0100
  • e2e320a3b6 build(deps): bump glob from 7.1.5 to 7.1.6 (#11528) dependabot-preview[bot] 2019-11-11 12:04:48 +0100
  • 2d4516eaa7
    Merge pull request #11527 from HabitRPG/dependabot/npm_and_yarn/website/client/eslint-plugin-vue-6.0.0 Matteo Pagliazzi 2019-11-11 11:23:27 +0100
  • 1c7e1e5aff
    Merge pull request #11526 from HabitRPG/dependabot/npm_and_yarn/website/client/core-js-3.4.0 Matteo Pagliazzi 2019-11-11 11:23:20 +0100
  • 44a7a0159b
    build(deps): bump eslint-plugin-vue in /website/client dependabot-preview[bot] 2019-11-11 10:18:11 +0000
  • 2091c407b0
    build(deps): bump core-js from 3.3.6 to 3.4.0 in /website/client dependabot-preview[bot] 2019-11-11 10:16:37 +0000
  • 81ce84db31 Merge branch 'origin/develop' into Weblate. Melior 2019-11-08 23:04:05 +0100
  • 319621d4fe chore(strings): remove outdated unused strings Sabe Jones 2019-11-08 16:03:05 -0600
  • 45f7be0266 4.120.1 Sabe Jones 2019-11-08 14:15:45 -0600
  • 035a7f124b Translated using Weblate (Latin) Melior 2019-11-08 21:06:07 +0100
  • d0ba8b7d30 Merge branch 'develop' of github.com:HabitRPG/habitica into develop Melior 2019-11-05 17:53:41 +0100
  • a32622c81f fix(invites): correct link constant Sabe Jones 2019-11-05 10:47:08 -0600
  • 5e4efb71a6 Merge branch 'origin/develop' into Weblate. Melior 2019-11-05 17:38:45 +0100
  • 55c4e37f68 Translated using Weblate (Chinese (Simplified)) Melior 2019-11-05 17:38:25 +0100
  • b441cfa9f3 Merge branch 'release' into develop Sabe Jones 2019-11-05 10:30:30 -0600
  • 99599953f5 4.120.0 Sabe Jones 2019-11-05 10:29:59 -0600
  • b4a517f2d3 chore(sprites): compile Sabe Jones 2019-11-05 10:29:48 -0600
  • 3e2a49103e feat(content): Armoire and BGs 2019-11 and disable October Magic Potions Sabe Jones 2019-11-05 10:29:39 -0600
  • 159b4857ba
    build(deps): bump core-js from 3.3.4 to 3.3.6 in /website/client (#11510) Matteo Pagliazzi 2019-11-04 15:21:25 +0100
  • aa518862e3 build(deps): bump aws-sdk from 2.561.0 to 2.562.0 (#11509) dependabot-preview[bot] 2019-11-04 15:21:20 +0100
  • a2a2fea40f build(deps): bump svgo from 1.3.0 to 1.3.2 in /website/client (#11511) dependabot-preview[bot] 2019-11-04 15:21:08 +0100
  • 3c1c92dd68 build(deps): bump sass from 1.23.1 to 1.23.3 in /website/client (#11512) dependabot-preview[bot] 2019-11-04 15:20:58 +0100
  • 8ab50dc316
    build(deps): bump core-js from 3.3.4 to 3.3.6 in /website/client dependabot-preview[bot] 2019-11-04 13:55:47 +0000
  • 25603634db update to use bootstrap built in spacing classes Adam Fitzgibbon 2019-11-03 20:14:22 -0600
  • ef5d6d7889 fix(settings): fix indentation Markkop 2019-11-03 16:53:49 -0300
  • f15a32255b fix(settings): fix settings.json Markkop 2019-11-03 16:45:46 -0300
  • a7fc1aa7a7 fix(settings): fix settings.json Markkop 2019-11-03 16:45:46 -0300
  • e86b23a98a Merge remote-tracking branch 'upstream/develop' into develop Xaz16 2019-11-03 21:05:31 +0300
  • 84d76a2ebc Fix market dropdownmenu default text (#11481) Sarah Eisa 2019-11-02 18:59:57 +0200
  • 9988b1e82d Revert "fix(challenge export): do not fetch users and tasks concurrently" Matteo Pagliazzi 2019-11-02 14:24:14 +0100
  • da4dd07de1 fix linting script to make sure errors are reported Matteo Pagliazzi 2019-11-02 13:08:20 +0100
  • 4d88787ba0 fix(challenge export): do not fetch users and tasks concurrently Matteo Pagliazzi 2019-11-02 12:43:51 +0100
  • 6e9ab1dbbb Merge branch 'release' into develop Sabe Jones 2019-11-01 20:14:55 -0500
  • 0fca0ed147 4.119.2 Sabe Jones 2019-11-01 20:14:37 -0500
  • 74d3141195 chore(sprites): compile Sabe Jones 2019-11-01 20:13:59 -0500
  • a2a251b2f1 chore(event): end Fall Festival & Habitoween Sabe Jones 2019-11-01 20:13:52 -0500
  • 853b9313f6 [Issue-11394] Challenge Creation/Edit Screen Should Not Close Except By X Button (#11409) leodalmacio 2019-11-02 02:02:22 +0800
  • a7c814262b Set specific subpage that is requested when profile is shown (#11412) Julien Midedji 2019-11-01 19:02:01 +0100
  • f02992faa5 moved the free hairstyles to the top of the modal (#11416) Adam Fitzgibbon 2019-11-01 13:01:46 -0500
  • d98614d403 Show 0 in the gem prize box if gem prize is null (#11453) Evelyn Stender 2019-11-01 18:01:28 +0000
  • 0482941934 Docs: Fixing small typos (#11454) Andy Smith 2019-11-01 18:01:15 +0000
  • cf00bddd6f add group by for hatchable sort (#11459) Adam Fitzgibbon 2019-11-01 13:00:59 -0500
  • dfd79c9c1a Use username in challenge member dropdown (#11478) Adam Fitzgibbon 2019-11-01 13:00:42 -0500
  • 2741721161 Fix: Preventing adding duplicated task ID to taskOrder fix for #11385 (#11408) cheng-shiqi 2019-11-02 02:00:21 +0800
  • 751d284f14 fix(text): Orb no longer always free Fixes #11278 Sabe Jones 2019-11-01 12:11:52 -0500
  • 52719ac685 fix(lint): line length Sabe Jones 2019-10-31 15:32:20 -0500
  • e6d20fead7 4.119.1 Sabe Jones 2019-10-31 15:18:19 -0500
  • f7c23ccac8 Merge branch 'origin/develop' into Weblate. Melior 2019-10-31 21:06:08 +0100
  • 819f7433db Translated using Weblate (Chinese (Simplified)) Melior 2019-10-31 21:05:03 +0100
  • bfc84be690 4.119.0 Sabe Jones 2019-10-31 15:03:42 -0500
  • 5cf2c592b5 chore(sprites): compile Sabe Jones 2019-10-31 15:03:35 -0500
  • d79e0b32d2 feat(event): Habitoween 2019 Sabe Jones 2019-10-31 15:03:25 -0500
  • 2ab197745a fix(build): more adjustments for Docker Sabe Jones 2019-10-31 19:00:56 +0000
  • 7f29088c29 fix(build): move babel to main deps & update Dockerfile Sabe Jones 2019-10-31 18:33:56 +0000
  • d1afbf4b92 Revert "Minimum password length + Static Pages fixes (#11474)" Sabe Jones 2019-10-31 13:16:09 -0500
  • e1d30eec98
    Minimum password length + Static Pages fixes (#11474) Matteo Pagliazzi 2019-10-30 13:47:35 +0100
  • 2ca3c225c4 some additional padding Adam Fitzgibbon 2019-10-29 22:03:57 -0500
  • 9ceb45b058 fix padding on various pages Adam Fitzgibbon 2019-10-28 23:04:13 -0500
  • aedabd2266 Fix Xaz16 2019-10-29 00:27:41 +0300
  • 60a12e8090 after merge Xaz16 2019-10-28 23:15:45 +0300
  • 33e9e7b647 Merge remote-tracking branch 'upstream/develop' into develop Xaz16 2019-10-28 22:56:36 +0300
  • 1cf3ba26b7 build(deps): bump eslint from 6.5.1 to 6.6.0 in /website/client (#11488) dependabot-preview[bot] 2019-10-28 11:54:13 +0100
  • 8a57d77550 build(deps-dev): bump eslint from 6.5.1 to 6.6.0 (#11489) dependabot-preview[bot] 2019-10-28 11:52:28 +0100