Commit graph

1525 commits

Author SHA1 Message Date
Sabe Jones
bcc522f08d feat(sharing): Add Tumblr button 2015-10-22 13:52:26 -04:00
Sabe Jones
d08a3efbcd fix(news): Bogus trailing slash 2015-10-22 12:04:43 -05:00
Sabe Jones
9fb671f068 fix(social): Better share image 2015-10-21 16:25:03 -05:00
Sabe Jones
a2c0e02283 fix(social): Correct OG tag errors 2015-10-21 16:37:33 -04:00
Sabe Jones
d32f6f23cc feat(sharing): Improved front page FB share 2015-10-21 15:59:17 -04:00
Matteo Pagliazzi
e75d3547c5 force emails to lowercase and use a lowercase version of username to check for duplicates 2015-10-21 13:14:18 +02:00
Matteo Pagliazzi
c7f8426bce preparation for code for lowercase emails and lowercase version of username to check for duplicates 2015-10-21 11:01:06 +02:00
Sabe Jones
d4146d69e2 Merge pull request #6072 from HabitRPG/sabrecat/pets-201510
Pet Quest for October 2015
2015-10-20 18:12:19 -05:00
Sabe Jones
5fbd6814b0 fix(pets): Realign frog sprites
Also adds a note about the To-Do sorting fix to the Bailey announcement
2015-10-20 18:55:57 -04:00
Sabe Jones
d0a34fc0ad feat(quests): 2015-10 Pet
Also adds Exhaust Strike-specific text to the remaining affected NPCs.
2015-10-20 12:32:45 -04:00
Sabe Jones
0a6d9fa23a WIP(pets): Frog quest 2015-10-19 23:12:24 -04:00
Blade Barringer
703caeadff Merge pull request #6038 from vIiRuS/patch-5
store iOS tutorial steps
2015-10-19 17:49:13 -05:00
Blade Barringer
a0753d31b2 Merge pull request #6046 from vIiRuS/newIAPs
Handle new possible iOS in-app-purchases
2015-10-19 17:49:01 -05:00
Matteo Pagliazzi
ad6be153f4 Revert "use lowercase only emails - register phase"
This reverts commit 69fdff615a.
2015-10-19 19:42:25 +02:00
Matteo Pagliazzi
7a2d2fd3dc Revert 215ca0371c 2015-10-19 19:42:13 +02:00
Blade Barringer
9ad1dbd8ce Adjust mystic hourglass string to take in interpolation 2015-10-19 08:10:37 -05:00
Blade Barringer
d9de32f2dc Add todo to investigate magic numbers 2015-10-19 08:04:47 -05:00
Blade Barringer
1a2510e4da Adjsut string to take in interpolation 2015-10-19 08:03:27 -05:00
Blade Barringer
931d688637 Use Content service 2015-10-19 08:03:14 -05:00
Blade Barringer
f03be07595 Add extra line breaks 2015-10-19 08:02:35 -05:00
Phillip Thelen
2fde3c771f remove empty line 2015-10-19 12:50:30 +02:00
Phillip Thelen
3a42711427 nicer style for default gem value 2015-10-19 12:48:50 +02:00
Phillip Thelen
7a7d038602 Split up tutorial parts 2015-10-18 17:29:06 +02:00
ksami
65dc274e49 Make text in options/settings translatable 2015-10-16 20:48:12 +08:00
Matteo Pagliazzi
215ca0371c fix(signup): correct email checks 2015-10-15 19:52:21 +02:00
Matteo Pagliazzi
69fdff615a use lowercase only emails - register phase 2015-10-15 18:26:23 +02:00
Sabe Jones
380265731f feat(world-boss): Exhaust Ian's text 2015-10-14 21:02:59 -04:00
Phillip Thelen
4835de55a8 Adjust iap test 2015-10-15 00:09:24 +02:00
Phillip Thelen
319c294354 Fix global variable leak 2015-10-15 00:08:25 +02:00
Sabe Jones
e88030e15f Merge pull request #6039 from HabitRPG/sabrecat/halloween-mount
Jack-O'-Lantern mounts
2015-10-14 16:46:55 -05:00
Phillip Thelen
b0922f04b8 Handle new possible iOS in-app-purchases 2015-10-14 23:21:19 +02:00
Sabe Jones
59b2c1662e fix(news): Revised Bailey 2015-10-14 12:54:33 -04:00
Rory O’Kane
4a23f40415 Fix capitalization of “GitHub” on Contact Us page
The live page is at https://habitica.com/static/contact.
2015-10-14 03:55:46 -04:00
Sabe Jones
dcf17b5505 feat(event): Jack-O'-Lantern mounts 2015-10-12 14:49:12 -04:00
Phillip Thelen
caa7d4a220 store iOS tutorial steps 2015-10-12 16:34:07 +02:00
Alys
ece3e0d0aa add FAQ item for World Bosses 2015-10-12 21:26:59 +10:00
Phillip Thelen
87012f6a7c Add iOS start app banner 2015-10-10 13:52:53 +02:00
Alys
20415da586 Merge pull request #6018 from dcecile/develop
Issue #2606 - Verify/fix indices during sortTask
2015-10-09 21:30:14 +10:00
Blade Barringer
2cc4d65d78 Allow disabling logger in non-prod for testing 2015-10-08 22:42:09 -05:00
Sabe Jones
291a135fe1 Merge pull request #6023 from HabitRPG/sabrecat/world-boss
Fall 2015 World Boss
2015-10-08 11:15:00 -05:00
Blade Barringer
36d471ddff Correct module exports 2015-10-08 08:42:42 -05:00
Blade Barringer
5e10b8f4c9 Correct assinging of tavernQuest object when boss damage is calculated 2015-10-08 08:32:40 -05:00
Blade Barringer
9e88d17a78 Adjust tavern export to send over only quest object 2015-10-08 07:45:25 -05:00
Dan Cecile
22284bbc24 Issue #2606 - Verify/fix indices during sortTask
Because the 'sortTask' operation uses a 'from' index and a 'to'
index as parameters, the server needs to check if these indices
are valid before performing the client's request. If the task ID
doesn't match the task at the 'from' index, then it's clear that
the client was looking at a preened list of todos (everything except
more-than-3-days-old-non-quest completed tasks). In that case, try
to recalculate the indices before continuing.
2015-10-06 21:24:34 -04:00
Sabe Jones
51355f7eea fix(quest-eggs): Short-circuit canBuy
Also corrects the FAQ link in the site footer to use the new static FAQ page instead of the wiki.
2015-10-06 16:56:17 -04:00
Sabe Jones
d27fb9dba2 WIP(world-boss): Rage and rewards
Also finishes out written story content.
2015-10-06 15:59:16 -04:00
Sabe Jones
3ca836a81c fix(world-boss): Pass test
Also uncomment the line used to hide display of the boss in the Tavern, because we won't be doing a dry run of that style this time around.
2015-10-05 17:18:44 -04:00
Sabe Jones
f6abcc0ddf WIP(world-boss): Initial stats outlay
Also quest reward sprites, groundwork for world damage, and partial content build.
2015-10-05 16:59:19 -04:00
Sabe Jones
0d7a57d176 Merge branch 'develop' into sabrecat/world-boss
Conflicts:
	common/dist/sprites/habitrpg-shared.css
2015-10-05 14:57:59 -04:00
Sabe Jones
dd53383ec6 Merge pull request #6002 from HabitRPG/sabrecat/backgrounds-201510
October 2015 backgrounds
2015-10-05 11:29:44 -05:00