2c3d268a63
Merge branch 'develop' of github.com:HabitRPG/habitica into develop
2018-05-13 16:30:47 +02:00
d4a80a8561
Merge branch 'marvinrabe-fix-challenge-layout' into develop
2018-05-13 16:30:28 +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
355f0fedfb
disabling checking off a subtask if not assigned to a user ( #10357 )
2018-05-13 16:12:26 +02:00
38d78de4b3
New method added to displaying locked quest popover message in shop ( #10346 )
...
isBuyingDependentOnPrevious () method checks if item.key of quest is in a list of quests whose unlock condition is not dependent on the completition of previous quest.
2018-05-13 16:07:20 +02:00
6c64a1cd8c
Beard and mustache facial hairs now can be bought as a full set for 5 gems ( #10338 )
...
* Purchasing All Facial Hairs Fixed
* Notifications z-index fixed
* Notifications z-index fixed x2
* Z-indexes fixed, facial hairs buying corrected
* isPurchaseAllNeeded refactored
* isPurchaseAllNeeded is more generic now
* Linting Passed
2018-05-13 16:04:43 +02:00
128ec5a1b1
Update pull request template to mention issue number instead of url
2018-05-13 15:42:44 +02:00
d4d668f640
Prevent accidental submission of Tavern/Guild posts after pasting ( #10226 )
...
* Temporarily disable ctrl-enter to send Guild messages after paste
Disable Ctrl-Enter after pasting, because some users are experiencing issues with accidentally sending their messages after pasting.
* Code style fixes for "Temporarily disable ctrl-enter to send Guild messages after paste"
* Fix issues with variable location
* Fix variables for accidental chat submission features
Moving vatiables for the chat submit timeout to their own variable so they won't be overwritten
* Fix code formatting issues with accidental chat submission code
* Remove leading space from variables to fix lint issues
2018-05-11 15:18:41 -05:00
41ccd58f8e
Fixed tavern chat button. ( #10342 )
2018-05-11 15:15:50 -05:00
a33299a341
4.42.3
2018-05-11 20:12:54 +00:00
9129e22433
fix(event): disable seasonal potions
2018-05-11 20:12:41 +00:00
86d1bdaff1
4.42.2
2018-05-11 01:38:33 +00:00
206ed1f155
fix(tags): downgrade Bootstrap to restore tag checkboxes
2018-05-11 01:34:31 +00:00
eb66e9ec2e
4.42.1
2018-05-10 18:52:17 +00:00
8db99be017
chore(i18n): update locales
2018-05-10 18:51:37 +00:00
c62386e2e5
chore(news): Bailey
2018-05-10 18:42:44 +00:00
042ac6ac73
Fix notifications in user pre save hook ( #10348 )
2018-05-09 19:19:08 +02: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
8fee5a9ba0
4.42.0
2018-05-08 18:40:48 +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
21eac3cc94
Fixed stat allocation issues ( #10344 )
2018-05-08 08:54:50 -05:00
e9ce968f88
4.41.8
2018-05-07 16:34:54 -05:00
8c283fdbe0
Removed hook updates ( #10341 )
...
* Removed hook updates
* Fixed lint error
2018-05-07 16:30:34 -05: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
ccaf629228
4.41.7
2018-05-07 12:50:13 -05:00
147f2bb28e
4.41.6
2018-05-07 12:48:48 -05:00
54a4bba228
Removed update stats notification ( #10339 )
...
* Removed update stats notification
* Removed level up hook
2018-05-07 12:45:36 -05:00
6ee21dcfa9
Added category tags tests.
2018-05-07 18:29:05 +02:00
68353fb874
Added sidebar section test.
2018-05-07 18:21:32 +02:00
68526c07ae
Added missing comma.
2018-05-07 16:43:07 +02:00
5f319ca4f6
My Challenges should include all Owned Challenges ( #9286 )
2018-05-07 16:23:49 +02:00
0d84643961
Joined and Owned Challenges should still appear in Discover, but annotated with status ( #9956 )
2018-05-07 16:04:40 +02:00
8470f16f4f
allow subscribers to buy their final monthly gem ( #10331 )
2018-05-07 15:20:28 +02:00
1896a8fab0
Challenge task numbers get created from computed array.
2018-05-07 14:18:05 +02:00
891b5566a9
Created reusable category tags component.
2018-05-07 13:56:54 +02:00
c83499545c
Added Tavern case
2018-05-07 13:35:53 +02:00
4c837acf88
Use computed attribute for boss health bar width.
2018-05-07 13:30:33 +02:00
11b223a81e
Challenge item shadow and border radius matches guild item style.
2018-05-07 13:25:52 +02:00
17001743e1
Changed last prop to :last-of-type
2018-05-07 13:24:48 +02:00
ac451bdb9b
Removed spell queue ( #10337 )
2018-05-06 17:53:49 -05:00
6af50c9f2f
Payment refactor ( #10325 )
...
* Rarranged payment index functions
* Moved gem function
* Increased buy gems test coverage
* Reduced length of functions. Reduced cognitive complexity
2018-05-06 15:12:00 -05:00
5231cb03a8
Fixed columns when translation is too long. ( #10315 )
2018-05-04 16:10:02 -05:00
f8739b6f37
Fixed learn more in user dropdown. ( #10314 )
2018-05-04 16:09:38 -05:00
e31f62a818
Add responsive margins to pets and mounts. ( #10311 )
...
* Add responsive margins to pets and mounts.
* Move all margins to margin-right to make left edges flush.
2018-05-04 16:06:58 -05:00
d5d06c1d2d
Header stuck naming fixed ( #10309 )
2018-05-04 16:05:38 -05:00
4fa2ef045d
10256 - The placeholder and the message row are fixed ( #10307 )
2018-05-04 16:04:06 -05:00
570a8bf0d5
do not load inbox in tasks routes ( #10302 )
2018-05-04 16:00:57 -05:00
Matteo Pagliazzi