2f072d8e96
Merge branch 'StealthMod' of https://github.com/Verabird/habitrpg into rebalancing-2015-03-2
...
Conflicts:
common/script/index.coffee
2015-03-14 18:54:18 +10:00
627b07ef86
Rebalance stealth diminishing returns again
2015-03-13 16:45:00 -04:00
fbeb83e836
Rescale stealth to strengthen
2015-03-13 11:38:34 -04:00
180d87e9c7
removed commented out old stealth code
2015-03-13 10:53:29 -04:00
4a0f165af8
Modify daily checklists to stay checked at cron if inactive and Stealth to only apply to active dailys
2015-03-13 10:53:29 -04:00
f58e7ef931
compile habitrpg-shared.js
2015-03-13 20:58:43 +10:00
6cf815ba22
Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
...
Conflicts:
common/dist/scripts/habitrpg-shared.js
2015-03-13 20:23:28 +10:00
881f70997b
Merge pull request #4815 from Alys/debug-options-2015-03-07
...
new local install Debug options in footer: +2 Missed days, +MP
2015-03-13 14:06:12 +10:00
cd8c0956f8
add debug button to footer for increasing mana points (MP)
2015-03-13 13:53:21 +10:00
8b04773b2e
feat(auth): update manual_password_reset so can pull creds from
...
config.json, and email from CLI. Much easier when updating en-masse
2015-03-12 13:47:37 -06:00
6ed0ff289f
feat(auth): add manual_password_reset migration
2015-03-12 12:22:33 -06:00
8bc5ed83cb
chore(i18n): update locales
2015-03-12 16:26:45 +01:00
1687d9aeda
feat(auth): 404 on "can't find email"
2015-03-11 18:12:30 -06:00
9ac0ef0202
explain when survey participants will get their badge
2015-03-12 07:34:01 +10:00
676562cfad
Revert "fix(emoji): move back to main jsemoji repo, fixes #4265 "
...
This reverts commit 89b1242e53
2015-03-10 22:05:24 -05:00
de67f44e1f
Merge pull request #4713 from HabitRPG/lefnire/interactive-tour
...
Interactive Tour
2015-03-10 19:23:01 -06:00
c86257b585
Merge pull request #4834 from SabreCat/surveys
...
Survey achievement update
2015-03-10 19:12:06 -05:00
3a9e2a5123
fix(surveys): Visibility tweaks
2015-03-10 19:08:10 -05:00
53df85e01b
fix(surveys): Fix malformed Angular
2015-03-10 18:47:21 -05:00
9cfa27f089
feat(surveys): Survey achievement
...
Updates the "Helped Habit Grow" achievement to be stackable. Also includes miscellaneous Bailey announcements for 3/10.
2015-03-10 18:39:00 -05:00
3bd0b57efa
add semi-colon at end of line; remove apostrophe from comment
2015-03-11 09:29:44 +10:00
63c57cce5d
Merge pull request #4785 from AAorris/develop
...
Allow for client notifications to user settings
2015-03-11 08:20:51 +10:00
962bb65608
tmp(interactive-tour): temporarily remove Hide button
2015-03-10 15:40:19 -06:00
16e996c971
fix(interactive-tour): "Buy the Training Sword"
2015-03-10 15:40:19 -06:00
bbbec78bff
tmp(interactive-tour): hide "Show Tour" temporarily #4726
2015-03-10 15:40:19 -06:00
63a6af6e0a
fix(interactive-tour): small updates per
...
https://github.com/HabitRPG/habitrpg/issues/4726#issuecomment-77643235
2015-03-10 15:40:19 -06:00
aee1a3cd6f
fix(interactive-tour): just set everyone to "off" for tour on initial migration
2015-03-10 15:40:19 -06:00
98f50374c9
fix(interactive-tour): "hide" on the left, nav on the right
2015-03-10 15:40:19 -06:00
a7232b5abe
fix(interactive-tour): cleanup steps when navigating chapters, don't use tour.restart()
2015-03-10 15:40:19 -06:00
232224c497
fix(interactive-tour): don't automatically show guide when on mobile devices
2015-03-10 15:40:19 -06:00
62739346c7
tmp(interactive-tour): add "ok" to each step, see #4726
2015-03-10 15:40:18 -06:00
d84549e239
feat(interactive-tour): disable ads till lvl 2
2015-03-10 15:40:18 -06:00
812493fec5
feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides
2015-03-10 15:40:18 -06:00
c5240da81f
perf(robots): add robots.txt, see #4746
2015-03-10 14:31:00 -06:00
0c63f6cb7d
fix(auth): upgrade facebook to Graph API 2, fixes #4832
2015-03-10 14:11:28 -06:00
3830a39804
Removed invite button on challenges page. Closes #4796
2015-03-09 16:39:20 -05:00
9c43a7da22
chore(grunt compile:sprites)
2015-03-09 16:34:55 -05:00
60a62a282e
fix(sprite) Added correctly sized image for iron knight. Closes #4824
2015-03-09 16:33:31 -05:00
9e6c268a97
chore(grunt compile:sprites)
2015-03-09 13:42:35 -05:00
e918aa158d
feat(mystery items) March subscriber sprites added
2015-03-09 13:42:21 -05:00
934a33ee5b
Merge pull request #4671 from crookedneighbor/fix-tests
...
Fix some api tests (WIP)
2015-03-08 20:58:11 -05:00
1b53aeaee8
increase timeout when usubscribing from email
2015-03-08 16:25:19 +01:00
1f8ccf1f65
Merge pull request #4818 from lejeunerenard/fix-tests
...
Fixed MongoDB service and added Karma tests to Travis-CI
2015-03-07 16:50:50 -06:00
5ab2cb0908
Use PhantomJS and run karma in Travis-CI
2015-03-07 16:37:35 -06:00
b507a0fe3a
Add mongodb as a service for Travis-CI builds
2015-03-07 16:26:13 -06:00
6f8133d760
Corrected indentation of purchase test
2015-03-07 16:23:56 -06:00
35f98993c4
Skipping groups test in api for now, revisit later
2015-03-07 16:09:56 -06:00
6ab024619b
Merge pull request #4817 from lejeunerenard/fix-tests
...
WIP
2015-03-07 16:01:22 -06:00
4bc4e836e4
Make karma tests pass.
...
This pends a lot of tests that are failing due to translations not being loaded in the environment, as well as some issues with the page reload in groupServicesSpec.
We removed the module declarations for habitrpg in each spec since that
has been moved to specHelper.
2015-03-07 15:48:23 -06:00
044930b7d3
add +2 Missed Days to debug menu in footer, adjust addMissedDay function and all calls to it
2015-03-07 18:39:43 +10:00
Alice Harris