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
a23926f34f
Merge branch 'develop' into party-chat-translations
2018-05-19 10:21:54 +09: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
8470f16f4f
allow subscribers to buy their final monthly gem ( #10331 )
2018-05-07 15:20:28 +02:00
2588befceb
Merge branch 'develop' into party-chat-translations
...
# Conflicts:
# website/server/models/group.js
2018-05-06 00:46:47 +09:00
4fa2ef045d
10256 - The placeholder and the message row are fixed ( #10307 )
2018-05-04 16:04:06 -05:00
c26696a9eb
moving developer-only strings to api/common messages ( #10258 )
...
* move translatable string to apiMessages
* use apiMessages instead of res.t for groupIdRequired / keepOrRemove
* move pageMustBeNumber to apiMessages
* change apimessages
* move missingKeyParam to apiMessages
* move more strings to apiMessages
* fix lint
* revert lodash imports to fix tests
* fix webhook test
* fix test
* rollback key change of `keepOrRemove`
* remove unneeded `req.language` param
* extract more messages from i18n
* add missing `missingTypeParam` message
* Split api- and commonMessages
* fix test
* fix sanity
* merge messages to an object, rename commonMessage to errorMessage
* apiMessages -> apiError, commonMessages -> errorMessage, extract messages to separate objects
* fix test
* module.exports
2018-05-04 16:00:19 -05:00
f226b5da07
Revert #10324 and #10323 ( #10329 )
2018-05-04 20:57:18 +02:00
8e04d6e284
Removed update stats notification ( #10324 )
2018-05-04 08:17:22 -05:00
3793e92b80
chore(i18n): update locales
2018-05-03 17:41:59 +00:00
84b16f28c2
remove statement about deletion feedback being anonymous
2018-05-03 21:31:06 +10:00
9c702505a9
Locales Changing, PM Disabled Caption Added
2018-05-02 19:08:43 +03:00
27c73e028a
Merge branch 'release' into develop
2018-05-01 21:32:29 +00:00
451e08ce1c
chore(i18n): update locales
2018-05-01 21:31:34 +00:00
30a717148e
chore(event): end Spring Fling
2018-05-01 21:25:45 +00:00
bcf9670dbe
feat(content): Armoire and backgrounds May 2018
2018-05-01 20:55:16 +00:00
9d755c5d5f
Merge branch 'fix-german-translations' into fix-challenge-layout
2018-05-01 20:17:29 +02:00
eaa00598d0
Improvements to Challenge Layout ( #9619 )
2018-05-01 19:47:04 +02:00
85136675e9
Fixed group sidebar.
2018-05-01 16:13:16 +02:00
f93822b0b3
Several hard coded strings fixed.
2018-05-01 14:34:58 +02:00
5faf00d489
replace loading screen tip about buff arrow
...
The buff arrow no longer appears on your avatar.
2018-05-01 18:32:44 +10:00
006159cc9c
Merge branch 'release' into develop
2018-04-30 20:46:03 +00:00
d6b5d275da
chore(i18n): update locales
2018-04-30 20:45:27 +00:00
e60177f14a
Sending messages is allowed; PM related texts moved
2018-04-30 00:58:08 +03:00
Sabe Jones