2d489e870f
Merge branch 'release' into develop
2018-06-27 18:34:06 +00:00
5471af74fa
chore(i18n): update locales
2018-06-27 18:33:34 +00:00
6eb484605a
fix(messages): clarify opt-in/out wording and leave label static ( #10470 )
2018-06-27 19:13:13 +02:00
d038d9f9bb
chore(i18n): update locales
2018-06-26 20:35:38 +00:00
3ee8072a6c
feat(content): Summer Splash Potions and Seafoam
2018-06-26 20:19:16 +00:00
7f847d322f
chore(i18n): update locales
2018-06-25 19:37:38 +00:00
88188e56d9
Merge branch 'release' into develop
2018-06-22 19:03:33 +00:00
22a8d5e94c
chore(i18n): update locales
2018-06-22 19:02:25 +00:00
c1bd7f5dc5
Habits: store one history entry per day ( #10442 )
...
* initial refactor
* add scoredUp and scoredDown values for habits history entries, one entry per habit per day
* fix lint and add initial migration
* update old test
* remove scoreNotes
* dry run for migration
* migration fixes
* update migration and remove old test
* fix
* add challenges migration (read only)
* fix challenges migration
* handle custom day start
* update tasks in migration
* scoring: support cds
* add new test
2018-06-21 21:25:19 +02:00
52e53aa466
chore(i18n): update locales
2018-06-21 18:49:55 +00:00
6a2a844e04
feat(content): Mystery Items June 2018
2018-06-21 18:44:18 +00:00
627d4330c8
chore(i18n): update locales
2018-06-19 23:31:53 +00:00
00cb50a781
feat(event): Summer Splash 2018
...
Also gets rid of those Fairy Potions, FOR REAL this time, and fixes a couple of minor Market layout issues
2018-06-19 23:24:40 +00:00
2c2ca4a9c8
chore(i18n): update locales
2018-06-14 17:06:55 +00:00
08ab4d5900
chore(i18n): update locales
2018-06-12 20:24:24 +00:00
39b81aa685
feat(content): Aquatic Amigos quest bundle
2018-06-12 20:19:14 +00:00
b58032d5fb
chore(i18n): update locales
2018-06-07 22:27:49 +00:00
ccd0bec28c
chore(i18n): update locales
2018-06-05 19:16:56 +00:00
30cd738635
feat(content): Armoire and BGs 2018-06
2018-06-05 19:10:54 +00:00
36595e0138
chore(i18n): update locales
2018-06-01 19:40:42 +00:00
2b8415fad0
chore(news): Bailey announcements
...
Also removes Cuddle Buddies Bundle from featured items
2018-06-01 18:55:43 +00:00
202db599ae
chore(i18n): update locales
2018-05-31 20:03:06 +00:00
0e63f68ed6
Merge branch 'release' into develop
2018-05-29 22:24:41 +00:00
c4867f1e8e
chore(i18n): update locales
2018-05-29 22:16:30 +00:00
a0e2d6a05e
feat(customize): earrings and headbands
2018-05-29 21:02:42 +00:00
ac90a40be5
Api quest restrictions - no purchase/start without fulfilling eligibility requirements ( #10387 )
...
* removing duplicate translation key
* fixing typos
* extracting quest prerequisite check. adding check for previous quest completion, if required
* fixing (undoing) static change, adding tests
* more typos
* correcting test failures
* honoring quest prerequisites in quest invite API call. updating format of il8n string replacement arg
* no longer using apiError, use translate method instead (msg key was not defined)
* adding @apiError to docblock as requested in issue
* removing checks on quest invite method. small window of opportunity/low risk
2018-05-27 16:41:56 +02:00
aec23d32f3
Merge branch 'PM_opt-in-out' of https://github.com/pengfluf/habitica into pengfluf-PM_opt-in-out
2018-05-25 12:44:44 +02:00
e0140f67be
chore(i18n): update locales
2018-05-24 18:33:40 +00:00
1e2fc14db9
Merge branch 'develop' into release
2018-05-24 18:26:21 +00:00
42d7744d12
feat(content): May Subscriber Items
2018-05-24 18:25:36 +00:00
01ce7712e3
change "Advanced Options" to "Advanced Settings" in Settings screen to match change in wording on tasks page
2018-05-21 20:20:06 +10:00
724e1240a3
fix(content): update potion end date
2018-05-18 18:40:04 +00:00
daa4994382
Change reward popunder ( #10358 )
...
* making add multiple tip reflect the task type
* removing duplicated key
2018-05-18 17:11:04 +02:00
12034161b7
Remove Ethereal Surge notification ( #10368 )
2018-05-18 17:09:00 +02:00
3d39718048
Purchase API Refactoring: Spells [Gold] ( #10305 )
...
* convert buySpell operation
* remove purchaseWithSpell - change purchaseType 'special' to 'spells' - fix lint
* fix tests
* rollback 'spells' to 'special'
2018-05-18 17:00:39 +02:00
6b5f46c5e1
chore(i18n): update locales
2018-05-17 20:57:57 +00:00
4a55d36831
Merge branch 'release' into develop
2018-05-15 21:11:54 +00:00
d114b858fd
chore(i18n): update locales
2018-05-15 21:06:11 +00:00
ae9db7aee3
feat(content): enable Fairy Potions
2018-05-15 21:00:49 +00:00
2c3d268a63
Merge branch 'develop' of github.com:HabitRPG/habitica into develop
2018-05-13 16:30:47 +02:00
388492e1e7
fix conflicts and remove extra dependency
2018-05-13 16:30:17 +02:00
8cd695c397
locales/groups: Don't wrap task text in code block ( #10349 )
...
So far if a task contained Markdown, a system message like this would
have been posted to the group chat:
foo has claimed "Some [link](http://example.org/ )"
Also, if the Markdown contained backticked code fragments, the whole
text would be displayed in red except the code part.
The reason for this is because the system message is already in Markdown
and a backticked task text would result in the following Markdown:
`foo has claimed "Foo `bar`"`
Here there are two code blocks, one with `foo has claimed "Foo ` and
another which only has `"`.
This is fixed by simply changing the userIsClamingTask translation
string to not wrap the task text inside a code block, as per @Alys
suggestion.
Signed-off-by: aszlig <aszlig@nix.build >
2018-05-13 16:14:17 +02:00
9129e22433
fix(event): disable seasonal potions
2018-05-11 20:12:41 +00:00
8db99be017
chore(i18n): update locales
2018-05-10 18:51:37 +00:00
a8655d923a
Fix level up webhook ( #10347 )
...
* use user._tmp for level up webhook
* use post save hook to send webhook
2018-05-09 19:04:29 +02:00
bbbd1f9f73
Merge branch 'release' into develop
2018-05-08 18:41:13 +00:00
8df2b1e8c2
chore(i18n): update locales
2018-05-08 18:38:43 +00:00
24cceb1c91
feat(content): Cuddle Bundle
2018-05-08 18:28:33 +00:00
69a782a1db
Party header sort WIP ( #10330 )
...
* WIP(groups): improved sorting WIP
* WIP(groups): split sort option and direction
* WIP(party): header sort cont'd
* feat(party): header sorting
2018-05-07 16:19:00 -05:00
54a4bba228
Removed update stats notification ( #10339 )
...
* Removed update stats notification
* Removed level up hook
2018-05-07 12:45:36 -05:00
Sabe Jones