57f49d2a7d
feat(content): Armoire and BG strings
2016-08-30 21:09:04 +00:00
e69b733f90
3.35.0
2016-08-30 17:36:30 +00:00
c726fa78f5
chore(news): misc Bailey
2016-08-30 17:11:29 +00:00
2e050be111
fix(contact): s/leslie/admin/g ( #7945 )
2016-08-29 19:58:51 -05:00
e5f2a06491
Merge pull request #7941 from gambtho/develop
...
When blocking a user, make them rest at the inn - fixes #7935
2016-08-27 10:52:30 -05:00
6e5d2ad20a
Merge pull request #7943 from crookedneighbor/update_require-again
...
chore: Update require-again
2016-08-27 10:31:59 -05:00
af088d4b3a
Blocking a user makes them sleep Fixes #7935
...
Blocking a user will make the user rest at an inn, the user will
remain resting when unblocked
2016-08-27 11:17:45 -04:00
92bbafeb5d
chore: Update require-again
2016-08-27 09:57:13 -05:00
9981f450c0
clarify usage of API's block route and remove incorrect info about only admins using it
2016-08-27 06:04:51 -07:00
44abfeb013
Merge pull request #7934 from ujjwalgulecha/fix-health-potion-when-health-is-max
...
GP will not be deducted if health is max
2016-08-27 07:56:46 -05:00
03c14859d5
GP will not be deducted if health is max
2016-08-26 11:30:17 -07:00
320d8cac5f
replace "Tavern Talk" with "Tavern Chat" above Tavern's chat box - fixes https://github.com/HabitRPG/habitrpg/issues/6813
2016-08-26 07:57:16 -07:00
33377263d9
feat(api): Admins can unflag private group messages
2016-08-25 15:31:39 -05:00
7f50532e8b
Merge pull request #7930 from crookedneighbor/flag_improvements
...
Flag improvements
2016-08-24 22:28:26 -05:00
cf804be04e
chore(api): Update flag chat docs
2016-08-24 21:32:48 -05:00
65556c0444
feat: Allow admins to flag messages in private groups
2016-08-24 21:32:32 -05:00
88d26cd200
fix(news): credit TheHollidayInn
2016-08-24 15:15:43 -05:00
2308e14d3e
fix: allows leader of challenge to create new challenge tasks even when not a participant of the challenge. fixes #7918
...
closes #7924
2016-08-24 12:07:54 -05:00
5bcc2561ae
feat(client): Show battle with friends button with 3 members
...
fixes #6754
closes #6765
2016-08-24 08:45:39 -05:00
e957617386
3.34.1
2016-08-23 22:14:19 -05:00
c5ac5b4f2d
Merge pull request #7921 from HabitRPG/revert_task_cancel_pr
...
fix: Revert #7692
2016-08-23 22:00:03 -05:00
3d64f2b849
fix: Revert #7692
2016-08-23 21:40:33 -05:00
671e954cec
chore(i18n): update locales
2016-08-23 17:33:04 -05:00
f148c592f5
Merge pull request #7911 from crookedneighbor/fix_magic_pets_spacing
...
fix(client): Correct logic to show premium pets
2016-08-23 17:20:17 -05:00
53254beaaf
3.34.0
2016-08-23 20:48:36 +00:00
0e319200f1
chore(sprites): compile
2016-08-23 20:48:23 +00:00
6a04ed7392
fix(editing): send user on dblclick
2016-08-23 20:22:27 +00:00
71a759c551
feat(content): mystery items 201608 ( #7919 )
2016-08-23 14:49:22 -05:00
80f57d9a44
remove outdated Physical/Mental/Social/Other descriptions for task-based allocation
2016-08-22 21:01:34 -07:00
3a79ed6cd6
link to new wiki page describing all extensions in a neat table
...
This is for the "Other Extensions" link on the Settings > API page.
2016-08-22 09:16:18 -07:00
d691704db2
change Report a Bug link and text in website FAQ ( #7718 )
...
* change Report a Bug link in website FAQ
* add email address for reporting login problems
2016-08-20 21:33:39 -07:00
fca0188172
Merge branch 'task_edit_fix' into develop
2016-08-20 21:23:43 -05:00
67187c1b08
fix: show markdown compiled task text while editing
2016-08-20 09:21:52 -04:00
b3b7108bd6
Merge branch 'develop' into Hus274-7688
2016-08-20 08:31:22 -04:00
dd80a2e76e
make Export Data introduction more accurate (it exports more than Habits)
2016-08-19 21:07:07 -07:00
2fea2d9565
adjust message displayed on Done To-Dos tab to reflect API v3 changes
...
The 30 most recently completed To-Dos are now shown, regardless of how long ago they were completed.
2016-08-19 21:06:45 -07:00
a654369075
Update faq.json - description of mechanic outdated ( #7913 )
...
* Update faq.json line - description of mechanic outdated
Changed
<---Tap on a Pet, and then select \"Feed Pet\"!
--->Click on a type of food, and then select the pet you want to feed!
because clicking on the pet first does not work anymore, clicking on the pet first selects it for use.
As described by MeikeMertsch here: https://www.transifex.com/habitrpg/habitrpg/translate/#de/faqjson/60117132
* Update faq.json
2016-08-19 15:40:51 -07:00
a69ab954f5
fix(client): Correct logic to show premium pets
...
Fixes #7888
2016-08-19 08:41:27 -04:00
106bf52915
3.33.1
2016-08-18 20:28:09 +00:00
9f0d4fbd65
fix(auth): Facebook on MS Edge
2016-08-18 20:07:14 +00:00
3ac5617e57
chore(news): Bailey 20160818
2016-08-18 18:58:37 +00:00
f5224282d9
3.33.0
2016-08-18 17:58:49 +00:00
53a7f7ba5f
chore(sprites): compile
2016-08-18 17:51:51 +00:00
0c11d8fb6d
feat(content): Pets 201608 ( #7903 )
2016-08-18 12:40:29 -05:00
7ef2c34177
add route for QR codes ( #7902 )
...
* add route for QR codes
* check that passed ID is a UUID
* add test for qr code redirect
* fix qr code test
2016-08-18 19:37:14 +02:00
e68c75c802
chore(i18n): update locales
2016-08-17 10:24:04 -05:00
fd70efcb60
Merge pull request #7900 from crookedneighbor/analytics_fix
...
Analytics fix
2016-08-15 22:39:03 -05:00
408d988341
api: expose user's inbox.optOut for api/v3/members/:memberId #7798 ( #7893 )
...
* api: expose user's inbox.optOut for `api/v3/members/:memberId` #7798
* test: fixed chai exist vs exists typos
* _getMembersForItem: fixed typo in api docs
2016-08-15 22:21:14 -05:00
bd8b1b0ece
chore(tests): Rewrite analytics tests to remove dependency on nock
2016-08-15 22:20:39 -05:00
1a409848a8
allow flagging the post of a deleted user ( #7897 )
...
* Allowing the flagging of messages that were written by user accounts that have since been deleted
* replacing ternary operator with else if, else paradigm
* formatting fixes
* fixing message in tests
2016-08-15 22:14:52 -05:00
Sabe Jones