Commit Graph

1799 Commits

Author SHA1 Message Date
Matteo Pagliazzi
f55e4f65f9 Merge pull request #6483 from HabitRPG/new-history-preening
fixes for new history preening, allow only 1 history entry per day in…
2016-01-09 21:03:18 +01:00
Matteo Pagliazzi
b1a7e44722 fixes for new history preening, allow only 1 history entry per day in challenges tasks 2016-01-09 21:02:40 +01:00
Matteo Pagliazzi
be0fe3eb4f Merge pull request #6479 from HabitRPG/new-history-preening
New history preening
2016-01-09 20:12:33 +01:00
Sabe Jones
1b7f17cbd2 chore(news): Bailey 2016-01-08 2016-01-08 16:28:49 -05:00
Sabe Jones
eadf967c9f Merge pull request #6409 from pnrich/flag-text
add extra text to flagging confirmation dialog and to top of PM inbox -- Fix for issue #4648, parts 3 and 4
2016-01-08 14:05:22 -06:00
Matteo Pagliazzi
ae852f9a2e complete preening and enable for challenges too 2016-01-08 17:47:08 +01:00
Sabe Jones
adfa248dd0 feat(content): backgrounds and Armoire 2016-01 2016-01-06 15:11:20 -05:00
Sabe Jones
cb984d8d22 fix(event): remove NYE card 2016-01-04 18:27:52 -05:00
Sabe Jones
cc00602112 fix(event): remove magic potions 2016-01-04 11:56:34 -05:00
Blade Barringer
837c27ff4c Merge pull request #6428 from GeorgeSG/fix-paypal-special-chars
Encode special characters when sending to paypal
2016-01-03 19:40:39 -06:00
Blade Barringer
874f319d95 fix: Corrects logic where it was possible to customize avatar
with gem purchasable items without purchasing them.

Closes #6427
Closes #6448

lint(common): Add unnecessary quotes to make object look less weird
2016-01-03 10:41:44 -06:00
Alys
23aaf78167 revert change to Bailey about Party Hats now that the code behaviour has changed 2016-01-01 16:06:52 +10:00
Alys
6a7cd0900e adjust Bailey message about party hats to clarify that they're not available to players who join from now on, and that only one hat will appear for each player 2016-01-01 11:24:15 +10:00
Georgi Gardev
430bcd2652 Encode special characters when sending to paypal 2015-12-31 02:46:56 +02:00
Sabe Jones
02f4a84146 fix(news): Winter Flame not Penguin 2015-12-30 18:38:00 -05:00
Sabe Jones
6c3e8e2081 feat(event): more NYE 2015-12-30 16:58:57 -05:00
Blade Barringer
b3050e5a67 chore(dependency): Upgrade lodash from v2 to v3 2015-12-29 07:45:03 -06:00
Georgi Gardev
ea54ec607a Add confirmation popover for Release pets/mounts
Add tests for releasing pets and mounts

Refactor tests to use expect syntax from sinon-chai

tests(karma): Refine settings controller tests

refactor(client): Remove unecessary releaseX functions from $scope in settings ctrl
2015-12-28 21:37:38 -06:00
Georgi Gardev
f6f82cafc4 Add confirmation popover for Rebirth
Add confirmation popover for Fortify/Reroll

Add tests for reroll and rebirth
2015-12-28 21:37:23 -06:00
Paul Rich
c9fdff38f9 Fix for issue #4648, parts 3 and 4 2015-12-28 14:24:48 -05:00
Paul Rich
56a00efb19 Fix for Issue #3517 Display Current Page Name
Revision for Fix for issue #3517

lint: Remove extraneous white space in app.js file

