MathWhiz
06dd9fe859
Add SpacePenguin's Theme ( #9237 )
...
* Add SpacePenguin's Theme
* Fix files
2018-01-12 16:15:55 -06:00
zags
2a2c525c2d
Add support for multiDaysCountAsOneDay == false to evasion ( #9077 )
...
* Add support for `multiDaysCountAsOneDay == false` to evasion
`if (dailiesDaysMissed > 1) dailiesDaysMissed = 1;` causes the evasion for-loop to only evaluate once even if `multiDaysCountAsOneDay == false`. This statement isn't necessary because `if (multiDaysCountAsOneDay) break;` will cause the for-loop to evaluate only once if `multiDaysCountAsOneDay == true`. Removing this statement makes the `dailiesDaysMissed` variable unnecessary.
* Moves break statement out of conditional
2018-01-12 16:12:19 -06:00
Sabe Jones
b2c1c9d9dc
Merge branch 'release' into develop
2018-01-12 21:54:20 +00:00
Sabe Jones
c33eba6736
4.20.1
2018-01-12 21:47:21 +00:00
Sabe Jones
56434cce71
chore(i18n): update locales
2018-01-12 21:46:32 +00:00
SabreCat
c41123c36c
chore(news): Blog Bailey
2018-01-12 21:38:16 +00:00
SabreCat
043a6cd4ba
chore(shops): update Featured Items
2018-01-12 21:25:09 +00:00
SabreCat
0ca2f9034f
Revert "WIP: Buy-1-Get-1 Gift Subs ( #9719 )"
...
This reverts commit dc3d694d0e
2018-01-12 21:15:42 +00:00
Keith Holliday
4c7157807b
Synced isdue/next due when user joins challenge ( #9779 )
2018-01-12 10:16:51 -06:00
Keith Holliday
0afe797bae
Fixed display when quest has no completion function ( #9778 )
2018-01-12 10:16:21 -06:00
Alys
1c8797e473
change Attribute to Stat and upper-case Stat Points and a couple of other terms
2018-01-12 08:09:31 +10:00
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
Matteo Pagliazzi
e96d0659cb
fix typos in migration to convert field for Apple subscribers
2018-01-10 18:19:32 +01:00
Matteo Pagliazzi
72d70236ea
fix typos in migration to convert field for Apple subscribers
2018-01-10 18:10:01 +01:00
Matteo Pagliazzi
ee2fc8c763
add migration to convert field for Apple subscribers
2018-01-10 18:08:32 +01:00
Sabe Jones
b53c03bca8
Merge branch 'release' into develop
2018-01-10 16:42:13 +00:00
Sabe Jones
9545f692ef
4.20.0
2018-01-10 16:41:44 +00:00
Sabe Jones
0112bd9b5a
chore(i18n): update locales
2018-01-10 16:40:59 +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
Keith Holliday
d3ee3ca53d
Updated plan updated date if user has cancelled ( #9773 )
...
* Updated plan updated date if user has cancelled
* Added test for plan with only date updated
2018-01-08 12:50:15 -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
Sabe Jones
587847f5e9
4.19.1
2018-01-08 17:23:28 +00:00
Sabe Jones
7842cd8a41
chore(i18n): update locales
2018-01-08 17:18:12 +00:00
SabreCat
2f9cf02932
fix(sprites): rename 2018/01 background icons
2018-01-08 17:11:20 +00:00
Pizilden
daa796454c
Added Farvoid Theme (new, clean branch) ( #9634 )
...
* Added Farvoid Theme
* Updated generic.json and index.js
* fix(merge): address conflicts
2018-01-05 14:34:19 -06: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
kartik adur
229e39facf
Other user checkins: user profile modal checkin count ( #9646 )
...
* add loginIncentives to public fields to show non-loggedin user checkins
* update integration tests for update in api response
2018-01-05 13:29:38 -06:00
Allison Virgil
75b00ce2df
Fixed Challenge Winner Text (partial fix for #9629 ) ( #9664 )
...
* Fixed Challenge Winner Text (#9629 )
* Fixing typo
2018-01-05 13:29:00 -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
Sabe Jones
5ca5adc774
4.19.0
2018-01-04 21:49:53 +00:00
Sabe Jones
005ffe850a
chore(i18n): update locales
2018-01-04 21:44:47 +00: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
Sabe Jones
e3bf3d29f7
4.18.1
2018-01-03 00:54:23 +00:00
