 Sabe Jones
|
ca2f2ba9ce
|
Merge branch 'develop' into release
|
2019-02-14 13:39:52 -06:00 |
|
|
Sabe Jones
|
165ca8737b
|
chore(news): Blog Bailey
|
2019-02-14 13:25:40 -06:00 |
|
|
Sabe Jones
|
b711c1672b
|
fix(lint): use curly apostrophe and single quotes
|
2019-02-12 13:48:53 -06:00 |
|
|
Sabe Jones
|
d675e80555
|
fix(lint): use curly apostrophe and single quotes
|
2019-02-12 13:48:13 -06:00 |
|
|
Sabe Jones
|
2c1ca7629d
|
Merge branch 'release' into develop
|
2019-02-12 07:35:56 -06:00 |
|
|
Sabe Jones
|
b5d5367363
|
4.84.0
v4.84.0
|
2019-02-12 07:20:20 -06:00 |
|
|
Sabe Jones
|
13af1fa88d
|
chore(sprites): compile
|
2019-02-12 07:20:11 -06:00 |
|
|
Sabe Jones
|
b721155f01
|
feat(event): Valentine's 2019 and Magic Hatching Potions
|
2019-02-12 07:19:58 -06:00 |
|
|
Sabe Jones
|
b8aacc03e3
|
Upgrade to NPM Amplitude package (#10952)
* chore(analytics): upgrade to NPM Amplitude pkg
* chore(build): run package-lock on Linux
* refactor(analytics): use preferred Amplitude v3+ syntax
* refactor(analytics): more v3+ syntax
* chore(npm): attempt updating package lock
|
2019-02-10 19:34:52 +01:00 |
|
|
negue
|
844d3fbf37
|
refresh gear overview (#10971)
* refresh bought seasonal gear
* just "subscribe" to the _v change instead of returning the value
* subscribe in vue instead of lib
|
2019-02-10 19:32:14 +01:00 |
|
|
Sabe Jones
|
4d1b239231
|
Track specific items dropped by Armoire (#10977)
* feat(analytics): track specific items dropped by Armoire
* fix(lint): remove console log
* fix(analytics): address test failures
* fix(analytics): add missed if block
* fix(analytics): seriously tho actually fix
|
2019-02-10 19:30:49 +01:00 |
|
|
negue
|
b9aaccdf13
|
refactored the highlightUsers-method, only matches mentions and not emails (#10982)
|
2019-02-10 19:27:22 +01:00 |
|
|
Matteo Pagliazzi
|
0155491a68
|
Upgrade vue (#10983)
* deps: update
* fix tests
|
2019-02-10 19:03:35 +01:00 |
|
|
Sabe Jones
|
ef412c7185
|
Merge branch 'release' into develop
|
2019-02-08 06:08:05 -06:00 |
|
|
Sabe Jones
|
c15b55808e
|
4.83.2
v4.83.2
|
2019-02-08 06:07:41 -06:00 |
|
|
Sabe Jones
|
28ddebf4a9
|
fix(sprites): load new spritesheet in Vue
|
2019-02-08 06:06:58 -06:00 |
|
|
Sabe Jones
|
5f0919d1c5
|
4.83.1
v4.83.1
|
2019-02-07 16:32:02 -06:00 |
|
|
Matteo Pagliazzi
|
2eab8b2c8b
|
Merge branch 'GiacomoLaw-10954-wikiafix' into develop
|
2019-02-07 18:20:33 +01:00 |
|
|
Matteo Pagliazzi
|
b35bd18282
|
Merge branch '10954-wikiafix' of https://github.com/GiacomoLaw/habitica into GiacomoLaw-10954-wikiafix
|
2019-02-07 18:20:05 +01:00 |
|
|
Chester Sng
|
732a46d2db
|
Add else block so items with warning notes will not display sell options (#10965)
|
2019-02-07 18:02:38 +01:00 |
|
|
Justin Horner
|
4f1d4aa73a
|
Move hr to be contained within hasClass div (#10964)
|
2019-02-07 17:58:46 +01:00 |
|
|
negue
|
92f2079b76
|
fix emails in chat (#10912)
* additional regex checks to ignore the <tag attribute="content">
* extract highlightUsers method - add test
* refactor highlight regex
* refactor the regex without `lookbehind`
* remove unneeded regex
|
2019-02-07 17:55:36 +01:00 |
|
|
Phillip Thelen
|
63f5773172
|
Implement URL handling for profile modal (#10844)
* Implement URL handling for profile modal
* Fix issue where paths would break when using back button
* move tiers import to index
|
2019-02-07 17:25:30 +01:00 |
|
|
Sabe Jones
|
93290ec6d5
|
Merge branch 'release' into develop
|
2019-02-05 15:44:40 -06:00 |
|
|
Sabe Jones
|
be6c2a002f
|
4.83.0
|
2019-02-05 15:42:57 -06:00 |
|
|
Sabe Jones
|
e6bd67a53a
|
chore(sprites): compile
|
2019-02-05 15:42:46 -06:00 |
|
|
Sabe Jones
|
6ab3bac96c
|
feat(content): Armoire and BGs
|
2019-02-05 15:42:33 -06:00 |
|
|
Sabe Jones
|
ee97da1112
|
Merge branch 'release' into develop
|
2019-02-05 17:49:22 +00:00 |
|
|
Sabe Jones
|
3c948beb84
|
chore(i18n): update locales
|
2019-02-05 17:43:50 +00:00 |
|
|
Sabe Jones
|
f590c485dc
|
Merge branch 'release' into develop
|
2019-02-04 16:52:53 -06:00 |
|
|
Sabe Jones
|
64063544e6
|
4.82.3
v4.82.3
|
2019-02-04 16:52:28 -06:00 |
|
|
Sabe Jones
|
0910f65fc0
|
chore(news): Bailey
|
2019-02-04 16:52:17 -06:00 |
|
|
Sabe Jones
|
fdc0e0f5fe
|
Merge branch 'release' into develop
|
2019-02-02 13:11:25 -06:00 |
|
|
Sabe Jones
|
d225a7ca54
|
4.82.2
v4.82.2
|
2019-02-02 13:11:05 -06:00 |
|
|
Sabe Jones
|
5b7c4bf03f
|
fix(event): end Cake
|
2019-02-02 13:10:56 -06:00 |
|
|
Sabe Jones
|
dddd8269b6
|
Merge branch 'release' into develop
|
2019-02-02 13:04:35 -06:00 |
|
|
Sabe Jones
|
fd724a36ff
|
4.82.1
v4.82.1
|
2019-02-02 13:03:13 -06:00 |
|
|
Sabe Jones
|
5b329db357
|
chore(event): end Winter Wonderland
|
2019-02-02 13:03:04 -06:00 |
|
|
Sabe Jones
|
c1cad5c0a9
|
Merge branch 'release' into develop
|
2019-01-31 17:12:21 -06:00 |
|
|
Sabe Jones
|
94b5ed9dab
|
4.82.0
v4.82.0
|
2019-01-31 17:11:53 -06:00 |
|
|
Sabe Jones
|
0ac976e8c1
|
chore(sprites): compile
|
2019-01-31 17:11:44 -06:00 |
|
|
Sabe Jones
|
b1f42dcac9
|
feat(content): Habitica Birthday 2019
|
2019-01-31 17:10:56 -06:00 |
|
|
Sabe Jones
|
ed8bd84257
|
Merge branch 'release' into develop
|
2019-01-30 09:14:11 -06:00 |
|
|
Sabe Jones
|
4e8c08ba9b
|
4.81.1
v4.81.1
|
2019-01-30 09:13:39 -06:00 |
|
|
Sabe Jones
|
e294ed836d
|
fix(subscription): correct mystery set
|
2019-01-30 09:13:17 -06:00 |
|
|
Sabe Jones
|
c86da9783b
|
Merge branch 'release' into develop
|
2019-01-30 09:06:42 -06:00 |
|
|
Sabe Jones
|
64a608e7e7
|
4.81.0
v4.81.0
|
2019-01-28 16:10:57 -06:00 |
|
|
Sabe Jones
|
767f844cea
|
chore(sprites): compile
|
2019-01-28 16:10:38 -06:00 |
|
|
Sabe Jones
|
00a686dcf6
|
feat(content): subscriber items Jan 2019
|
2019-01-28 16:10:22 -06:00 |
|
|
Giacomo Lawrance
|
08c8f26b80
|
Merge branch 'develop' into 10954-wikiafix
|
2019-01-26 18:03:50 +00:00 |
|