negue
de9883c3ac
extract chat ( #10362 )
...
* extract chatTextarea from group/tavern - extract staffList array
* fix lint / rewrite condition
* clean up - part 1
* rename chatTextarea to chat
* refactor timestamp check
2018-05-18 17:01:05 +02:00
negue
3d39718048
Purchase API Refactoring: Spells [Gold] ( #10305 )
...
* convert buySpell operation
* remove purchaseWithSpell - change purchaseType 'special' to 'spells' - fix lint
* fix tests
* rollback 'spells' to 'special'
2018-05-18 17:00:39 +02:00
Sabe Jones
4a55d36831
Merge branch 'release' into develop
2018-05-15 21:11:54 +00:00
SabreCat
ae9db7aee3
feat(content): enable Fairy Potions
2018-05-15 21:00:49 +00:00
Matteo Pagliazzi
37b890f282
fix(market): fixes #10316
2018-05-15 17:21:15 +02:00
Matteo Pagliazzi
6db412f7e6
fix tags checkbox in bootstrap 4.1.1
2018-05-15 16:55:35 +02:00
Keith Holliday
fa60c9a232
Reset stats after allocation ( #10363 )
2018-05-14 22:18:23 -05:00
Matteo Pagliazzi
2c3d268a63
Merge branch 'develop' of github.com:HabitRPG/habitica into develop
2018-05-13 16:30:47 +02:00
Matteo Pagliazzi
388492e1e7
fix conflicts and remove extra dependency
2018-05-13 16:30:17 +02:00
Brian Fenton
355f0fedfb
disabling checking off a subtask if not assigned to a user ( #10357 )
2018-05-13 16:12:26 +02:00
Doğu Deniz Uğur
38d78de4b3
New method added to displaying locked quest popover message in shop ( #10346 )
...
isBuyingDependentOnPrevious () method checks if item.key of quest is in a list of quests whose unlock condition is not dependent on the completition of previous quest.
2018-05-13 16:07:20 +02:00
pengfluf
6c64a1cd8c
Beard and mustache facial hairs now can be bought as a full set for 5 gems ( #10338 )
...
* Purchasing All Facial Hairs Fixed
* Notifications z-index fixed
* Notifications z-index fixed x2
* Z-indexes fixed, facial hairs buying corrected
* isPurchaseAllNeeded refactored
* isPurchaseAllNeeded is more generic now
* Linting Passed
2018-05-13 16:04:43 +02:00
siege918
d4d668f640
Prevent accidental submission of Tavern/Guild posts after pasting ( #10226 )
...
* Temporarily disable ctrl-enter to send Guild messages after paste
Disable Ctrl-Enter after pasting, because some users are experiencing issues with accidentally sending their messages after pasting.
* Code style fixes for "Temporarily disable ctrl-enter to send Guild messages after paste"
* Fix issues with variable location
* Fix variables for accidental chat submission features
Moving vatiables for the chat submit timeout to their own variable so they won't be overwritten
* Fix code formatting issues with accidental chat submission code
* Remove leading space from variables to fix lint issues
2018-05-11 15:18:41 -05:00
Marvin Rabe
41ccd58f8e
Fixed tavern chat button. ( #10342 )
2018-05-11 15:15:50 -05:00
SabreCat
c62386e2e5
chore(news): Bailey
2018-05-10 18:42:44 +00:00
Sabe Jones
bbbd1f9f73
Merge branch 'release' into develop
2018-05-08 18:41:13 +00:00
SabreCat
24cceb1c91
feat(content): Cuddle Bundle
2018-05-08 18:28:33 +00:00
Keith Holliday
21eac3cc94
Fixed stat allocation issues ( #10344 )
2018-05-08 08:54:50 -05:00
Sabe Jones
69a782a1db
Party header sort WIP ( #10330 )
...
* WIP(groups): improved sorting WIP
* WIP(groups): split sort option and direction
* WIP(party): header sort cont'd
* feat(party): header sorting
2018-05-07 16:19:00 -05:00
Marvin Rabe
68353fb874
Added sidebar section test.
2018-05-07 18:21:32 +02:00
Marvin Rabe
68526c07ae
Added missing comma.
2018-05-07 16:43:07 +02:00
Marvin Rabe
5f319ca4f6
My Challenges should include all Owned Challenges ( #9286 )
2018-05-07 16:23:49 +02:00
Marvin Rabe
0d84643961
Joined and Owned Challenges should still appear in Discover, but annotated with status ( #9956 )
2018-05-07 16:04:40 +02:00
Marvin Rabe
1896a8fab0
Challenge task numbers get created from computed array.
2018-05-07 14:18:05 +02:00
Marvin Rabe
891b5566a9
Created reusable category tags component.
2018-05-07 13:56:54 +02:00
Marvin Rabe
c83499545c
Added Tavern case
2018-05-07 13:35:53 +02:00
Marvin Rabe
4c837acf88
Use computed attribute for boss health bar width.
2018-05-07 13:30:33 +02:00
Marvin Rabe
11b223a81e
Challenge item shadow and border radius matches guild item style.
2018-05-07 13:25:52 +02:00
Marvin Rabe
17001743e1
Changed last prop to :last-of-type
2018-05-07 13:24:48 +02:00
Keith Holliday
ac451bdb9b
Removed spell queue ( #10337 )
2018-05-06 17:53:49 -05:00
Marvin Rabe
5231cb03a8
Fixed columns when translation is too long. ( #10315 )
2018-05-04 16:10:02 -05:00
Marvin Rabe
f8739b6f37
Fixed learn more in user dropdown. ( #10314 )
2018-05-04 16:09:38 -05:00
Corey Gray
e31f62a818
Add responsive margins to pets and mounts. ( #10311 )
...
* Add responsive margins to pets and mounts.
* Move all margins to margin-right to make left edges flush.
2018-05-04 16:06:58 -05:00
pengfluf
d5d06c1d2d
Header stuck naming fixed ( #10309 )
2018-05-04 16:05:38 -05:00
pengfluf
4fa2ef045d
10256 - The placeholder and the message row are fixed ( #10307 )
2018-05-04 16:04:06 -05:00
Matteo Pagliazzi
f3a947339c
fix quest completion modal: send only one request ( #10327 )
2018-05-04 17:00:11 +02:00
Keith Holliday
5e6541faa6
Logged users out if they were logged in with facebook ( #10322 )
2018-05-03 13:00:50 -05:00
Matteo Pagliazzi
e3ce1c5322
possible fix for facebook auth bug
2018-05-03 18:06:01 +02:00
Sabe Jones
27c73e028a
Merge branch 'release' into develop
2018-05-01 21:32:29 +00:00
SabreCat
16b5b8b8c7
chore(sprites): compile
2018-05-01 21:25:58 +00:00
SabreCat
30a717148e
chore(event): end Spring Fling
2018-05-01 21:25:45 +00:00
Marvin Rabe
129fccf646
Guild category tags and challenge category tags have now the same styling.
2018-05-01 21:36:23 +02:00
Marvin Rabe
9d755c5d5f
Merge branch 'fix-german-translations' into fix-challenge-layout
2018-05-01 20:17:29 +02:00
Marvin Rabe
05c43d1f9d
Use sidebar section component in tavern.
2018-05-01 20:13:46 +02:00
Marvin Rabe
45df73e4be
Fixed challenges on 'Tavern'
2018-05-01 19:53:31 +02:00
Marvin Rabe
eaa00598d0
Improvements to Challenge Layout ( #9619 )
2018-05-01 19:47:04 +02:00
Marvin Rabe
88b14592c5
Make Challenge Owner's Name Clickable ( #9283 )
2018-05-01 17:23:02 +02:00
Marvin Rabe
85136675e9
Fixed group sidebar.
2018-05-01 16:13:16 +02:00
Marvin Rabe
4e4181a394
Improved challenge layout.
2018-05-01 16:10:57 +02:00
Marvin Rabe
f93822b0b3
Several hard coded strings fixed.
2018-05-01 14:34:58 +02:00