Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,926 Commits 64 Branches 1,256 Tags
ec6f53bb1becd6b6a67d7d3e5b6ab7a9f73ad29f
Commit Graph

1050 Commits

Author SHA1 Message Date
Philip Karpiak ec6f53bb1b Wrap attribute cell value text (#10161) 
When they become floating point or have more than 3 charcters they wrap to the next line. This change prevents that.
 2018-03-24 11:12:26 -05:00
jack 9834afee4a fixes #9880 - uneven sizes and spacing in the action buttons of the user modal. (#10163) 2018-03-24 11:09:56 -05:00
Dexx Mandele 9b279563ea Prettify background overview (#10078) 
* Bring buy bg set button in line with title

* Make background sets pretty

* Add checkbox to filter backgrounds

* Review: replace background filter checkbox with toggle

* Remove dashed line from toggle-switch label

* Test: add comma to make es-lint happy

* Move toggle tooltip into toggle-switch template

* Make toggle-switch label optional

* Review: Remove toggle-switch margin
 2018-03-24 11:07:37 -05:00
Keith Holliday 298a6a743c Added paging (#10150) 
* Added paging

* Escaped regex

* Fixed challenge side effect tests
 2018-03-23 14:13:08 -05:00
SabreCat 13d9da404d chore(sprites): compile 2018-03-22 19:51:21 +00:00
negue 36dabad2c9 fix seasonal shop (#10164) 2018-03-22 13:50:58 -05:00
Sabe Jones 3af7f89d10 Merge branch 'release' into develop 2018-03-20 22:57:52 +00:00
SabreCat 9b8bdb90d8 chore(sprites): compile 2018-03-20 21:31:04 +00:00
SabreCat a84ea8b1b7 feat(event): Spring Fling 2018 2018-03-20 21:30:43 +00:00
Chris Wang fff4ea3ad3 Added popover stats to costume equipment on profile stats - fixes #9280 (#10136) 
* Added popover stats to costume equipment on the stats page of a profile (#9280)

* Changed popover position to bottom for equip and costume items.

* Fixed indent on line 160

* Changed escaped double quotes to single quotes for readability
 2018-03-18 16:24:41 +01:00
kartik adur e18e89bc10 Task page - task filters v2 (#10053) 
* update column.vue, getters/task.js, getters/user.js and add unittests and helpers

* add vue-test-utils pkg + unit test for column.vue

* add unit test column.vue

* update unit tests

* fix linting errors
 2018-03-18 16:23:58 +01:00
Matteo Pagliazzi 68ea28305d fix linting issues 2018-03-17 22:36:17 +01:00
Travis 242b3508a1 Update Staff list in the tavern to make staff names clickable to pull up staff profiles. (#10107) 
* Update Staff list in the tavern to make staff names clickable to pull up staff profiles.

fixes #9290

* Addressing PR comments.
 2018-03-17 22:29:52 +01:00
Travis 45eb19e992 Update the API to prevent the user from leaving a group if they are the only member and have a quest active. (#10091) 
* Update the API to prevent the user from leaving a group if they are the only member and have a quest active.

fixes #10068

* fixing api doc
 2018-03-17 22:26:07 +01:00
Travis fef8929dd9 Fixes start date updating the repeat on day for dailies repeated monthly (#10095) 
fixes # 9200
 2018-03-17 22:25:34 +01:00
Travis 911f894750 Fixing edit profile page so blurb can be editted after reload. (#10097) 
fixes #10032
 2018-03-17 22:25:17 +01:00
Mahendran Nadesan e43749bed1 Stats over 3 digits overlap (fixes #10033) (#10133) 
* Formatted stats

* small changes

* Fixed issues as per comments
 2018-03-17 22:23:55 +01:00
Sarah Boo 8be29e27d0 Hide "Delete Completed" To-Dos button on Challenge or Group Task Board - fixes #9935 (#10128) 
* only show delete to-dos for user's task page

* remove stray spaces
 2018-03-17 22:22:12 +01:00
Gene Vityugov 767f3ebe12 Add space in profile modal to make it consistent with other text (#10103) 2018-03-17 22:19:58 +01:00
Toivo Mattila d2b160438c Added margin to buttons on Settings-page (#10034) 
* Added margin to buttons on Settings-page

* Added bottom margin for 'Enable Class System' button
 2018-03-17 22:16:55 +01:00
Zack Sunderland b9a6d9ceec Allow Un-subscribed Users to Claim Mystery Items (#9270) 
Remove restriction on mystery/special inventory items that prevents
non-subscribed users from seeing the items. Organize the imports on the
page.

Resolves: Issue #9228
 2018-03-17 22:13:31 +01:00
negue 0fcc1f2080 correct position of pets in the profile overview - fixes #10104 (#10144) 2018-03-17 21:13:35 +01:00
negue 9287098e70 fix #10116 (#10143) 2018-03-17 21:13:12 +01:00
negue 3d4107db3e checkout of the Inn - banner (#9835) 
* show resting banner

* resume damage

* replace colors by variables

* remove indentation
 2018-03-17 21:12:25 +01:00
Keith Holliday 7fe62a731b Fixed gem amount on master key (#10140) 
* Fixed gem amount on master key

* fix(news): update Bailey text
 2018-03-15 16:19:11 -05:00
Keith Holliday 2195464772 Flag comment (#9991) 
* Added initial chat flag comment form

* Added user comment to slack message

* Updated copy and styles

* Fixed comma

* Updated admin messaging
 2018-03-14 07:41:13 -05:00
Sabe Jones b662f8bdff Merge branch 'release' into develop 2018-03-13 21:00:00 +00:00
SabreCat a88800df78 chore(sprites): compile 2018-03-13 20:54:54 +00:00
SabreCat 42e0095bbd feat(content): spring Hatching Potions 2018-03-13 20:54:27 +00:00
Sabe Jones ee1aa653f0 fix(groups): Guild badge fencepost errors 2018-03-12 14:43:39 -05:00
Travis 35849ebdd7 Fixing items sort by number in the market. (#10108) 
fixes #10093
 2018-03-09 15:17:26 -06:00
Travis f9a47b1420 Update user pinned items on purchases. (#10085) 
fixes #10049
 2018-03-09 15:11:42 -06:00
Dexx Mandele 07b3824c4c Stop market background from covering sign (#10067) 2018-03-09 14:59:45 -06:00
Travis 92fa6805eb fix: Quest collected items displayed multiple times. (#10111) 
fixes #10065
 2018-03-09 14:56:59 -06:00
Dexx Mandele f64b34318f Set warrior as default for the choose class pop-up (#10084) 2018-03-09 14:40:53 -06:00
Sabe Jones fe61c0f29e Merge branch 'release' into develop 2018-03-08 21:43:35 +00:00
SabreCat 201ec0e865 fix(world-boss): add achievement badge, correct mount positioning 2018-03-08 21:37:17 +00:00
SabreCat 5256569bac fix(world-boss): remove notification 2018-03-08 19:37:27 +00:00
SabreCat 63a11c6c28 chore(event): end Valentines/Dysheartener 2018-03-08 18:37:32 +00:00
Sabe Jones b4dab2e13c Merge branch 'release' into develop 2018-03-07 22:53:09 +00:00
SabreCat 2abf0f4900 feat(content): Hug a Bug Quest Bundle 2018-03-06 21:56:01 +00:00
Sabe Jones 27ef187e66 Merge branch 'release' into develop 2018-03-05 20:59:17 +00:00
SabreCat da50d2f495 feat(world-boss): third Rage Strike support 2018-03-05 20:46:22 +00:00
Keith Holliday 9c9b67aa9d Keys kennel fixes (#9848) 
* Show keys to pets immediately

* Ensured keys to pets dissapear after use

* Added resdirect to stable after purchase

* Added mount check and updated keys to mounts and to both

* Added api calls

* Added check for beastmaster progress

* Added mount check for release mounts. Added pets and mount check to release both

* Added actions

* Added catch to common tests

* Added beast count and reload

* Removed extra console log
 2018-03-02 15:30:11 -06:00
Keith Holliday 7cff331800 Removed uri for client side oauth (#10058) 
* Removed uri for client side oauth

* Fixed lint
 2018-03-02 14:07:15 -07:00
Keith Holliday e7bc505b88 Modal popup fixes (#10080) 
* Added validation for modal stack

* Lint fixes
 2018-03-02 12:43:22 -07:00
SabreCat cf7fc8d578 Merge branch 'develop' into release 2018-03-01 23:23:57 +00:00
SabreCat b39a5be2d1 chore(sprites): compile 2018-03-01 23:23:36 +00:00
Keith Holliday 2959f0afab Removed modify inventory because the Content is causing Garbage Collection issues (#10075) 2018-03-01 08:24:46 -07:00
Keith Holliday dee81ee6c9 Reversed order to put newest on top (#10059) 2018-02-28 08:17:54 -07:00