krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 21:57:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,593 Commits 62 Branches 1,225 Tags
0d90a1db4c6354a7030113404075c73de01a9aeb
Commit Graph

19593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matteo Pagliazzi
0d90a1db4c fix linting of migrations 2019-10-08 18:36:55 +02:00
Matteo Pagliazzi
621787915c start upgrading eslint 2019-10-08 16:57:10 +02:00
Matteo Pagliazzi
90c917f69e fix duplicates in code 2019-10-08 15:05:48 +02:00
negue
7864ba75c7 [Stlye] fix yesterdaily modal (#11352) 
* fix yesterdaily style

* use rem

* unneeded height prop

* fix task-wrapper margin

* fix the modal backgrounds + update package-lock
 2019-10-07 20:10:12 +02:00
Matteo Pagliazzi
50cae0165c Revert "Fix: Antidotes to Avatar Transformation Items should be added to Rewards by API (#11353)" (#11406) 
This reverts commit 5b57d91a9b.
 2019-10-07 16:55:44 +02:00
Aleksey
5b57d91a9b Fix: Antidotes to Avatar Transformation Items should be added to Rewards by API (#11353) 
* Fix: moved debuffPotions from vue component

- Move logic of choosing proper debuf potion from vue component to website commons
- introduce new function to get debuffSpellItems

* Fix: move debuffPotions to server

* Refactoring: move setting of debuff potion to func

* Fix: sanity

* Refactoring & Tests:

- Create test case for get and set DebuffPotionItems functions
- Fix setDebuffPotionItems function to not create duplicated debuff items
- Make debuff potion type of items unpinnable
- Move list of debuffs to constant to reuse it in tests and functions

* Fix: typo in test describe

* Fix: translation of unpin

* Fix: setDebuffPotionItems on cron buffs reset

* Fix: use full path for debuff potions
 2019-10-06 18:41:39 +02:00
citrusella
85eab76a71 fix dark-on-dark in quest modal tooltip (#11397) 2019-10-06 17:58:28 +02:00
Mark Kop
e1246ff99f fix(chat): change class name because of active route (#11405) 2019-10-06 17:49:51 +02:00
Matteo Pagliazzi
16c8825b2b Hall Fixes (#11403) 
* fix(hall): correctly casts owned gear and mounts

* typo
 2019-10-06 17:08:11 +02:00
cheng-shiqi
ca7399f6c1 Repair negative quest scrolls on (gem)purchase (#11399) 
* Fix: Reset negative quest scrolls number to zero on purchase(gem)

* Refactor: rename website/common/script/ops/buy/buyQuest.js to website/common/script/ops/buy/buyQuestGold.js and update related files

* Test: add two tests related to negative quest scrolls
 2019-10-06 17:06:02 +02:00
Matteo Pagliazzi
20ef27028e misc test 2019-10-04 19:50:52 +02:00
Sabe Jones
916ebcacff 4.116.2 2019-10-03 14:05:37 -05:00
Sabe Jones
df0a633b09 Merge branch 'develop' into release 2019-10-03 14:05:28 -05:00
Sabe Jones
cc8d3a9f36 chore(event): enable Sparkles 2019-10-03 14:04:02 -05:00
Matteo Pagliazzi
2a4e103812 fix integration tests and paths for client tests 2019-10-03 17:40:38 +02:00
Matteo Pagliazzi
d19b3857ee fix unit tests 2019-10-03 17:24:17 +02:00
Matteo Pagliazzi
3a6a4092f9 fix content tests 2019-10-03 16:35:56 +02:00
Matteo Pagliazzi
17c7a2bad1 fix common tests 2019-10-03 16:27:44 +02:00
Matteo Pagliazzi
5b406ba70f remove need for babel register in clientside 2019-10-02 23:19:24 +02:00
Matteo Pagliazzi
e021328067 use right babel package 2019-10-02 21:49:29 +02:00
Matteo Pagliazzi
db02712c98 fix babel and remove unused deps 2019-10-02 20:09:26 +02:00
Matteo Pagliazzi
45f7cf04ab remove old module.exports from server aswell 2019-10-02 19:45:27 +02:00
Matteo Pagliazzi
e0a2528a4f Merge branch 'develop' into client-monorepo 2019-10-02 18:40:24 +02:00
Matteo Pagliazzi
9a2bb981a9 avoid loading moment locales 2019-10-02 18:30:41 +02:00
Matteo Pagliazzi
823a1034e0 fix svgs 2019-10-02 16:40:04 +02:00
Sabe Jones
03f7adf596 Merge branch 'release' into develop 2019-10-02 06:26:49 -05:00
Sabe Jones
9c20c3595a 4.116.1 v4.116.1 2019-10-02 06:25:36 -05:00
Sabe Jones
228f2379aa fix(sprites): rename broad armor 2019-10-02 06:25:16 -05:00
Matteo Pagliazzi
211da982b3 fix env vars 2019-10-02 11:16:31 +02:00
Melior
9c93daf542 Merge branch 'origin/develop' into Weblate. 2019-10-02 02:09:27 +02:00
Melior
f933cb624c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 96.0% (1876 of 1953 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/

Translated using Weblate (German)

Currently translated at 99.2% (1938 of 1953 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/de/

Translated using Weblate (English (United Kingdom))

Currently translated at 100.0% (329 of 329 strings)

Translation: Habitica/Front
Translate-URL: https://translate.habitica.com/projects/habitica/front/en_GB/

Translated using Weblate (Dutch)

Currently translated at 100.0% (137 of 137 strings)

Translation: Habitica/Challenge
Translate-URL: https://translate.habitica.com/projects/habitica/challenge/nl/

Translated using Weblate (Turkish)

Currently translated at 98.0% (203 of 207 strings)

Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/tr/
 2019-10-02 02:08:24 +02:00
Sabe Jones
8308f88865 Merge branch 'release' into develop 2019-10-01 19:02:49 -05:00
Sabe Jones
d7d2789991 4.116.0 v4.116.0 2019-10-01 19:01:55 -05:00
Sabe Jones
33bd3dc65b chore(sprites): compile 2019-10-01 19:01:43 -05:00
negue
e92320a256 remove obsolete z-index override (#11384) 2019-10-01 18:58:44 -05:00
Sabe Jones
3c7d3aafe5 feat(content): Armoire and BGs 2019-10-01 18:58:40 -05:00
Matteo Pagliazzi
86dbc23f3c fix server 2019-10-01 17:57:42 +02:00
Matteo Pagliazzi
cca5b8492b fix exports 2019-10-01 17:53:48 +02:00
Matteo Pagliazzi
4faa06f37d fix esling 2019-10-01 16:31:13 +02:00
Matteo Pagliazzi
33b26a69b8 config fixes 2019-10-01 16:23:09 +02:00
Matteo Pagliazzi
b466d12263 migrate remaining paths 2019-10-01 16:00:06 +02:00
Matteo Pagliazzi
e69275663b rewrite paths, add deps 2019-10-01 15:38:48 +02:00
Matteo Pagliazzi
b44fbdcb14 old client structure 2019-10-01 11:44:38 +02:00
Matteo Pagliazzi
5b61f65711 move tests 2019-09-30 23:19:18 +02:00
Matteo Pagliazzi
46e4036c01 move remaining files 2019-09-30 23:14:31 +02:00
Matteo Pagliazzi
dadcf5db07 remove automatically generated files 2019-09-30 23:12:46 +02:00
Matteo Pagliazzi
b21a07aa66 start moving files 2019-09-30 23:02:24 +02:00
Matteo Pagliazzi
c6be804723 remove old e2e packages 2019-09-30 22:32:11 +02:00
Matteo Pagliazzi
a8846b17c0 Start implementing new client structure 2019-09-30 22:23:09 +02:00
Melior
e6ca63cc36 Merge branch 'origin/develop' into Weblate. 2019-09-30 20:29:48 +02:00