Keith Holliday
e0bf6d2e55
Reverted group flag code ( #9784 )
...
* Reverted group flag code
* Reverted all flagging code
* Added hyphens back
2018-01-11 12:04:07 -06:00
Sabe Jones
b53c03bca8
Merge branch 'release' into develop
2018-01-10 16:42:13 +00:00
SabreCat
d235576e18
chore(sprites): compile
2018-01-10 16:32:34 +00:00
SabreCat
3d5d5da933
feat(content): Pept quest
2018-01-10 16:31:56 +00:00
Alys
9b19477e2f
adjust wording for Keys to Kennels
...
Also moves the new Keys text strings to the same place as the old ones in the locales file.
Also fixes minor typos in code that was preventing the new text from being displayed.
2018-01-10 21:21:58 +10:00
Sabe Jones
5a9c95f07e
fix(guilds): include exact breakpoints
2018-01-09 18:29:59 -06:00
Keith Holliday
3000e2b72c
Removed keys and inbox flagging ( #9776 )
2018-01-09 12:58:01 -06:00
Matteo Pagliazzi
c1f6f0398e
fix positioning of checkmarks for checklist items
2018-01-09 11:31:02 +01:00
Matteo Pagliazzi
cb6488fa05
fix path for KeysToKennel module
2018-01-09 11:29:12 +01:00
Keith Holliday
126d90f471
Added keys to the kennel ( #9772 )
...
* Added keys to the kennel
* Added titles and descriptions
2018-01-08 13:15:19 -06:00
Keith Holliday
98d4fb0f34
Chat flag inbox ( #9761 )
...
* Refactored chat reporting
* Added inbox flag chat
* Added flag chat to inbox
* Added you have flagged message
2018-01-08 13:13:25 -06:00
Matteo Pagliazzi
7eac5cebf5
fix typo
2018-01-08 18:47:59 +01:00
Matteo Pagliazzi
6a109adbc5
Task Modal Improvements ( #9560 )
...
* start adding advanced options
* new imput
* partial colors
* update deps
* misc adds
* fix text color
* add advanced options
* initial reordering of task modal labels
* start to fix colors in the modal
* wip colors
* update package-lock.json
* fix merge
* finish modal
* refactor colors
* fix quick add
* fix colors
* new icon colors
* add markdown formatting help
* fix habits colors
* fix rewards colors
* fixed remaining colors
* start to inline inputs
* fix typ
* fixes
* habits hover state
* wip new task modal inputs
* bootstrap: upgrade to v4-beta3
* finish reward edit modal
* fix attributes allocation, checklists and add help tooltips for attributes and difficulty
* lots of fixes
* update datepicker
* misc fixes
2018-01-08 18:43:57 +01:00
SabreCat
2f9cf02932
fix(sprites): rename 2018/01 background icons
2018-01-08 17:11:20 +00:00
Cassidy Pignatello
c531239618
Fixes equipment sorting by name in inventory ( #9692 )
...
* returns items sorted in ascending order when sorted by name
* returns items sorted in ascending order when sorted by name
2018-01-05 13:51:47 -06:00
Matti Petrelius
f6ac7b890a
Both eggs and potions should hatch pets from Items ( #9645 )
...
* Show click on hatching potion when egg is clicked
* Fix translation parameter name
* Show egg as active when clicked
* Remove itemDragStart event handler from egg items
* Change isHatchable to take in potion and egg objects
* Add margin to item popover content
2018-01-05 13:31:34 -06:00
Julius Jung
4576353f26
inital commit to add confirmation to animalEars ( #9666 )
2018-01-05 13:26:45 -06:00
Allister
acf4b4da63
Change focused state of introjs button ( #9677 )
2018-01-05 13:24:32 -06:00
josteins1
8b5933177a
Given back header the priority over snackbar with z-index value and a padding to avoid collision. ( #9687 )
...
* increased top padding to match main header
referring to issue 9678
https://github.com/HabitRPG/habitica/issues/9678
* adjusted the z value to appropriate levels
z-index adjusted from 99999 to 999
2018-01-05 13:23:03 -06:00
Julius Jung
a6ddd6d233
fix drawer-slider carousel function && convert to pointer logic ( fixes #9366 AND #9638 ) ( #9711 )
...
* fix drawer-slider carousel function && convert to pointer logic
* refactor conditional logic
* get rid of absolute value
2018-01-05 13:20:21 -06:00
SabreCat
71cb4e8510
feat(content): enable Wintery Skins and Hair
2018-01-04 21:35:26 +00:00
SabreCat
40244ab81b
Merge branch 'develop' into release
2018-01-04 21:11:44 +00:00
Keith Holliday
15b65b342a
Removed extra achievement sound ( #9763 )
2018-01-04 10:17:33 -06:00
Matteo Pagliazzi
7df3aba71b
make search case insensitive in equipment and inventory pages ( #9762 )
2018-01-04 13:06:15 +01:00
Keith Holliday
6bb535c129
Reset chat options when change guild routes ( #9743 )
2018-01-02 22:56:31 -07:00
SabreCat
df9c42c1b5
fix(backgrounds): add 2018 group
2018-01-03 00:52:54 +00:00
Sabe Jones
7e241bb76f
Merge branch 'release' into develop
2018-01-03 00:07:42 +00:00
SabreCat
240dd1b965
chore(sprites): compile
2018-01-02 23:52:35 +00:00
SabreCat
88e6b2da7c
feat(content): Armoire and BGs 2018-01
...
Also ends New Year's hat fanciness
2018-01-02 23:49:50 +00:00
Sabe Jones
6e7f4a231d
chore(sprites): compile
2018-01-02 21:41:37 +00:00
Sabe Jones
da73c5c418
Merge branch 'release' into develop
2017-12-31 02:45:04 +00:00
SabreCat
b9f709ab30
chore(sprites): compile
2017-12-31 02:35:50 +00:00
SabreCat
d57c525fab
feat(event): New Year's 2017-18
2017-12-31 02:34:52 +00:00
Keith Holliday
d90d781740
Added mobile style fixes ( #9741 )
2017-12-26 17:31:00 -06:00
Sabe Jones
e8976b40f4
Merge branch 'release' into develop
2017-12-22 21:42:02 +00:00
Keith Holliday
545b052c10
Added fix for quantity confirmation ( #9735 )
2017-12-22 10:23:55 -06:00
SabreCat
028b9d569d
Merge branch 'release' into develop
2017-12-21 23:20:51 +00:00
SabreCat
b68e69e1a1
chore(sprites): compile
2017-12-21 23:12:06 +00:00
SabreCat
4764f115b1
feat(content): Subscriber Items Dec 2017
2017-12-21 23:10:54 +00:00
Keith Holliday
95c99295c1
Removed gold locally when user buys a card ( #9736 )
2017-12-21 10:27:09 -06:00
Keith Holliday
a7617fa947
Added broken megaphone icon ( #9737 )
2017-12-21 10:25:54 -06:00
Keith Holliday
afc1ffd90b
Refactored duplicate card section ( #9730 )
...
* Refactored duplicate card section
* Updated to new computed methods
2017-12-20 12:27:21 -06:00
Keith Holliday
6e0b6171c6
Many ie style fixes ( #9728 )
2017-12-20 10:33:21 -06:00
Sabe Jones
75092336c4
fix(news): Holly, not Peppermint, potions
2017-12-20 04:43:43 +00:00
SabreCat
acf34e2344
chore(sprites): compile
2017-12-20 02:27:43 +00:00
SabreCat
98bb6fd7ce
feat(content): Winter Wonderland 2017-18
...
and Starry Night Hatching Potions
2017-12-20 02:23:11 +00:00
Keith Holliday
b8c716ff82
Fixed pending damage display and nav size ( #9723 )
2017-12-18 12:31:16 -06:00
SabreCat
e229bc5042
Merge branch 'release' into develop
2017-12-15 05:37:04 +00:00
SabreCat
c4ffe39ec9
chore(news): Bailey
2017-12-15 05:34:30 +00:00
Sabe Jones
dc3d694d0e
WIP: Buy-1-Get-1 Gift Subs ( #9719 )
...
* feat(promo): Buy-1-Get-1 Gift Subs
* feat(promo): add explanatory text to subscription screens
Also adds some add'l test coverage and creates a test context for this event
2017-12-14 23:09:02 -06:00
Keith Holliday
c28ec24c33
Added notification for when leader is updated ( #9674 )
...
* Added notification for when leader is updated
* Abstracted challenge member search component
* Added challenge member search modal to challenge detail
* Added group search
2017-12-14 12:12:43 -06:00
Keith Holliday
e7fd2b4c79
[WIP] Added initial inapp loading screen with tips ( #9710 )
...
* Added initial inapp loading screen with tips
* Added new tips and styles
* Removed unrelated readme
2017-12-14 09:35:10 -06:00
SabreCat
b0ebdfeb65
Merge branch 'release' into develop
2017-12-13 22:16:30 +00:00
SabreCat
5a3751cbac
chore(news): Blog Bailey
2017-12-13 22:14:19 +00:00
Keith Holliday
7802e30e80
Added static/front and meta tags ( #9712 )
...
* Added static/front and meta tags
* Moved meta to index
2017-12-13 15:11:22 -06:00
Matteo Pagliazzi
899452279b
fix ie 11 rendering ( #9713 )
2017-12-13 13:51:04 -06:00
Keith Holliday
566716e2fe
Added display logic for npcs ( #9709 )
...
* Added display logic for npcs
* Fixed lint
2017-12-12 19:05:18 -06:00
SabreCat
2a42bc9450
Merge branch 'release' into develop
2017-12-12 21:27:04 +00:00
SabreCat
355773ecf3
chore(news): FCC CTA
...
Also fixes an issue with sprite alignment of the Lamplighter Set.
2017-12-12 21:24:18 +00:00
Keith Holliday
507133c76e
Added client side logging ( #9643 )
2017-12-11 11:07:16 -06:00
Keith Holliday
1750a0c2e6
Updated responsive styles ( #9696 )
...
* Updated responsive styles
* Font adjustments
* Changed to max height
2017-12-09 23:23:16 -06:00
Keith Holliday
759ce61492
Added support for party invites by email ( #9665 )
...
* Added support for party invites by email
* Changed to groupInvite
2017-12-07 12:57:01 -05:00
Keith Holliday
0184d774c2
Disabled challenge button when loading ( #9686 )
2017-12-06 20:16:40 -05:00
SabreCat
2be8ddb60d
fix(news): winner typo
2017-12-06 19:15:34 +00:00
Keith Holliday
3c67f91525
Quest refactor ( #9681 )
...
* Separated out quest sidebar component
* Added accepted count
2017-12-06 11:13:44 -05:00
Keith Holliday
c02aadfac4
Made user pay for amoire locally ( #9673 )
2017-12-06 10:50:15 -05:00
Julius Jung
2f956252ab
Don't show shield when previewing two-handed weapon ( fixes #9495 ) ( #9676 )
...
* initial commit to not show shield when previewing two-hand weapon
* revert error made
* update to fix all combinations of equipping / trying two-handed weapons
* clarify conditional logic
* refactor to let avatar check for twoHanded display/hide logic
* add case when avatar doesn't have weapon equipped
2017-12-05 17:05:59 -06:00
Andrew Bustos
341f16cc82
Fixed block icon not showing in profile modal. ( #9667 )
...
* Fixed block and add icon not showing and the ordering of the buttons. Also fixed and added tooltips for buttons.
* Changed unnecessary change of color in svg icon files and changed tooltip attribute to not be empty
2017-12-05 15:01:18 -06:00
Julius Jung
ec179182e7
submit initial working solution to disallow selling of Saddle ( #9663 )
2017-12-05 14:22:59 -06:00
Feywood
4047bf6943
Rewards permit decimal value. Fixes https://github.com/HabitRPG/habitica/issues/9513 ( #9617 )
...
* testing additional event trigger for sendMessage
* moved keyup event to newmessage
* added keyup event to tavern vue too
* removed number.toFixed, changed to placeholder and step
2017-12-05 14:13:54 -06:00
Julius Jung
a5a985fd00
Don't show shield when previewing two-handed weapon ( fixes #9495 ) ( #9607 )
...
* initial commit to not show shield when previewing two-hand weapon
* revert error made
* update to fix all combinations of equipping / trying two-handed weapons
* clarify conditional logic
* refactor to let avatar check for twoHanded display/hide logic
2017-12-05 14:11:19 -06:00
Alys
444d6889de
add subscription cancellation instructions for free Group Plans subscriptions ( #9606 )
2017-12-05 14:10:15 -06:00
negue
c56c69d464
market fixes 28th nov ( #9593 )
...
* list special gear by the `specialClass` - fixes #9485
* only disable the currencly label + value not the amount input - fixes #9492
* disable transformations on equipment previews - fixes #9497
* show boss strength - fixes #9522
* pin time travelers animals - closes #9382
* clean up + package-lock ?
* fix quest info
2017-12-05 14:09:34 -06:00
Kip Raske
4b610ba3f1
Fixing the pig flying too high in the stable square bug ( #9592 )
...
The `.FlyingPig` css class necessary to re-center the pig in its square
is no longer applied when the square is greyed out. So I am adding that
to the greyed out square. It seems to not have any affect on the other
pets.
2017-12-05 14:06:35 -06:00
Feywood
65e3b599e6
Fix for sending chat with ctrl enter for windows chrome/firefox. Fixes https://github.com/HabitRPG/habitica/issues/9380 ( #9588 )
...
* testing additional event trigger for sendMessage
* moved keyup event to newmessage
* added keyup event to tavern vue too
* removed obsolete check from _updateCarretPosition
* fixed lint issue
2017-12-05 14:05:01 -06:00
aalsehly86
7caf211bec
Fix issue #9534 - changed the character-name ( #9547 )
...
* Fix issue #9534 - changed the character-name from $white to $header-dark-background
* changes to #9534 - changed character-name color from -dark-background to -color.
* character-name color is back to #9534
* changed character-name color to -200
* Changed colors for character name and level details #9534
2017-12-05 14:02:29 -06:00
Tyler Nychka
bfaa7c0fea
Validate that everyX values in dailies are integers bounded by 0 and 9999 fixes #8782 ( #9268 )
...
* Validate that everyX values are integers bounded by 0 and 9999
* Added client side check
* Updated tests
* Added migration for bad dailies
Near idential to the other task migration.
* fix(typo): camelCase function call
2017-12-05 13:55:32 -06:00
Sabe Jones
b457daa616
Merge branch 'release' into develop
2017-12-05 19:29:34 +00:00
Sabe Jones
9e8807c40d
Armoire and Backgrounds December 2017 ( #9659 )
...
* feat(content): Armoire and Backgrounds 2017/12
* chore(sprites): compile
* chore(news): Bailey
2017-12-05 19:29:00 +00:00
Sabe Jones
9bfbeaf93e
Armoire and Backgrounds December 2017 ( #9659 )
...
* feat(content): Armoire and Backgrounds 2017/12
* chore(sprites): compile
* chore(news): Bailey
2017-12-05 13:25:52 -06:00
Keith Holliday
860efefdb2
Removed client side armoire call ( #9660 )
2017-12-05 12:23:31 -06:00
Keith Holliday
6310482b9d
Added popovers to quests ( #9655 )
2017-12-05 10:57:28 -05:00
Keith Holliday
2d4928cd2b
Removed challenge access restriction ( #9652 )
2017-12-04 15:57:38 -05:00
SabreCat
f3c2c0f901
Merge branch 'release' into develop
2017-12-04 19:23:55 +00:00
Keith Holliday
1fc84c2357
Added calculated property ( #9637 )
2017-12-04 11:24:04 -06:00
Keith Holliday
13cdcedcba
Added support for scoring group tasks down after approval ( #9623 )
...
* Added support for scoring group tasks down after approval
* Fixed lint issues
2017-12-04 11:23:47 -06:00
Keith Holliday
bdef1ca23c
Fixed max width none ( #9631 )
2017-12-01 21:26:52 -06:00
SabreCat
cb58994bdf
Merge branch 'release' into develop
2017-12-01 21:32:28 +00:00
SabreCat
44f3b73183
fix(avatar): layer base/bangs correctly
2017-12-01 21:10:33 +00:00
Keith Holliday
e138d2b67b
Added needs cron check to achievements ( #9624 )
2017-12-01 09:54:43 -06:00
Keith Holliday
3e3248fecb
Changed row adding when user blurs/focuses ( #9610 )
2017-12-01 08:37:37 -06:00
Keith Holliday
78ee60611a
Remove cancel button when clicked ( #9616 )
2017-12-01 08:03:54 -06:00
Keith Holliday
3c7aaa605b
Fixed text being cut off ( #9612 )
2017-12-01 08:03:36 -06:00
Keith Holliday
00343da266
Added max width seetings to screens larger than 1300 ( #9609 )
2017-12-01 07:47:45 -06:00
Keith Holliday
c6a3bfb291
Added exp reset when changing level ( #9611 )
2017-11-30 15:45:26 -06:00
Keith Holliday
7797794cd5
Deselect a tag if it is selected when removing ( #9614 )
2017-11-30 15:45:14 -06:00
Keith Holliday
d9e09a5f3d
Fixed streak bonus style ( #9608 )
2017-11-30 12:37:53 -06:00
Keith Holliday
4e73c8513e
Hide progress if user is not on quest ( #9597 )
2017-11-30 12:37:31 -06:00
Keith Holliday
6f9cbf9ca1
Only update the user when editing profile ( #9601 )
2017-11-30 08:19:03 -06:00
Keith Holliday
77f71b5415
Fixed saving in progress tag when clicking save ( #9598 )
2017-11-30 08:16:54 -06:00
