c6dd2a0d10
feat(modals): Hatch Pet modal
...
Complete except for the planned addition of a heart sprite over the pet.
2015-10-15 16:34:53 -04:00
8af975755f
Merge pull request #6049 from nivl4/develop
...
Updated vagrant provisioning script to update npm to the latest version
2015-10-16 06:12:43 +10:00
215ca0371c
fix(signup): correct email checks
2015-10-15 19:52:21 +02:00
69fdff615a
use lowercase only emails - register phase
2015-10-15 18:26:23 +02:00
485dc68fe4
Updated vagrant provisioning script to update npm to the latest version as the older version (1.4.28) was causing the following error during npm install.
...
npm ERR! EEXIST, open '/home/vagrant/.npm/9fb4c098-adable-stream-1-0-33-package-tgz.lock'
File exists: /home/vagrant/.npm/9fb4c098-adable-stream-1-0-33-package-tgz.lock
Move it away, and try again.
npm ERR! System Linux 3.2.0-23-generic
npm ERR! command "/usr/bin/node" "/usr/bin/npm" "install" "--no-bin-links"
npm ERR! cwd /vagrant
npm ERR! node -v v0.10.37
npm ERR! npm -v 1.4.28
npm ERR! path /home/vagrant/.npm/9fb4c098-adable-stream-1-0-33-package-tgz.lock
npm ERR! code EEXIST
npm ERR! errno 47
npm ERR! not ok code 0
2015-10-15 21:51:36 +08:00
380265731f
feat(world-boss): Exhaust Ian's text
2015-10-14 21:02:59 -04:00
4835de55a8
Adjust iap test
2015-10-15 00:09:24 +02:00
319c294354
Fix global variable leak
2015-10-15 00:08:25 +02:00
e88030e15f
Merge pull request #6039 from HabitRPG/sabrecat/halloween-mount
...
Jack-O'-Lantern mounts
2015-10-14 16:46:55 -05:00
b0922f04b8
Handle new possible iOS in-app-purchases
2015-10-14 23:21:19 +02:00
59b2c1662e
fix(news): Revised Bailey
2015-10-14 12:54:33 -04:00
f9a3884c79
Merge pull request #6044 from roryokane/patch-1
...
Fix capitalization of “GitHub” on Contact Us page
2015-10-14 18:11:16 +10:00
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
5bfea172ee
fix(notifications): Don't double-modal
...
Corrects behavior of the Notifications controller so that it skips showing the generic levelup modal if it's going to display the quest scroll version.
2015-10-13 17:01:07 -04:00
6505824cb6
feat(modals): Levelup modal
...
Introduces a new modal that displays whenever the user levels up.
2015-10-13 16:32:07 -04:00
825b316ba8
fix(analytics): Cap progressUp
...
Previously, users could cron with enormous quest progress values, and this would be logged to the cron event in Analytics. However, for the purposes of damaging world bosses, quest progress is capped at 900. Given that progressUp is primarily used to predict world boss damage, this commit now caps progressUp in analytics at 900 as well.
2015-10-13 14:27:16 -04:00
5eacba54b8
feat(modals): Slim scroll notif
...
Establishes a new template for modal notifications, to be used across the app including a number of new notifications.
2015-10-13 14:20:51 -04:00
30de99b700
adjust world bosses FAQ answer
2015-10-13 06:49:07 +10:00
dcf17b5505
feat(event): Jack-O'-Lantern mounts
2015-10-12 14:49:12 -04:00
caa7d4a220
store iOS tutorial steps
2015-10-12 16:34:07 +02:00
02133600ce
Add ios question to content
2015-10-12 07:40:31 -05:00
ece3e0d0aa
add FAQ item for World Bosses
2015-10-12 21:26:59 +10:00
a4b1c6cf64
Merge pull request #6033 from vIiRuS/patch-4
...
Add iOS smart app banner
2015-10-10 14:30:08 +02:00
87012f6a7c
Add iOS start app banner
2015-10-10 13:52:53 +02:00
f00bbd9652
feat(modals): Small style scroll award
2015-10-09 15:39:36 -04:00
b775b8f399
feat(modals): Simplified scroll drop
...
Conflicts:
website/views/shared/modals/quests.jade
2015-10-09 14:07:54 -04:00
20415da586
Merge pull request #6018 from dcecile/develop
...
Issue #2606 - Verify/fix indices during sortTask
2015-10-09 21:30:14 +10:00
2cc4d65d78
Allow disabling logger in non-prod for testing
2015-10-08 22:42:09 -05:00
4044b0cb64
fix(world-boss): Update mechanics explanation
2015-10-08 18:48:13 -04:00
60cc428b81
chore(i18n): update locales
2015-10-08 17:42:10 -05:00
d873848f81
Commit missing file
2015-10-08 17:37:10 -05:00
0ccf07a4e0
Compile sprites
2015-10-08 17:32:34 -05:00
ccd77090f4
Fix css template for sprites
2015-10-08 17:31:32 -05:00
58801f5025
fix(world-boss): Don't repeat explanation
2015-10-08 13:17:49 -04:00
291a135fe1
Merge pull request #6023 from HabitRPG/sabrecat/world-boss
...
Fall 2015 World Boss
2015-10-08 11:15:00 -05:00
1d4536fc47
fix(sprites): Remove errant blob
2015-10-08 10:59:44 -05:00
c45736fc6f
Merge pull request #6024 from crookedneighbor/fix_world_dmg
...
Fix world dmg
2015-10-08 10:19:38 -05:00
36d471ddff
Correct module exports
2015-10-08 08:42:42 -05:00
5e10b8f4c9
Correct assinging of tavernQuest object when boss damage is calculated
2015-10-08 08:32:40 -05:00
9e88d17a78
Adjust tavern export to send over only quest object
2015-10-08 07:45:25 -05:00
40ea62344b
Add bold to item output when selling item
2015-10-07 20:11:07 -07:00
a1328bc837
Add bolding to item name
2015-10-07 20:10:27 -07:00
7c16197ec9
Refactor market to display eggs properly, wip
2015-10-07 19:19:56 -07:00
04550a3346
Add btn-sell to increase width of market button to container
2015-10-07 19:18:54 -07:00
921cb3ca5d
Add displayXForGold keys, refactor sell egg for gold
2015-10-07 19:17:13 -07:00
aba3908170
chore(gulp): Compile sprites
2015-10-07 15:15:21 -04:00
dadf1d5b0b
Add divider between sell button and text for market
2015-10-07 11:52:47 -07:00
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
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
d27fb9dba2
WIP(world-boss): Rage and rewards
...
Also finishes out written story content.
2015-10-06 15:59:16 -04:00
Sabe Jones