Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,553 Commits 64 Branches 1,256 Tags
a6c5fab8a76cb9b2c8c7466960140407bc9b3cbc
Commit Graph

308 Commits

Author SHA1 Message Date
Blade Barringer a6c5fab8a7 Correct quest display bug 2015-08-22 15:36:29 -05:00
Blade Barringer bbb878d983 Remove uncessary divs 2015-08-22 14:26:17 -05:00
Blade Barringer e04bc21018 Move ng-if up 2015-08-22 14:26:07 -05:00
Blade Barringer 67e60e7d06 Add loading screen between leaving old party and joining new one 2015-08-22 12:42:52 -05:00
Blade Barringer 93f02363e5 Add feature to join new party if user is in a party of one 2015-08-22 12:19:37 -05:00
Blade Barringer 65888d3f8a Merge branch 'develop' into sabrecat/party-page 2015-08-20 07:39:25 -05:00
Sabe Jones 190fdd5bb9 feat(pets): August cheetah quest 2015-08-19 16:55:14 -04:00
Blade Barringer b902ff63a2 Merge branch 'develop' into sabrecat/party-page 2015-08-19 08:07:34 -05:00
Blade Barringer fa7f957ccc Update habitrpg.com to habitica.com where applicable 2015-08-19 08:00:34 -05:00
Blade Barringer 2e289777d5 Clean up groups page 2015-08-18 07:46:01 -05:00
Blade Barringer 344eded949 Merge branch 'develop' into sabrecat/party-page 2015-08-17 19:04:25 -05:00
Alys 53f861f3c0 allow challenges to be edited, deleted, closed by admin users (moderators and staff) through the web UI (not by API calls) 2015-08-16 16:51:53 +10:00
Blade Barringer 9e47bc3f4c Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop 2015-08-14 20:11:37 -05:00
Matteo Pagliazzi 2e1b046701 add TODO comments, send mods to client as they are used there 2015-08-14 21:05:04 +02:00
Sabe Jones 0f31873262 Merge branch 'develop' into sabrecat/party-page 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	website/views/options/social/index.jade
 2015-08-14 11:23:35 -05:00
Sabe Jones 00a212660a feat(greeting-cards): Thank-You & Greets 2015-08-13 16:58:31 -05:00
Sabe Jones f57e3e69a1 WIP(greeting-cards): Working send + modals 2015-08-13 15:43:51 -05:00
Sabe Jones b2100c2c54 WIP(greeting-cards): Abandon spell refactor 2015-08-13 14:31:34 -05:00
GihHubSphinx dd7ace7eb3 Reconstructing pets and mounts progress strings 
Second take, keeping the previous view
 2015-08-13 20:39:23 +05:00
GihHubSphinx c711074809 Duplicating 2 strings for better i18n 
Duplicating strings "Pets Found" and "Mounts Tamed" used in inventory
and in stats with different order of numbers - words
 2015-08-12 23:39:11 +05:00
Sabe Jones 3c8424a83e Merge branch 'crookedneighbor/refactor_cards' into sabrecat/greeting-cards 2015-08-12 11:53:28 -05:00
Blade Barringer 203a26b6df Refactor how cards are recieved 2015-08-12 08:36:57 -05:00
Alys 879ba83002 change habitrpg.com to habitica.com where appropriate - email addresses in static Contact page and various in-game URLs 2015-08-12 16:12:59 +10:00
Sabe Jones 28ae6afd92 WIP(party-page): UI draft 2015-08-10 13:42:36 -05:00
Sabe Jones f97012798e WIP(party-page): Party preview graphic 2015-08-06 16:36:28 -05:00
Sabe Jones f1704a6a92 WIP(party-page): Active party page 2015-08-06 12:13:50 -05:00
Sabe Jones c275db6b4b Merge branch 'develop' into sabrecat/party-page 2015-08-05 12:43:56 -05:00
Sabe Jones 68cc0fd56a fix(avatar): Delist Splashy Skins 
Also removes a style that was causing hair colors to be the only 40x40 buttons on a page full of 60x60 buttons.
 2015-08-04 15:17:38 -05:00
Sabe Jones cafdb4d57e Merge branch 'develop' into sabrecat/party-page 
Conflicts:
	common/locales/en/groups.json
 2015-08-03 12:45:32 -05:00
Matteo Pagliazzi 4f333c4f8a fix(amazon-payments): swap colors between paypal and amazon 2015-08-03 18:41:34 +02:00
Blade Barringer 5ed5ca8126 Merge branch 'adjustments-to-challenge-participant-pr' into develop 2015-08-03 08:47:30 -05:00
Blade Barringer 01237df213 Add buttons to challenge participant modal 2015-08-03 08:40:33 -05:00
Sabe Jones af4bb5e23f chore(news): End Summer Splash 2015-08-02 14:09:26 -05:00
Simon Gabler c9e7b4d73d Make challenge participant's name clickable in progress modal. Fixes #5558 2015-08-01 16:12:58 +02:00
Sabe Jones 1de80a3ed8 WIP(party-page): Revised invite modals 2015-07-30 16:48:08 -05:00
Sabe Jones f8d7547923 WIP(party): Incomplete no-party page 2015-07-29 16:28:23 -05:00
Sabe Jones 8492541636 fix(visuals): Armoire and Seasonal Shop 
Cleans up the Enchanted Armoire sprite and fixes bad alignment of Gem prices on the Seasonal Shop page.
 2015-07-28 13:35:17 -05:00
Blade Barringer e72543641c Puts keys of the kennel modal on the inventory ctrl so pet counting variables can be accesssed 
Closes #5668
 2015-07-25 23:22:35 -05:00
Blade Barringer 6aae668b8c Rework gem adjustment so it actually makes sense 2015-07-24 17:30:47 -05:00
Blade Barringer a89b612bbe Impliment challenge controller changes in view 2015-07-24 17:30:42 -05:00
TheHollidayInn fce622ddc7 Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems 2015-07-24 17:30:36 -05:00
Blade Barringer 65c14b1e3f Refactor inventory ctrl variables 2015-07-20 12:51:10 -05:00
Blade Barringer 4f5626b73b Merge branch 'hairlessbear-fix-ian-popover' into develop 2015-07-18 17:00:32 -05:00
Blade Barringer 4e6c2e7335 Add missing classes 2015-07-18 16:59:54 -05:00
hairlessbear c61c572887 '.row.col-md-12' changed to '.row: .col-md-12' 2015-07-16 21:10:48 -04:00
hairlessbear eae7f79363 Fixed time traveler items repositioning strangely on window resize 2015-07-16 20:37:14 -04:00
hairlessbear e2073f75b8 Refactored inventory file NPCs to use Bootstrap v3 grid and CSS instead of tables 2015-07-16 20:19:32 -04:00
Matteo Pagliazzi e0bfd60eb1 amazon payments: switch to green button 2015-07-15 20:07:17 +02:00
Blade Barringer 6c6c9b3464 Change Ian on quests page to not use tables 2015-07-15 08:19:39 -05:00
hairlessbear a9b3e6bf49 Refactored active time travlers code to move popover closer to NPCs 2015-07-15 01:14:21 -04:00