Blade Barringer
02e9775ba7
Set up new api test structure
2015-10-17 12:37:17 -05:00
Blade Barringer
59e2b92dae
Kill mocha test if not set to watch
2015-10-17 12:23:04 -05:00
Blade Barringer
9a14368170
Correct test commands
2015-10-17 12:22:04 -05:00
Blade Barringer
56baf59195
Add global module to mocha requires
2015-10-17 11:55:05 -05:00
Blade Barringer
aa9be8cb1a
Update superagent
2015-10-17 11:46:57 -05:00
Blade Barringer
a61632fa92
Set up api tests
2015-10-16 21:56:46 -05:00
Blade Barringer
b26c8c3e74
Add api test task
2015-10-16 21:43:43 -05:00
Blade Barringer
115af819a0
Create task to set up a test server
2015-10-16 15:00:33 -05:00
Blade Barringer
0992f560e0
Merge branch 'develop' into new_api_test_infrastructure
2015-10-16 14:54:03 -05:00
Alys
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
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
nivl4
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
Sabe Jones
380265731f
feat(world-boss): Exhaust Ian's text
2015-10-14 21:02:59 -04: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
Sabe Jones
59b2c1662e
fix(news): Revised Bailey
2015-10-14 12:54:33 -04:00
Alys
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
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
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
Alys
30de99b700
adjust world bosses FAQ answer
2015-10-13 06:49:07 +10:00
Sabe Jones
dcf17b5505
feat(event): Jack-O'-Lantern mounts
2015-10-12 14:49:12 -04:00
Blade Barringer
02133600ce
Add ios question to content
2015-10-12 07:40:31 -05:00
Alys
ece3e0d0aa
add FAQ item for World Bosses
2015-10-12 21:26:59 +10:00
Matteo Pagliazzi
a4b1c6cf64
Merge pull request #6033 from vIiRuS/patch-4
...
Add iOS smart app banner
2015-10-10 14:30:08 +02: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
4044b0cb64
fix(world-boss): Update mechanics explanation
2015-10-08 18:48:13 -04:00
Blade Barringer
60cc428b81
chore(i18n): update locales
2015-10-08 17:42:10 -05:00
Blade Barringer
d873848f81
Commit missing file
2015-10-08 17:37:10 -05:00
Blade Barringer
0ccf07a4e0
Compile sprites
2015-10-08 17:32:34 -05:00
Blade Barringer
ccd77090f4
Fix css template for sprites
2015-10-08 17:31:32 -05:00
Sabe Jones
58801f5025
fix(world-boss): Don't repeat explanation
2015-10-08 13:17:49 -04: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
Sabe Jones
1d4536fc47
fix(sprites): Remove errant blob
2015-10-08 10:59:44 -05:00
Sabe Jones
c45736fc6f
Merge pull request #6024 from crookedneighbor/fix_world_dmg
...
Fix world dmg
2015-10-08 10:19:38 -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
Sabe Jones
aba3908170
chore(gulp): Compile sprites
2015-10-07 15:15:21 -04: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
Alys
f035dfd8b9
fix "Advanced Options in tasks start collapsed" when "Open new tasks in edit mode" is on - fixes https://github.com/HabitRPG/habitrpg/issues/5981
2015-10-05 19:37:53 +10:00
Blade Barringer
2683b2b0a0
Use var to declare mongoose
2015-10-03 20:55:28 -05:00
Blade Barringer
62b15c4f48
Simplify background tests
2015-10-03 11:54:58 -05:00
