36cc229dd2
Merge branch 'develop' into release
2019-05-30 15:13:57 -05:00
ef0c11c2bd
chore(sprites): compile
2019-05-30 15:13:35 -05:00
3a8312832c
feat(content): new freebie glasses
...
Fixes #11171
2019-05-30 15:13:23 -05:00
df17753bb6
Merge branch 'release' into develop
2019-05-28 15:48:51 -05:00
cd67877ef3
chore(sprites): compile
2019-05-28 15:45:16 -05:00
251e1d45af
feat(content): May 2019 subscriber set
2019-05-28 15:45:04 -05:00
1a97d69edd
Merge pull request #10865 from ianoxley/navbar-a11y-alt-text
...
Add text alternatives for navbar items
2019-05-26 11:59:04 +02:00
7baa7427a0
Merge pull request #11178 from Alys/mute-ban-block-notification-messages
...
adjust error messages for muted and banned users, and system flagging error
2019-05-26 11:49:24 +02:00
270078a030
Merge pull request #11170 from HabitRPG/Yutsuten-party-chat-translations
...
Party Chat Translations (Continuation of #10019 )
2019-05-26 11:45:12 +02:00
bb2768071d
change "all caps" to "all capital letters" for clarity
...
I found this question in the Help guild:
'I'm deleting my account and aren't able to find the "cap" to type in
"delete" in order to finish deleting process. Any ideas were that
"cap" is?'
2019-05-26 16:43:42 +10:00
ec75de5a90
add swear words - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
2019-05-26 16:25:33 +10:00
b9b944ba29
replace similar messages about chat privileges removed with one generic one
2019-05-26 07:59:23 +10:00
fa9553b371
removed mention of Transifex and added link to new Weblate site
2019-05-25 19:57:29 +10:00
3a339a4a09
Merge branch 'release' into develop
2019-05-23 13:41:14 -05:00
8c005aa05a
fix(shops): remove outdated Featured Item
...
and Bailey
2019-05-23 13:40:06 -05:00
664cf5a47b
Merge branch 'release' into develop
2019-05-21 15:29:40 -05:00
01657f573d
feat(quests): create Hatching Potion category
2019-05-21 14:48:44 -05:00
95613dcfb8
Merge branch 'sabrecat/potion-quests' into release
2019-05-21 14:28:46 -05:00
bcf304984d
Task notes now disappear when they are deleted from the main task. Fix #11152 ( #11167 )
...
* Task notes now disappear when they are deleted from the main task.
* Html component changed back to Markdown. Markdown logic now accounts for if the value is an empty string.
* if-else statement to be sure that the markdown library doesn't create issues with empty strings.
2019-05-20 11:46:44 +02:00
08d84ba691
hides item count in quest sidebar section for non-participants ( #11183 )
2019-05-20 11:33:47 +02:00
344c20fd99
improve error notification shown when a player is blocked
...
This improves the wording in the error notification that a player
sees when they've been blocked.
It also also changes markdown links to plain text because raw
markdown was being shown in some locations (for example when you saw
the error messages on the command line while using an API command).
These changes have been discussed with and approved by beffymaroo
and the other mods.
2019-05-18 21:38:38 +10:00
f5c2c39f6a
adjust error messages for muted users and system flagging error
2019-05-18 17:12:24 +10:00
8498ab9fe2
chore(news): Bailey
2019-05-16 14:07:39 -05:00
bda3fb5f4d
if-else statement to be sure that the markdown library doesn't create issues with empty strings.
2019-05-15 08:10:44 -07:00
eff8db0afd
fix issue with language being undefined, refactoring auth middleware, new tests
2019-05-15 16:54:55 +02:00
8cce38ede1
Merge branch 'party-chat-translations' of https://github.com/Yutsuten/habitica into Yutsuten-party-chat-translations
2019-05-15 15:20:40 +02:00
ab0dae8df3
Translate messages only after serialization
2019-05-15 21:26:23 +09:00
0824af05b7
Remove unneeded parameter on method call
2019-05-15 19:45:42 +09:00
28bf024990
Move translateMessage to libs
2019-05-15 19:07:17 +09:00
8a30ac0607
Add translation support for quest cancel
2019-05-15 16:55:37 +09:00
0360326f41
Change translateSystemMessages to be a class method
2019-05-15 15:46:32 +09:00
f3f215abea
Fix typo on schema
2019-05-15 13:50:57 +09:00
feb98a5ac7
Html component changed back to Markdown. Markdown logic now accounts for if the value is an empty string.
2019-05-14 19:06:22 -07:00
95de11cf7a
Merge branch 'release' into develop
2019-05-14 16:35:29 -05:00
790614a9d4
chore(sprites): compile
2019-05-14 16:33:51 -05:00
977968df19
feat(content): Sunshine Potions
2019-05-14 16:33:42 -05:00
3df056105c
Remove markdown elements from PM ( #11150 )
...
* Remove markdown elements from PM
* Replacing limit number of characters to limit number of lines
* Add ellipsis
2019-05-14 22:14:10 +02:00
0eb7e10e7f
fix(sprites): rebuild including Wolf
2019-05-14 13:22:45 -05:00
0908fa2a48
change Load Tools icon that mods and staff use ( #11169 )
...
The crown icon makes it clearer to us that it's for the special
mod/staff tools. The pencil icon is too similar to normal
edit/compose icons and we were clicking it by mistake, with
accidental double-clicks resulting in users being briefly banned by
mistake since the ban icon is directly "under" the Load Tools icon.
I've checked with the other mods and they feel that the crown will
avoid that problem.
2019-05-14 14:04:28 +02:00
71904d106f
chore(sprites): compile
2019-05-13 11:02:19 -05:00
56040eebaf
feat(content): Magic Hatching Potion Quest
2019-05-13 11:02:07 -05:00
2094a4d4b8
Task notes now disappear when they are deleted from the main task.
2019-05-11 23:47:24 -07:00
2048f3ef76
fix(string): correct stat reference
2019-05-10 07:23:20 -05:00
5a473eb0e0
Merge branch 'develop' into release
2019-05-09 14:32:14 -05:00
e6fcdf62ef
fix(sprites): dojo resize fix
2019-05-09 14:31:28 -05:00
09e748bc92
feat(content): reenable Feathered Friends bundle
2019-05-09 14:27:22 -05:00
90532b0763
Merge branch 'develop' into Yutsuten/party-chat-translations
2019-05-08 15:13:53 -05:00
9151690f86
Better group plan and subscription cancellation ( #11132 )
...
* wip: better group plan cancellation
* add cancelation confirm modal
* abstract confirm modal for subs
* abstract canceled modal for subs
* working code
* add missing files
* fix text and margins
* fix(cancel modal): share css and add close icon
2019-05-08 21:37:02 +02:00
c125ac4d93
fix(client): avoid TypeError in store state
2019-05-08 12:18:42 -05:00
aa61c1fe06
Merge branch 'release' into develop
2019-05-07 15:57:44 -05:00
Sabe Jones