krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 23:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,445 Commits 64 Branches 1,226 Tags
201b4551a3d29f50d5ec9e98e965141e2ce82f91
Commit Graph

1213 Commits

Author SHA1 Message Date
Sabe Jones
36f6860e79 Pet Hatching Item Overbuy Warning (#11313) 
* fix(shops): warn if user is purchasing too many pet-hatching items

* fix(shops): handle undefined potion count
 2019-09-10 11:22:14 -04:00
Matteo Pagliazzi
73d1acd8ec fix conflict 2019-09-09 17:15:45 +02:00
Matteo Pagliazzi
6e806669f5 Merge pull request #11324 from rjbernaldo/prevent-checklist-events-on-skill-use 
This change prevents checklists from being toggled when casting skills or spells.
 2019-09-09 15:50:03 +02:00
Matteo Pagliazzi
7edbe5b763 fix: decrease image height so footer is clickable (#11327) 
* fix: decrease image height so footer is clickable

* fix: use kraken to reduce image size
 2019-09-09 15:47:47 +02:00
Aleksey
659c7e7249 Fix: Edit/deleting tasks in a challenge appears possible for people who are not admin/the creator (#11349) 
* Fix: introduce new prop showOptions for task component

- Pull showOptions propr from challenge container to task itself to restrict editing for non leader of challenge users

* Fix: for group plan edit/delete tasks
 2019-09-09 15:47:30 +02:00
Aleksey
7219aa963b Fix: unauthorized sorting of group tasks (#11348) 
- Check if column is belongs to user dashboard before choosing which endpoint use to move task
 2019-09-09 15:46:38 +02:00
Scens
9a49a05eac Fix clickable area on customize options while editing avatar. (#11351) 2019-09-09 15:46:24 +02:00
Matteo Pagliazzi
ebe3736207 fix(task-modal): removno conno console error when modal closed 2019-09-09 15:11:17 +02:00
cheng-shiqi
0ee29e2fa3 Enable challenges to be closed by "End Challenge" button fix#11339 (#11342) 
* fix the dropdown list empty problem in close-challenge-modal

* fix the memberSearchDropdown not accepting input problem

* prevent submit event in dropdown input reloading the page
 2019-09-04 16:30:43 -04:00
Matteo Pagliazzi
39aa785b32 Merge branch 'release' into develop 2019-09-02 14:38:22 +02:00
Matteo Pagliazzi
b76f871288 fix #11340 2019-09-02 14:35:56 +02:00
negue
6d76dfe15f hide "clear completed todos" while no entries are listed (#11321) 
* hide "clear completed todos" while no entries are listed

* move column background (negative margin)
 2019-09-01 14:50:48 +02:00
Matteo Pagliazzi
923bc9b284 fix #11336, categories not selectable when creating a challenge 2019-08-30 13:26:05 -05:00
Matteo Pagliazzi
c38e97875f fix #11336, categories not selectable when creating a challenge 2019-08-30 19:05:33 +02:00
Sabe Jones
fc841d0ad4 Hourglass Quest (#11325) 
* feat(content): Hourglass Quest

* fix(hourglasses): NaN from undefined

* fix(quests): sanity check for negative scrolls

* fix(hourglasses): don't show quantity selection for binary items

* fix(route): validate number, use body not params

* test(timetrav): add quest tests
 2019-08-29 15:22:12 -04:00
Sabe Jones
8b9c7da5dc Merge branch 'release' into develop 2019-08-27 16:00:52 -05:00
Sabe Jones
3bcd82f6fe feat(content): Mystery Items 2019-08-27 16:00:02 -05:00
Sebastiaan Nijland
85c2c37693 fix: decrease image height so footer is clickable 2019-08-23 14:31:26 +02:00
Rj Bernaldo
8aa13369a6 Add proper fix according to description 2019-08-22 13:06:43 +10:00
Rj Bernaldo
7e90c5e8a7 Prevent checklists from being toggled when casting spells. 
This change closes #11028
 2019-08-22 10:18:27 +10:00
Matteo Pagliazzi
5a2350a034 fix(task-modal): reorganize form to fix saving (#11323) 2019-08-21 19:16:47 +02:00
Sabe Jones
38f17f0b6a Merge branch 'release' into develop 2019-08-20 11:23:19 -05:00
Sabe Jones
ccde367a06 chore(news): Kickstarter announcement 2019-08-20 10:30:31 -05:00
Preston Skupinski
8b5129cd4f Make usernames clickable in Hall of Heroes Fixes #11014 (#11281) 
* Add userLink (user-link) import to heroes component

* Use the userLink component to make user names clickable in the hall of heroes

This fixes #11014
 2019-08-18 17:28:48 +02:00
Sabe Jones
2c8614ea5c fix(quests): add missing display of pet item unlocks 
Also rewords some awkward text in said unlocks
 2019-08-15 16:29:58 -05:00
Sabe Jones
47f3cad984 fix(quests): remove erroneous gray text 
fixes #11117
 2019-08-15 16:06:42 -05:00
Dominick Triola
f0e6703546 Add audio theme demo button (#11252) 2019-08-15 11:04:19 -04:00
LanceWengLin
aa114ccc73 Change 404 page contact link to Bug Guild (#11285) 2019-08-15 11:03:46 -04:00
Sabe Jones
4de8e9a3fd chore(news): Bailey 
Also adds target:_blank to some Tavern links
 2019-08-15 09:47:52 -05:00
Sabe Jones
07ae4134f3 Squashed commit of the following: 
commit 0db0a69f0fa00d831b7d90340e045097e8d92343
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Tue Jul 16 10:01:49 2019 -0500

    fix(groups): return 0, not empty, when skipping downscore on Dailies
    fixes #11231

commit 1bf5bc714f660345f37bcc4e3587143341521c65
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Tue Jul 16 09:48:28 2019 -0500

    fix(groups): correct task creation button

commit 90908211200bc4a3eb204178df5c812ffcd09f37
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Tue Jul 16 09:46:04 2019 -0500

    fix(groups): clear approval status at cron for Habits and Dailies

commit 57e8dd0252c3ea45dd6fa1a7670ee197f32e76e5
Merge: d31b0a2d0 c9a56e8f3
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Tue Jul 16 09:33:27 2019 -0500

    Merge branch 'develop' into sabrecat/group-tasks

commit d31b0a2d0e3b7a46235696e9b05fa734ac29a2e5
Merge: f2185a91b 043696c22
Author: SabreCat <sabrecat@gmail.com>
Date:   Mon Jun 24 14:58:26 2019 +0000

    Merge branch 'develop' into sabrecat/group-tasks

commit f2185a91bde554c7eb22cd6bdfc1ef9227f1e765
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Tue Jun 18 10:10:10 2019 -0500

    fix(groups): divide task delta by number of assigned users

commit af0cde52f22129312d0102ecc5571f59aa2e396e
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Tue Jun 18 10:06:01 2019 -0500

    fix(groups): remove chat spam

commit c1c810967a9e34155948a9164862125517372268
Merge: bf4f3fb08 f987585cf
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Tue Jun 18 08:15:28 2019 -0500

    Merge branch 'develop' into sabrecat/group-tasks

commit bf4f3fb08491b4c4e1dbfaa58a2a6510c3cb78aa
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu May 23 11:29:01 2019 -0500

    fix(test): expect new task class from store

commit ae0379c80519523f68d4d606e1cc4bed8e9e49ec
Merge: ce5096e11 664cf5a47
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu May 23 11:25:15 2019 -0500

    Merge branch 'develop' into sabrecat/group-tasks

commit ce5096e116558419e4a73e8b23a58c78a1f2ab9b
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu May 23 11:02:01 2019 -0500

    feat(group-plans): clarify non-interactive controls on task board

commit ff3cec9530e30d51c43171d6f97d3888ff200352
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Tue May 21 11:10:50 2019 -0500

    feat(group-plans): score shared task when user scores it
 2019-08-02 15:49:41 -05:00
Sabe Jones
90e89791f3 chore(event): end Summer Splash 2019-08-01 18:08:43 -05:00
Alys
c80de38572 add shadow-muting chat hiding feature (automatic flagging of public posts from shadow-muted players) - fixes 10851 (#11239) 
* move existing tests for chatRevoked users to 'mute user' describe block

* give consistent names to chatRevoked tests and use const not let

* improve methods for restoring chat permissions to test users

* add tests for shadow-muting and define constants for flag-related numbers

* update user profile URLs and reverse private/public 'if' statements

* implement shadow muting in the API and schemas

* add interface for mods to turn shadow muting on/off for a user

- checkbox in the Hall
- icon in the user's profile

* mark chat posts as being shadow muted (marking is visible to mods only)

* convert Admin Tools in profile from icons to text; make crown icon a toggle

* move logic for displaying flag count to a computed property

* prevent chat notifications for shadow-muted posts
 2019-07-30 19:09:42 +02:00
Matteo Pagliazzi
dc15328e13 fix(group plans): create btn class 2019-07-30 19:05:37 +02:00
negue
74d3c9366a fix inbox: remove old map-method (#11269) 2019-07-16 22:50:12 +02:00
negue
c9a56e8f3e Performance/inbox paging (#11258) 
* merge all changes to one commit of PR #11157 / #11226

* rename the new paged messages route

* rename event, move map-method to the Inbox schema, fix lint

* move `mapMessage`-call to `getUserInbox`

* revert schema.method back to a normal one
 2019-07-15 11:25:22 +02:00
Jack Cogdill
e091072367 Enable keyboard shortcuts for autocomplete @username selection in chat (#11235) 
* Chat autocomplete mouse hover styling

* Enable keyboard shortcuts for chat autocomplete

- Tab/down to select next
- Shift-tab/up to select previous
- Enter to make selection
- Escape to cancel
 2019-07-14 17:55:50 +02:00
Alys
7b1032e898 improve appearance and wording in Hall's Reward User form for admins (#11248) 
- adds Username
- changes placeholders to labels (subheadings) for consistency
- lists common and rare contributor titles to assist with keeping them consistent
- converts translated text to hard-coded English for consistency and to minimise work for translators
- removes unused locale strings
 2019-07-12 17:14:34 +02:00
Dominick Triola
631efd1adc Ask for confirmation when buying quests (#11251) 
* Trigger confirmation modal for quests that have a currency of gems

https://github.com/HabitRPG/habitica/issues/11244

* Trigger purchase confirmation dialog for gold-purchasable quests

* Refactor to use confirmPurchase method
 2019-07-12 17:09:49 +02:00
kogelnikp
2e227909a4 Fixed removing tasks from challenges (#11254) 
* fixed missing event handler for removing tasks in challenges

* renamed test

* simplified challengeDetail test
 2019-07-12 17:03:30 +02:00
Scens
8f9f95fd84 Removed unnecessary "Equipment" sub-heading in Market. (#11237) 
* Removed unnecessary sub-heading.

* Corrected the filter in the Market.
Now viewOptions keeps additional info about text to be in filter.
Categories array is no longer passed to filter component.
 2019-07-12 16:23:14 +02:00
Frederik Ar. Mikkelsen
25b443a7c6 Fix task dropdown menu overflow (#11230) 2019-07-12 16:06:03 +02:00
reisturm
6724413ce9 Fixed styling bug on stats profile page. (#11187) 
* Fixed styling bug on stats profile page.

* 24 px popover-content-titleonly
 2019-07-12 16:02:33 +02:00
Tressley Cahill
babceaff42 Update "Add Task" button to diamond (#11214) 
* Update $purple-400

* Add .diamond-btn

Swapped .rounded-btn for .diamond-btn
 2019-07-12 15:36:14 +02:00
Sabe Jones
fcfc44fd13 feat(content): Watery Potions 
also fixes some sprite issues
 2019-06-20 15:13:19 -05:00
Sabe Jones
b3e81177ec fix(content): correct Mage weapon price, smarten Rebirth banner 2019-06-18 23:29:00 -05:00
Sabe Jones
8e9500fed2 feat(event): Summer Splash 2019 2019-06-18 19:20:14 -05:00
Sabe Jones
377f849f9e Merge branch 'free-rebirth-limit' into release 2019-06-18 16:02:12 -05:00
Sabe Jones
8bbada540d feat(rebirth): add banner to buy modal 2019-06-18 15:24:50 -05:00
Sabe Jones
5a5f1d6895 Revert "Performance: Inbox Paging / loading (#11157)" 
This reverts commit 5630e8cc8e.
 2019-06-14 12:34:38 +00:00
Sabe Jones
0325ae9636 fix(avatar): style correction 2019-06-13 13:10:06 -05:00