sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-01 23:40:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
14187 commits 3 branches 0 tags 1.6 GiB
Commit graph

1088 commits

Author SHA1 Message Date
Kaitlin Hipkin
9f0704aa94 modal explaining new class gear is now class-agnostic 2016-03-18 23:23:12 -04:00
Sabe Jones
8447259016 Merge pull request #6921 from HabitRPG/sabrecat/spring-2016 
Spring Fling 2016
 2016-03-18 16:08:46 -05:00
Sabe Jones
b5f91a657f feat(event): Spring Fling complete 2016-03-18 16:56:16 -04:00
Blade Barringer
cd6ab23106 Merge pull request #6900 from doyler/develop 
Note about weekly progress update (fixes #6884)
 2016-03-18 07:37:32 -05:00
Victor Piousbox
4655e5061a api-v3 password reset 2016-03-17 14:47:22 -07:00
Sabe Jones
4effa79e17 WIP(event): Spring Fling partial 2016-03-17 13:04:12 -04:00
Blade Barringer
c7310b97ec Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues." 
This reverts commit 9d50201180.
 2016-03-17 08:09:18 -05:00
Alys
9d50201180 Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues. 
This reverts commits 1c811dbc82, 146810a3e9, 9508ed45df, a6fb945120.
 2016-03-17 21:47:29 +10:00
Blade Barringer
3f16cd4fbf refactor: Adjust stat allocation modal 2016-03-16 22:07:00 -05:00
Josh Holland
952d9ec929 Quick allocation of attribute points from level-up modal 
Resolves #6720.
 2016-03-16 22:06:54 -05:00
Blade Barringer
a150dbc9ca chore(i18n): update locales 2016-03-16 20:32:15 -05:00
doyler
51f3008a20 Note about weekly progress update (fixes #6884) 2016-03-16 22:11:01 +01:00
Blade Barringer
be0bcad24b chore(i18n): update locales 2016-03-15 19:51:47 -05:00
Blade Barringer
1c811dbc82 refactor: Extract orderBy equipment button into mixin 2016-03-15 19:41:24 -05:00
Matt Harrington
a6fb945120 inventory sorting 
Add inventory sorting buttons based on name, attribute, and set (armoire):
-  Each gear[klass] has its own sorting buttons and sorting state including costume classes
-  The attributes sort descending when selected, then by sum of all attributes
-  There is no default sort
-  The armoire also sorts by set which sorts by item[set] descending, it does not sort within a set (ex "1 of 3" vs "2 of 3")
-  Name sorts by .text() ascending
 2016-03-15 19:41:11 -05:00
Sabe Jones
beb86ea4bd Merge branch 'khipkin/party-badges' into develop 
Conflicts:
	common/dist/sprites/spritesmith-main-10.png
	common/dist/sprites/spritesmith-main-11.png
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.png
 2016-03-15 14:57:38 -04:00
Matteo Pagliazzi
219ec01ce9 port shared.ops.allocate 2016-03-15 18:41:23 +01:00
Victor Piousbox
0b25720232 cleanup 2016-03-13 14:01:53 -07:00
Victor Piousbox
c14f0c4247 update username, password 2016-03-13 10:42:59 -07:00
Matteo Pagliazzi
c02082a200 Merge branch 'develop' into api-v3 2016-03-12 16:00:24 +01:00
Sabe Jones
d28219e90d fix(content): Pfeffernusse typo, again 2016-03-10 17:35:36 -06:00
Matteo Pagliazzi
fbdbd8e006 Merge branch 'develop' into api-v3 2016-03-10 18:30:09 +01:00
Sabe Jones
2a5011b648 fix(content): don't be clever with quest names 2016-03-09 16:57:43 -06:00
Sabe Jones
d153df7805 feat(content): snail pet quest WIP 2016-03-09 15:34:57 -05:00
Kaitlin Hipkin
167eb8973a add strings for new partyUp and partyOn achievs 2016-03-08 20:45:33 -05:00
Blade Barringer
3fa9d17ad4 Merge branch 'develop' into api-v3 2016-03-08 19:25:50 -06:00
Alys
612d455fe1 Merge pull request #6782 from andrewcham/issue6779 
update community guidelines - fixes #6779
 2016-03-06 17:42:08 +10:00
Matteo Pagliazzi
b5e1cd33e2 Merge branch 'develop' into api-v3 2016-03-05 19:29:02 +01:00
Matteo Pagliazzi
6830a4464a Merge branch 'api-v3-email-3' of https://github.com/piousbox/habitrpg into piousbox-api-v3-email-3 2016-03-05 19:24:11 +01:00
Blade Barringer
a007effddd chore(i18n): update locales 2016-03-05 07:46:08 -06:00
Victor Piousbox
7dfdbb8b05 /user/update-email endpoint 2016-03-04 21:27:16 +00:00
Matteo Pagliazzi
80f791c86b add tests, move CustomError to common, fix casting 2016-03-03 00:16:28 +01:00
Matteo Pagliazzi
8920b05f9e Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3 2016-03-02 12:59:51 +01:00
Sabe Jones
ea6abbfabc feat(content): Armoire and BGs 2016-03 2016-03-01 15:59:25 -05:00
Matteo Pagliazzi
9114d74357 Merge branch 'develop' into api-v3 2016-03-01 09:44:57 +01:00
Nick Bunn
251dd3cb8e Changed submenu from Hall of Heroes to Hall of Contributors 2016-02-29 20:23:05 -06:00
Matteo Pagliazzi
0c700cc36d Merge branch 'develop' into api-v3 2016-02-29 16:39:31 +01:00
Matteo Pagliazzi
3512233966 add meta/models controller to get public models paths 2016-02-29 01:04:19 +01:00
Nick Bunn
075ed9f172 updated menu names for better description 2016-02-28 16:10:26 -06:00
Alys
6cd861dcdc Merge pull request #6742 from murraybd/develop 
Display attribute info in Character Build
 2016-02-28 19:39:20 +10:00
Andrew Cham
bf64c6503d #6779 Update community guidelines 2016-02-27 02:47:58 -08:00
Matteo Pagliazzi
bb461f0c5a Merge branch 'develop' into api-v3 2016-02-26 10:08:24 +01:00
Sabe Jones
5c1d379f41 feat(subscription): mystery items 201602 2016-02-23 17:00:55 -05:00
Matteo Pagliazzi
2b8846b803 Merge pull request #6748 from TheHollidayInn/api-v3-unsubscribe 
Added unsubscribe route and initial tests
 2016-02-22 18:03:05 +01:00
Matteo Pagliazzi
9ef4b6409e Merge branch 'develop' into api-v3 and move new relic to new location 2016-02-22 11:43:35 +01:00
Keith Holliday
34b03934cc Added unsubscribe route and initial tests 2016-02-21 10:05:51 -06:00
Brian Murray
7822e2aaec end sureRest sentence with a period 2016-02-19 19:15:32 -08:00
Matteo Pagliazzi
2547676783 add hall controller, missing tests 2016-02-18 14:55:52 +01:00
Blade Barringer
d0ac43592f chore(i18n): update locales 2016-02-14 21:13:40 -06:00
Matteo Pagliazzi
28c6c27b78 Merge branch 'develop' into api-v3 2016-02-14 13:03:29 +01:00
Blade Barringer
4360f01936 feat(api-v3): Add force-start quest route 2016-02-12 08:09:16 -06:00
Matteo Pagliazzi
6cae147b83 Merge branch 'sabrecat/quest-accept' into TheHollidayInn-api-v3-quests-leave 2016-02-11 20:48:18 +01:00
Matteo Pagliazzi
e8a38a6326 Merge branch 'sabrecat/quest-accept' into TheHollidayInn-api-v3-quests-abort 2016-02-11 20:44:27 +01:00
Matteo Pagliazzi
84d03dc2ad Merge branch 'sabrecat/quest-accept' into TheHollidayInn-api-v3-quests-cancel 2016-02-11 20:24:16 +01:00
Matteo Pagliazzi
c79cb0efc6 update quest abort route 2016-02-11 15:32:25 +01:00
Matteo Pagliazzi
096bb3f853 Merge branch 'api-v3-quests-abort' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-quests-abort 2016-02-11 15:16:29 +01:00
Matteo Pagliazzi
c6c852cd6d Merge branch 'api-v3-quests-leave' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-quests-leave 2016-02-11 14:52:09 +01:00
Matteo Pagliazzi
6c1950972b update quest cancel routes 2016-02-11 13:19:46 +01:00
Matteo Pagliazzi
3cd7e8ad5d Merge branch 'api-v3-quests-cancel' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-quests-cancel 2016-02-11 12:54:34 +01:00
Matteo Pagliazzi
879506b38a update reject quest route 2016-02-11 12:50:28 +01:00
Matteo Pagliazzi
210a8ee11f Merge branch 'api-v3-quests-reject' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-quests-reject 2016-02-11 12:12:09 +01:00
Matteo Pagliazzi
a2af6c390b fix quest accept route and add tests 2016-02-10 22:27:59 +01:00
Alys
e425e75b9d change Beast Master text from insanely to incredibly - partial fix for https://github.com/HabitRPG/habitrpg/issues/6685 2016-02-10 07:45:22 +10:00
Alys
13c06756e3 Merge pull request #6586 from anowlcalledjosh/front_page_image_alts 
#6560: Add alt attributes for images on front page
 2016-02-09 18:15:47 +10:00
Alys
badebe8bcc adjust rebirth description to specify that you must change class to buy class-specific gear 2016-02-09 11:52:07 +10:00
Sabe Jones
e1b13db6e8 feat(quests): pets 201602 
Also enables the Valentine's Day card for selection in the Market.
 2016-02-08 16:20:05 -05:00
Alys
7aca788ce8 adjust subscription benefit task history information 2016-02-07 22:24:32 +10:00
Keith Holliday
6f606df211 Added quest abort route and initial tests 2016-02-04 15:22:37 -06:00
Alys
2d6a8e4b6a renumber armoire Jester Set - fixes https://github.com/HabitRPG/habitrpg/issues/6658 2016-02-05 06:55:29 +10:00
Keith Holliday
5ca663db57 Added quest leave route and initial tests 2016-02-04 12:31:38 -06:00
Keith Holliday
0684e30790 Added quest cancel route and initial tests 2016-02-03 17:04:57 -06:00
Keith Holliday
d5148a7bf0 Added quest reject route and intial tests 2016-02-02 16:38:31 -06:00
Sabe Jones
d8e9b781c8 feat(content): BGs and Armoire 201602 2016-02-02 16:02:50 -05:00
Alys
a05f6c46d6 add name for mysterySet201601 (Champion of Resolution Set) - fixes https://github.com/HabitRPG/habitrpg/issues/6642 2016-02-02 15:48:28 +10:00
Sabe Jones
0fcdc49adb chore(event): end Winter Wonderland 2016-02-01 17:01:17 -05:00
Alys
ea57808176 remove instructions for Beeminder users to read a warning about deleting completed To-Dos (warning is no longer needed) 2016-01-31 18:25:37 +10:00
Alys
9b9072be45 removed mention of cookies from message about clearing local storage (cookies are not removed) 2016-01-31 18:16:26 +10:00
Blade Barringer
a6ed635978 Merge branch 'api-v3-groups' into sabrecat/quest-accept 2016-01-30 11:10:33 -06:00
Brian Murray
e48c47fbec Revert change to en_GB since the locales files don't get updated through 
GitHub.
 2016-01-29 14:20:06 -08:00
Brian Murray
2799905169 Add in missing word your to passMan phrase. 2016-01-29 11:37:51 -08:00
Sabe Jones
5512be01cd fix(subscription): clarify credits wording 2016-01-29 13:09:40 -05:00
Sabe Jones
91c6ce27c5 feat(event): Habit Birthday 2016 
Also adds AWS Elastic Beanstalk local config file to .gitignore.
 2016-01-28 17:16:01 -05:00
Matteo Pagliazzi
f16b605c37 add update challenge with tests 2016-01-27 12:22:24 +01:00
Sabe Jones
953c504867 feat(subscription): mystery gear strings 2016-01-26 15:26:11 -05:00
Josh Holland
7cc618b32c Add alt attributes for images on front page 
Some images have an empty alt attribute (alt=""); this isn't a mistake,
it's part of the HTML spec for images that don't add any information.
Debatably, some images marked up as such with this commit do add
information, but that information (e.g. what the Habitica UI looks
like from the intro image) isn't likely to be useful to someone not
able to see.

It's also difficult to convey purely visual concepts like the arrows
with alt-text, especially as the arrows themselves are not images and
therefore cannot have an alt attribute.

Fixes #6560.
 2016-01-26 17:35:35 +00:00
Alys
6c106ad644 fix name of Base Hatching Potion quest reward - https://github.com/HabitRPG/habitrpg/pull/6583 2016-01-26 18:42:22 +10:00
Phillip Thelen
8e8c28725a Add avatar customizations to content API 2016-01-25 21:59:13 -06:00
Keith Holliday
c498eef21c Added initial chat delete tests 2016-01-23 23:09:22 -06:00
Sabe Jones
0ec63ca68d test(quests): invite and accept WIP 2016-01-22 16:59:34 -05:00
Sabe Jones
3bd806a0f0 test(quests): accept route WIP 2016-01-21 17:31:54 -05:00
Sabe Jones
95ee19b4ca Merge branch 'taldin/faq-wiki-links' into develop 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
 2016-01-19 13:50:35 -05:00
Blade Barringer
0b5a8bf76d chore(i18n): update locales 2016-01-18 18:24:44 -06:00
Blade Barringer
66083f766c Merge branch 'api-v3' into api-v3-groups 2016-01-18 18:04:20 -06:00
Blade Barringer
32a2b3121e Merge branch 'develop' into api-v3 2016-01-18 18:04:07 -06:00
Sabe Jones
c6b4b24052 Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks 
Text and visual tweaks for Gems
 2016-01-18 15:25:58 -06:00
Alys
fe58129cd3 remove Completion from Octopus quest text - ref https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-172600908 2016-01-19 06:18:49 +10:00
Alys
fd62e39f20 fix spelling mistake: crystaline -> crystalline 2016-01-19 04:47:50 +10:00
Kristian Tashkov
f37b5a7fac Challenges join route and tests 2016-01-17 15:44:15 -06:00
Matteo Pagliazzi
8de8ca7e18 add getChallengeMemberProgress route and misc fixes 2016-01-17 12:01:57 +01:00
Matteo Pagliazzi
c27f98075c Merge branch 'api-v3-groups' into api-v3-members 2016-01-17 11:24:10 +01:00
Blade Barringer
965c5dbaa7 Merge branch 'api-v3' into api-v3-groups 2016-01-16 19:46:47 -06:00
Blade Barringer
07f08de989 Merge branch 'improve_tests' into api-v3 2016-01-16 18:12:36 -06:00
Matteo Pagliazzi
f447af19ae add tests for getting challenge members and fix a lot of bugs 2016-01-16 16:18:06 +01:00
Sabe Jones
23720e0a43 style(subscription): more tweaks 2016-01-15 14:10:02 -05:00
Matteo Pagliazzi
e0b10d44ca Merge branch 'api-v3-groups' into api-v3-members 2016-01-15 11:22:11 +01:00
Luveluen
5315cc9055 Update character.json to separate optOut into two translation strings 
optOut is currently used to skip the class selection and to opt out of the messaging system.
that creates translation problems.

Fixes #6511
Closes #6518
 2016-01-14 20:40:07 -06:00
Georgi Gardev
e761315c74 Remove tooltip for 'reverse chat messages' checkbox 
Fixes #6517
Closes #6525
 2016-01-14 20:28:08 -06:00
Sabe Jones
b6b2c25358 style(modal): text and visual tweaks for Gems 2016-01-14 15:58:14 -05:00
Matteo Pagliazzi
5206469e90 add unlinkTask route and refactor user.unlink (now user.unlinkChallengesTasks) 2016-01-14 19:46:43 +01:00
Matteo Pagliazzi
2b9aa11598 Merge branch 'api-v3-groups' into api-v3-challenges-tasks 2016-01-14 18:25:59 +01:00
Sabe Jones
14a6d0dabf feat(quests): January 2016 pet 2016-01-13 17:15:02 -05:00
Matteo Pagliazzi
6f6d4edcec Merge branch 'api-v3-groups' into api-v3-members 2016-01-13 18:41:53 +01:00
Matteo Pagliazzi
e2edb974d7 Merge branch 'api-v3' into api-v3-groups 2016-01-13 18:40:04 +01:00
Matteo Pagliazzi
914b2eb008 Merge branch 'develop' into api-v3 2016-01-13 18:39:44 +01:00
Sabe Jones
81842bbee1 fix(subscription): visual and wording tweaks 2016-01-12 15:29:10 -05:00
Sabe Jones
2db1ef0f7a style(subscriptions): Gem layout feedback 2016-01-12 15:00:07 -05:00
AnitaYCheng
bf6ebd88f6 Modifications to settings mixin and misc last changes. 2016-01-12 15:00:07 -05:00
AnitaYCheng
2a8eb9f476 Added translation strings for conditional buy-gems modal 2016-01-12 14:58:39 -05:00
Matteo Pagliazzi
55db0a4a4b add routes to get a single user, get members for a group, get members invited to a group 2016-01-12 17:27:06 +01:00
Matteo Pagliazzi
b102ff7cae Merge branch 'api-v3-groups-invites' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-groups-invites 2016-01-12 15:48:47 +01:00
Keith Holliday
1b395b39f8 Added invite limit and tests for when multiple users with an error 2016-01-12 08:43:11 -06:00
Keith Holliday
9141598a34 Updated invite route and function for new standards, and added tests. 2016-01-12 08:43:11 -06:00
Sabe Jones
dba620ee7a Merge pull request #6417 from GeorgeSG/reverse-chat-option 
Add option to reverse chat order
 2016-01-11 12:55:28 -06:00
Sabe Jones
7e8f0d24c5 Merge remote-tracking branch 'origin/pr/6307' into develop 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
 2016-01-11 13:48:01 -05:00
Keith Holliday
ffbd4696e3 Converted posts tests to async/await syntax and updated tests 2016-01-11 12:35:46 -06:00
Alys
0d47f8d116 allow purchase of Find the Cub evilsanta2 quest scroll before completing previous quest - fixes https://github.com/HabitRPG/habitrpg/issues/6405 2016-01-12 02:58:33 +10:00
Taldin
fd81f70ffa Adjusted for generic translation 
Per Lady Alys's suggestion.
 2016-01-09 23:59:05 -08:00
Blade Barringer
c5ad006007 chore(i18n): update locales 2016-01-09 23:46:53 -06: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
Daniel Van Camp
99a694bb10 added EU version of t-shirt 2016-01-06 23:15:36 +01:00
Daniel Van Camp
0362977dbd Merge branch 'develop' into static-page-merch 2016-01-06 22:38:19 +01:00
Sabe Jones
adfa248dd0 feat(content): backgrounds and Armoire 2016-01 2016-01-06 15:11:20 -05:00
Taldin
07fc30a131 update help menu and FAQ to jump to Wikia 
The Help > FAQ option no longer jumps to the Wiki.  Added a help menu
item to fix that.   I also added a link to the Wiki FAQ at the bottom of
the FAQ.
 2016-01-05 12:19:18 -08:00
Blade Barringer
8a546c7ec3 chore(i18n): update locales 2016-01-05 08:40:48 -06:00
Matteo Pagliazzi
3bc8945bcc adapt current tests and change urls to avoid conflicts 2016-01-04 22:03:21 +01:00
Matteo Pagliazzi
6680853078 finish adding challenges support for tasks (except syncing) 2016-01-04 20:48:48 +01:00
Matteo Pagliazzi
d25cb70f66 wip get and create tasks plus initial user syncing 2016-01-04 19:44:39 +01:00
Blade Barringer
7cf43680e6 Merge branch 'api-v3' into api-v3-groups 2015-12-31 12:22:20 -06:00
Blade Barringer
aa6f5fff23 Merge branch 'develop' into api-v3 2015-12-31 12:17:57 -06:00
Alys
5304b37102 properly fix Winter Flame Set 2015-12-31 22:09:06 +10:00
Alys
e7cbb2cd16 add Winter Flame Set to locale file - fixes #6433 2015-12-31 21:49:21 +10:00
Georgi Gardev
beaf0b83bb Add option to reverse order of chat messages 2015-12-30 23:47:03 +02:00
Matteo Pagliazzi
6003dad24b misc fixes, port challenge task scoring, delete chal and select winner 2015-12-29 20:57:20 +01:00
Sabe Jones
054e3cb361 feat(event): New Year's Eve 2015 2015-12-29 14:55:05 -05:00
Matteo Pagliazzi
a44090e1ed Merge branch 'api-v3' into api-v3-groups 2015-12-29 18:17:36 +01:00
Blade Barringer
bce049a316 Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3 2015-12-29 08:06:22 -06:00
Blade Barringer
33714b4947 chore(i18n): update locales 2015-12-28 21:40:51 -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
Matteo Pagliazzi
ba0fb884dd port create challenge 2015-12-28 12:14:56 +01:00
Matteo Pagliazzi
6ae2c5fa89 wip on groups controller 2015-12-27 17:24:55 +01:00
Alys
7ef4fab289 change scroll drop text for The Golden Knight, Part 1 quest - it drops Gold Knight (Scroll) not Tarnished Gold (Scroll) 2015-12-28 01:06:08 +10:00
Blade Barringer
e46436f77b chore(i18n): update locales 2015-12-26 22:28:55 -06:00
Blade Barringer
7df3b333f6 feat: Refine clear local storage function 2015-12-26 19:00:45 -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
468198b9e2 feat(mystery): subscriber items 2015-12 
Also enables the Snowball in the Seasonal Shop.
 2015-12-22 16:16:30 -05:00
Matteo Pagliazzi
83364c1d56 add leaveGroup, joinGroup and remove member from group methods 2015-12-21 11:53:47 +01:00
Sabe Jones
c259c5c819 fix(event): sprite and string tweaks 2015-12-18 17:58:46 -05:00
Sabe Jones
493ae6f26a feat(event): Winter Wonderland complete 2015-12-18 15:48:14 -05:00
Matteo Pagliazzi
1132e3971d initial implementation for GET groups 2015-12-18 17:26:49 +01:00
Sabe Jones
21f93c9399 WIP(chat): v3 controller 2015-12-17 14:49:14 -05:00
Matteo Pagliazzi
2e5c7df94f Merge pull request #6343 from HabitRPG/api-v3-tasks2 
[API v3] Tasks 2
 2015-12-16 13:18:05 +01: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
Matteo Pagliazzi
e547eb2dde add tests for tags ops on tasks 2015-12-14 22:44:50 +01: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
Daniel Van Camp
3c7ddf8df1 Merge branch 'develop' into static-page-merch 2015-12-14 21:27:50 +01:00
Blade Barringer
65bb655a10 Merge branch 'develop' into api-v3 2015-12-13 16:39:59 -06:00
Alys
9edb0831c0 specify $ USD for subscription prices 2015-12-14 07:16:22 +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
Matteo Pagliazzi
582aeafb4b Merge branch 'develop' into api-v3 2015-12-06 17:17:20 +01: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
Sabe Jones
aa00eae0d5 Merge pull request #6324 from ojeytonwilliams/unequip-notification-fix 
Unequip notification fix
 2015-12-03 14:01:45 -06:00
Matteo Pagliazzi
a6648fc638 add tags routes, misc fixes 2015-12-03 19:19:53 +01:00
Oliver Eyton-Williams
36df8138fc Fixed template syntax. 2015-12-03 13:33:52 +01:00
Oliver Eyton-Williams
dcd7cae312 Reverted changes related to multiple messages and changed handleTwoHanded to send single, clearer, messages. 2015-12-02 16:51:01 +01:00
Blade Barringer
6aa164ab31 chore(i18n): update locales 2015-12-02 07:42:29 -06:00
Matteo Pagliazzi
427c805ea5 fix user tests and misc changes 2015-12-02 11:22:53 +01:00
Sabe Jones
5b943b4ab9 feat(event): Enable GaymerX armor 2015-12-01 18:11:04 -05:00
Sabe Jones
03222bf084 feat(content): Armoire and backgrounds 2015/12 2015-12-01 16:29:22 -05:00
Sabe Jones
483ff8cb67 Merge pull request #6275 from TheHollidayInn/tasks-add-push-to-bottom 
Tasks add push to bottom
 2015-12-01 14:20:02 -06:00
Daniel Van Camp
3d9b2047d0 updated static.styl with less classes 
added key attribute to merchant array
changed item to merchant for clearity
added fallback for when no logo is found (no image can be provided)
updated guidelines
updated json
 2015-11-30 22:33:12 +01:00
Alys
c4f3c2b1f4 change website FAQ to link to Overview for New Users on website instead of wiki 2015-12-01 07:08:07 +10:00
Matteo Pagliazzi
93fcc7957e fix trying to move completed todos 2015-11-30 20:22:22 +01:00
Matteo Pagliazzi
67bcfde6dc implement move task 2015-11-30 20:14:53 +01:00
Matteo Pagliazzi
ebdfe4c49b add checklists routes 2015-11-30 17:25:40 +01:00
Keith Holliday
4663c7cf5e Added translation functions to task types 2015-11-30 09:26:07 -06:00
Keith Holliday
ea87784575 tasks-fix-delete-message 2015-11-29 14:30:22 -06:00
Daniel Van Camp
afecae9ef0 cleared merch.json of attributes that should not be translated 2015-11-29 19:05:32 +01:00
Matteo Pagliazzi
3002db3d75 add ability to update tasks, can pass additional fields to Model.sanitize at runtime 2015-11-29 19:05:24 +01:00
Keith Holliday
0dcba276a6 Fixed task push text and move ctrlPressed logic to rootScope. 2015-11-28 12:06:34 -06:00
Matteo Pagliazzi
6c904330e7 misc fixes, add createTask route and ability to get tasks by type to getTasks route 2015-11-28 17:47:32 +01:00
Daniel Van Camp
6a535277a7 updated tab indent 
added link in footer
renamed Merchandise to Merch (looks better in the footer)
moved css to static.styl
 2015-11-27 23:25:56 +01:00
Matteo Pagliazzi
5fa514b6fa Merge branch 'develop' into api-v3 2015-11-27 17:05:29 +01:00
Daniel Van Camp
e881ba37e7 added static merch page 
added lang en .json
modified pages.js with the extra merch page
 2015-11-27 10:07:12 +01:00
Sabe Jones
29a84e6666 feat(event): Habitica Thanksgiving 2015-11-25 17:06:52 -05:00
Alys
e04066e45f Merge pull request #6228 from AminArria/timezone-information 
Timezone information
 2015-11-24 21:21:10 +10:00
Amin Arria
671d4aaecc Change timezone text 2015-11-23 11:38:26 -04:30
Matteo Pagliazzi
a26f713e18 misc fixes, add ability to attach local auth to social user 2015-11-23 12:47:15 +01:00
Keith Holliday
b668829d85 Added ability to invert pushToBottom when holding down ctrl or cmd button 2015-11-22 15:57:14 -06:00
Matteo Pagliazzi
7866f7393b clean up code, add deleteSocial method 2015-11-21 12:03:08 +01:00
Matteo Pagliazzi
972cbbdaa6 try moving all the logic to the model 2015-11-19 21:09:39 +01:00
Matteo Pagliazzi
6451264572 start porting register local user handler, several bug fixes 2015-11-19 12:13:54 +01:00
Matteo Pagliazzi
d5d13477d7 wip user controllers: local login method 2015-11-18 18:02:35 +01:00
Blade Barringer
94bf181301 Add noscript locales 2015-11-17 22:02:57 -06:00
Blade Barringer
4d415ee9c1 chore(i18n): update locales 2015-11-17 21:54:30 -06:00
Blade Barringer
fba35ea491 chore(i18n): update locales 2015-11-17 21:48:55 -06:00
Blade Barringer
6bd0ed76cc Fixes #6524. Correct spelling of community 2015-11-17 21:41:06 -06:00
Blade Barringer
71473a93ad chore(i18n): update locales 2015-11-17 21:38:32 -06:00
Blade Barringer
1299afcb01 Merge branch 'develop' into gauthamchandra-feature/warning-for-disabled-js 2015-11-17 21:28:22 -06:00
Gautham Chandra
37e08e8d5d Converted noscript text into translatable strings 2015-11-17 22:22:55 -05:00
Sabe Jones
2d1ad12cbd fix(strings): Make plural more greppable 2015-11-16 17:08:38 -05:00
Sabe Jones
16878af76f fix(string): Contest to Contestant 2015-11-16 16:17:48 -05:00
Sabe Jones
e73c7be47a fix(achievement): Make Costume Contest repeatable 2015-11-16 16:07:16 -05:00
Amin Arria
807726305f Added timezone form 2015-11-12 19:27:25 -04:30
Blade Barringer
92a8c3d958 chore(i18n): update locales 2015-11-11 20:24:12 -06:00
Sabe Jones
f0a484bbe1 fix(strings): Variable population count 2015-11-11 21:10:24 -05:00
Sabe Jones
83b61f9aa3 Merge branch 'develop' into sabrecat/pet-201511 
Conflicts:
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.css
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.css
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.css
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.css
	common/dist/sprites/spritesmith-main-9.png
 2015-11-11 18:36:25 -05:00
Sabe Jones
eba2ac386e feat(pets): November quest 
Fully functional commit. Missing only Bailey and the quest scroll sprite.
 2015-11-11 17:23:16 -05:00
Sabe Jones
cc92b985a2 fix(sharing): Translatable share strings 2015-11-11 13:35:14 -05:00
Sabe Jones
eed4207c6d Merge branch 'develop' into sabrecat/more-modals 
Conflicts:
	common/dist/sprites/spritesmith-largeSprites-0.png
	common/locales/en/front.json
 2015-11-09 16:24:17 -05:00
Sabe Jones
164309e050 feat(sharing): Streak Achievement 2015-11-06 16:54:23 -05:00
Sabe Jones
56fbc33d1c Merge branch 'develop' into Move-Overview-To-Website 
Conflicts:
	website/src/routes/pages.js
 2015-11-05 14:31:00 -05:00
Sabe Jones
18c2279be4 fix(overview): Wording and layout tweaks 2015-11-05 14:18:51 -05:00
Blade Barringer
3726f48ff2 chore(i18n): update locales 2015-11-04 21:57:16 -06:00
Sabe Jones
3a1862ecef fix(static): Non-widgety App Store links 2015-11-04 22:42:10 -05:00
Sabe Jones
de5d2df94c fix(i18n): Add missing string 2015-11-04 16:04:51 -05:00
Sabe Jones
8c4ecb8f6c feat(static): Apps page 2015-11-04 13:35:31 -05:00
Amin Arria
8611c00201 Added links 2015-11-03 22:38:55 -04:30
Amin Arria
f79110d6d2 Changed to be more like the FAQ 2015-11-03 22:03:24 -04:30
Sabe Jones
02abee9f4e fix(sharing): Landing page tweaks 2015-11-03 16:16:17 -05:00
Sabe Jones
0260ea3fcd WIP(sharing): Draft functional landing page 2015-11-03 15:04:31 -05:00
Sabe Jones
502e7f0af2 Merge branch 'develop' into sabrecat/more-modals 2015-11-03 14:29:23 -05:00
Sabe Jones
3691a59ddb fix(front-page): Update registered user count 2015-11-03 12:30:54 -06:00
Amin Arria
167af1afd4 New static page: overview 2015-11-03 13:35:14 -04:30
Sabe Jones
1fa15ba24a Merge pull request #6167 from HabitRPG/sabrecat/content-201511 
November backgrounds and Armoire
 2015-11-03 11:58:51 -06:00
Blade Barringer
2713b0f26f chore(i18n): update locales 2015-11-02 22:08:28 -06:00
Sabe Jones
e74c83be2e feat(content): November backgrounds and Armoire 2015-11-02 17:28:20 -05:00
Blade Barringer
c419ca8839 Merge pull request #6068 from AminArria/Wrong-max-level-messages 
Wrong max level messages
 2015-10-30 23:21:29 -05:00
Blade Barringer
898850fd6e Adjust wording of market message. 2015-10-30 22:50:04 -05:00
Thrashmandicoot
76de8af848 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix 2015-10-30 20:02:16 -07:00
Sabe Jones
0c5e520e6f WIP(sharing): Incomplete landing page 
First stab at creating landing pages for inbound social traffic. May need a different solution.
 2015-10-30 17:35:30 -04:00
Sabe Jones
5d3f41637f Merge branch 'develop' into sabrecat/more-modals 2015-10-30 16:33:17 -04:00
Blade Barringer
ad6fbef85c Move chat tests to new infrastructure 2015-10-30 14:47:14 -05:00
Blade Barringer
e8fa22bf93 chore(i18n): update locales 2015-10-30 09:25:43 -05:00
Blade Barringer
aa111b3c1a Update tests to assert against translation strings 2015-10-30 09:01:57 -05:00