fix: Correct attribute from pageTitle to title in $state interface
2015-12-28 07:53:51 -06:00
Blade Barringer
363ef5e091 fix: Remove stray {{ characters 2015-12-26 19:05:12 -06:00
Blade Barringer
7df3b333f6 feat: Refine clear local storage function 2015-12-26 19:00:45 -06:00
Blade Barringer
ef25956ba3 feat(views): Create generic message alert modal 2015-12-26 19:00:44 -06:00
darkmeep
1c261056fe clear local storage page added
changed submit bug to clear browser data

feat(views): Style clear local storage button
2015-12-26 19:00:42 -06:00
Sabe Jones
7d0efdeeda chore(news): Android announcement
Also adds a higher-quality version of the Winter Town background.
2015-12-23 14:43:16 -05:00
Sabe Jones
468198b9e2 feat(mystery): subscriber items 2015-12
Also enables the Snowball in the Seasonal Shop.
2015-12-22 16:16:30 -05:00
Sabe Jones
afe3c87357 fix(credits): Lady Snuffles 2015-12-18 20:09:26 -05:00
Sabe Jones
493ae6f26a feat(event): Winter Wonderland complete 2015-12-18 15:48:14 -05:00
Sabe Jones
6ed9133f70 WIP(event): Winter Wonderland 2015-16 partial 2015-12-15 17:15:02 -05:00
Sabe Jones
3cc2866c76 Merge pull request #6368 from HabitRPG/sabrecat/pets-201512
December Pet Quest
2015-12-15 11:55:08 -06:00
Nathan Maton
35a921bf43 feat(content): Make mystery set strings translatable
Squashed and cleaned up version of
https://github.com/HabitRPG/habitrpg/pull/6367
2015-12-15 08:47:13 -06:00
Sabe Jones
fe1de12494 feat(pets): December quest 2015-12-14 16:28:39 -05:00
Sabe Jones
e638661c71 Merge pull request #6314 from TheHollidayInn/tasks-fix-delete-message
Changed language when deleteing tasks to indicate type and text of task
2015-12-14 14:30:06 -06:00
Blade Barringer
5fa91713f5 fix(favicon): Add 192x192 image 2015-12-12 20:11:25 -06:00
Blade Barringer
025b302ec6 Merge branch 'develop' into anilanar-favicon192 2015-12-12 20:08:34 -06:00
Blade Barringer
530babf516 chore(css): Add explanation for empty-task-notification rule 2015-12-12 17:27:43 -06:00
Blade Barringer
81067efd19 Merge branch 'joyclark-new_mount_heads' into develop 2015-12-12 17:16:36 -06:00
Blade Barringer
963995e42e refactor(css): Adjust mount heads pixel paw positioning 2015-12-12 10:50:05 -06:00
Alys
10a63a6cb7 make Android link in footer open in new tab 2015-12-12 18:59:44 +10:00
Alys
95dbcde4b6 change Android link in footer to point to Google Play 2015-12-12 18:33:36 +10:00
Alys
5d6c4d4dcd add Android app with Google Play logo to static apps page; remove mailing list signup form 2015-12-12 11:32:17 +10:00
Sabe Jones
f6cdf5d257 chore(news): Android Bailey 2015-12-10 17:00:48 -05:00
Alys
cf01376f7d adjust forgot password text to specify that you must use the website - fixes https://github.com/HabitRPG/habitrpg-android/issues/170 2015-12-11 06:39:03 +10:00
Matteo Pagliazzi
c5b7873406 add support for habitica-android in x-client header 2015-12-09 11:02:26 +01:00
Joy Clark
7628882f24 use new css class 2015-12-08 13:22:13 +01:00
Sabe Jones
dd4ca5c476 refactor(modals): More readable invalid hatch check 2015-12-07 16:00:52 -05:00
Sabe Jones
0f578b79ff feat(pets): Peppermint Hatching Potions
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
2015-12-04 17:20:33 -05:00
Alys
d63cf64944 allow Fetch Recent Messages button to appear on newly-created groups 2015-12-03 10:03:59 +10:00
Negue
b337efb01a raise android gem purchase: 21 instead 20 2015-12-02 20:13:33 +01:00