krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,997 Commits 64 Branches 1,226 Tags
ee93c8bec5bbd5b51a2307e9c08258beafb6d172
Commit Graph

11322 Commits

Author SHA1 Message Date
SabreCat
f7026b2478 Merge branch 'release' into sabrecat/invite-notif 2023-03-13 14:13:06 -05:00
negue
e39b3bdd35 open the modal by click override 2023-03-11 00:40:05 +01:00
SabreCat
a210ab57b0 WIP(external-link): hacky attempt number one 2023-03-10 13:33:51 -06:00
CuriousMagpie
76fa6ec1b8 updates to snumberIncrement, buyModal, and sellModal 2023-03-09 15:54:26 -05:00
CuriousMagpie
3f3e0e2ae8 modal essentially complete but for scripts 2023-03-08 15:17:15 -05:00
CuriousMagpie
65f12ac9ea adding console log messages 2023-03-08 12:55:58 -05:00
CuriousMagpie
d0941810a7 trying to make a modal 2023-03-08 12:52:22 -05:00
CuriousMagpie
b77deb28b4 initial commit 2023-03-08 12:01:50 -05:00
SabreCat
458aee9a3a Merge branch 'release' into develop 2023-03-07 11:48:14 -06:00
Natalie L
57f86bac70 feat(content): March backgrounds and Enchanted Armoire items (#14524) 
* feat(content): March backgrounds and Enchanted Armoire

* fix(backgrounds): trivial syntax consistency

* fix(gear): missing verbiage

* fix(gear): correct usage of <%= attrs %>

* fix(backgrounds): broken string tokens

* fix(backgrounds): more broken tokens

---------

Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2023-03-06 16:57:56 -06:00
Natalie L
f2fe83a469 feature(upgrade): copy Pause Damage button to Settings page (#14532) 
* feature(upgrade): copying Pause Damage button to Settings page

* Removing duplicate string 'cause I can't search effectively. 😅
 2023-03-06 16:16:23 -06:00
SabreCat
3354ca048c fix(analytics): record missing group ID info 
also update subproject while I'm here
 2023-03-06 15:36:17 -06:00
SabreCat
99c46602c4 fix(fooling): correct special pet mapping 2023-03-06 09:47:53 -06:00
SabreCat
ee585c0ff3 feat(event): April Fools 2023 2023-03-03 14:32:56 -06:00
CuriousMagpie
1ac4466c24 trying to make more components for the buy/sell modals 2023-03-02 14:33:27 -05:00
Phillip Thelen
0754c0ff05 correctly set limit 2023-03-02 18:04:02 +01:00
CuriousMagpie
03f0061c85 Merge branch 'develop' into increment-component 2023-03-01 15:46:04 -05:00
SabreCat
16ae182f34 Merge branch 'release' into develop 2023-02-28 15:37:35 -06:00
Phillip Thelen
6887fd70c0 try something 2023-02-28 16:17:52 +01:00
SabreCat
8cf5a380da fix(strings): more silly 2023-02-27 16:17:09 -06:00
Phillip Thelen
def24142ca remove wrong test 2023-02-27 13:30:44 +01:00
Phillip Thelen
c29049146d prevent sub accidentally also being applied to other account 2023-02-27 12:06:27 +01:00
SabreCat
45107fe48f Merge branch 'sabrecat/transactions-404' into release 2023-02-24 16:32:35 -06:00
SabreCat
80f517f1ad feat(content): subscriber items March 2023 
Also fixes Vue templating in one paragraph of the Community Guidelines.
 2023-02-24 16:31:50 -06:00
Phillip Thelen
57fb7ca6f2 fix 2023-02-24 11:25:53 +01:00
Phillip Thelen
be18476292 correctly set perkMonthCount 2023-02-23 13:20:47 +01:00
SabreCat
b6e9d0c9c0 Merge branch 'sabrecat/transactions-404' into develop 2023-02-22 15:20:16 -06:00
SabreCat
442d9ca9cd fix(permissions): route away from purchase history for non-support 2023-02-22 15:15:03 -06:00
Phillip Thelen
3f56b7fa3f fix offset calculation 2023-02-17 15:42:31 +01:00
SabreCat
14f9debfdb fix(css): remove yet more blue-10 overrides 2023-02-16 14:34:24 -06:00
SabreCat
4a1011f1af fix(hyperlinks): remove some blue overrides 2023-02-16 12:57:35 -06:00
Phillip Thelen
d69de2948b fix import 2023-02-16 09:58:09 +01:00
Phillip Thelen
c5f5da1d32 Merge remote-tracking branch 'origin/develop' into apple_sub_fix 2023-02-16 09:38:14 +01:00
Phillip Thelen
e338fb8ce7 Merge branch 'apple_sub_fix' of https://github.com/HabitRPG/habitica into apple_sub_fix 2023-02-16 09:37:36 +01:00
Phillip Thelen
2d5dcae406 fix tests 2023-02-16 09:37:00 +01:00
SabreCat
9ec1917e6d feat(invites): provide link to inviting user in party notif 
Also changes basic links sitewide to purple-300
 2023-02-15 16:54:46 -06:00
CuriousMagpie
c349de6908 finish up sellModal and questModal (also Time Travelers) 2023-02-15 12:54:26 -05:00
Phillip Thelen
3203b09b7a reset perkMonthCount when subscription ends 2023-02-15 10:05:18 +01:00
CuriousMagpie
fd7f3a646e add functionality and styling to sellModal and questModal 2023-02-14 17:22:05 -05:00
CuriousMagpie
7244c1bebc Merge branch 'develop' into increment-component 2023-02-14 15:30:18 -05:00
gwenexner
2ea023299c fixed typo (#14417) 
In   "weaponSpecialWinter2023RogueNotes", changed "Incrases" to "Increases"
 2023-02-13 16:33:10 -06:00
dependabot[bot]
ce1ce47d18 build(deps): bump dompurify from 2.4.1 to 2.4.3 in /website/client (#14443) 
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.4.1 to 2.4.3.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/2.4.1...2.4.3)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-13 16:27:33 -06:00
dependabot[bot]
7f65079cfe build(deps): bump ua-parser-js from 0.7.31 to 0.7.33 in /website/client (#14463) 
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.31 to 0.7.33.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Changelog](https://github.com/faisalman/ua-parser-js/blob/master/changelog.md)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.31...0.7.33)

---
updated-dependencies:
- dependency-name: ua-parser-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-13 16:26:11 -06:00
dependabot[bot]
04f54d5e03 build(deps): bump hellojs from 1.19.5 to 1.20.0 in /website/client (#14479) 
Bumps [hellojs](https://github.com/MrSwitch/hello.js) from 1.19.5 to 1.20.0.
- [Release notes](https://github.com/MrSwitch/hello.js/releases)
- [Changelog](https://github.com/MrSwitch/hello.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MrSwitch/hello.js/compare/v1.19.5...v1.20.0)

---
updated-dependencies:
- dependency-name: hellojs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-13 16:03:23 -06:00
dependabot[bot]
a549668522 build(deps): bump validator from 13.7.0 to 13.9.0 in /website/client (#14492) 
Bumps [validator](https://github.com/validatorjs/validator.js) from 13.7.0 to 13.9.0.
- [Release notes](https://github.com/validatorjs/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/validatorjs/validator.js/compare/13.7.0...13.9.0)

---
updated-dependencies:
- dependency-name: validator
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-13 15:40:52 -06:00
dependabot[bot]
02e0e45da6 build(deps): bump @sideway/formula in /website/client (#14495) 
Bumps [@sideway/formula](https://github.com/sideway/formula) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/sideway/formula/releases)
- [Commits](https://github.com/sideway/formula/compare/v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: "@sideway/formula"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-13 15:40:31 -06:00
dependabot[bot]
b3d83431e6 build(deps): bump stopword from 2.0.5 to 2.0.7 in /website/client (#14504) 
Bumps [stopword](https://github.com/fergiemcdowall/stopword) from 2.0.5 to 2.0.7.
- [Release notes](https://github.com/fergiemcdowall/stopword/releases)
- [Commits](https://github.com/fergiemcdowall/stopword/commits/v.2.0.7)

---
updated-dependencies:
- dependency-name: stopword
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-13 15:38:02 -06:00
SabreCat
6b95f648c4 Merge remote-tracking branch 'CuriousMagpie/footer-link-updates' into release 2023-02-13 11:28:14 -06:00
SabreCat
f9db4b9b5b fix(event): correct logic for various Valentine's items 2023-02-13 11:25:02 -06:00
Phillip Thelen
6ee2e3a379 Merge remote-tracking branch 'origin/develop' into apple_sub_fix 2023-02-13 17:38:14 +01:00