Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,097 Commits 64 Branches 1,256 Tags
2e5c7df94f1d0da4952cfcd074db0ffb53ea98be
Commit Graph

440 Commits

Author SHA1 Message Date
Blade Barringer 65bb655a10 Merge branch 'develop' into api-v3 2015-12-13 16:39:59 -06:00
Joy Clark 7628882f24 use new css class 2015-12-08 13:22:13 +01: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
Alys d63cf64944 allow Fetch Recent Messages button to appear on newly-created groups 2015-12-03 10:03:59 +10:00
Sabe Jones 78890012c1 Merge pull request #6305 from markhowson/fix_narrow_guild_desc 
Fixes #6252 - Guild description is too narrow on guild page
 2015-11-30 13:16:59 -06:00
Matteo Pagliazzi 5fa514b6fa Merge branch 'develop' into api-v3 2015-11-27 17:05:29 +01:00
Mark Howson f67bd384d4 Moved guild leader message down slightly 2015-11-26 18:47:54 +00:00
Sabe Jones ad347090c3 Merge remote-tracking branch 'origin/pr/5968' into develop 
Conflicts:
	website/views/options/social/challenge-box.jade
 2015-11-26 13:33:33 -05:00
Sabe Jones 0a90c7c66d Merge pull request #6270 from Arodang/challenge-tag-field-character-limit 
Removed Challenge Tag Maxlength
 2015-11-26 11:15:23 -06:00
Mark Howson fa462a1829 Renamed to wide-popover as it's the only remaining use 2015-11-26 12:56:22 +00:00
Mark Howson 848a96a9fa Fix for #6252 2015-11-26 11:56:32 +00:00
Alys 5461345770 remove trailing whitespace 2015-11-26 08:49:40 +10:00
Keith Holliday 83934bf5c9 Added markdown directive to challenge titles 2015-11-26 08:49:40 +10:00
Alys e04066e45f Merge pull request #6228 from AminArria/timezone-information 
Timezone information
 2015-11-24 21:21:10 +10:00
Matteo Pagliazzi 041224b5ac fix merge conflicts 2015-11-21 12:09:40 +01:00
Arodang 0b1758f5c6 Removed col-lg-6 class from tags and prize 2015-11-20 18:17:51 -05:00
arodang b286a93006 removed challenge tag maxlength, reduced tag and prize field size 2015-11-19 23:21:15 -05:00
Oliver Eyton-Williams e811693752 Subscriber benefits changed to be dynamic. Fixed arithmetic of gemGoldCap. 2015-11-16 15:11:11 +01:00
Amin Arria b87592c8a7 Changed p blocks to single line 2015-11-15 23:00:44 -04:30
Amin Arria 807726305f Added timezone form 2015-11-12 19:27:25 -04:30
Blade Barringer c5445dc426 Merge branch 'develop' into api-v3 2015-11-11 19:42:39 -06:00
Matteo Pagliazzi 3795b1d151 wip: starts upgrading lodash to v3 2015-11-11 10:32:49 +01: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 502e7f0af2 Merge branch 'develop' into sabrecat/more-modals 2015-11-03 14:29:23 -05:00
Blade Barringer 24480e5f04 Merge branch 'develop' into srrvnn-develop 2015-11-03 07:31:48 -06:00
Sabe Jones 2cb4e80019 chore(event): End Fall Festival 2015-11-02 12:55:48 -05:00
Blade Barringer 0894a3ea2d Merge branch 'develop' into srrvnn-develop 2015-11-02 06:45:45 -06:00
Blade Barringer add761e58e Remove extraneous div 2015-10-30 23:05:19 -05:00
Blade Barringer 92271c2049 Clean up view for market. 2015-10-30 22:49:13 -05:00
Thrashmandicoot 1051ff0006 Fix inline-styling to be class styling 2015-10-30 20:01:22 -07:00
Sabe Jones 5d3f41637f Merge branch 'develop' into sabrecat/more-modals 2015-10-30 16:33:17 -04:00
Thrashmandicoot 64ea4e42e7 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix 2015-10-30 03:43:35 -07:00
Thrashmandicoot 0e52a62ad2 dynamic images for merchant, finishes refactor 2015-10-30 03:43:13 -07:00
Thrashmandicoot e1b26a884c Add display for selling items, needs right img 2015-10-30 02:27:36 -07:00
Blade Barringer dd09633d31 Merge branch 'locks-auto-equip' into develop 2015-10-29 12:25:18 -05:00
Sabe Jones f4ea6c1d5d feat(sharing): Opt Out WIP 
First draft of support for opting out of future modal display on specific events, and adds the second barebones target page for sharing.
 2015-10-28 16:36:47 -04:00
Blade Barringer cdc58c78fd Merge branch 'nicolevonvon-develop' into develop 2015-10-27 20:19:09 -05:00
Blade Barringer c812c0ae90 Add popover to no owner label 2015-10-27 20:18:39 -05:00
nicolevonvon 47ec2e1f93 Challenges now display'no owner' if original owner deletes account 2015-10-27 22:15:19 +02:00
Blade Barringer c04b27ffd5 Simplify community guidelines string 2015-10-26 18:08:45 -05:00
ksami f2c856f6e6 Make link translatable in options/inventory/time-travelers 2015-10-23 23:40:11 +08:00
ksami b3cc58886c Make strings translatable in options/social/chat-box 2015-10-23 23:20:59 +08:00
Sabe Jones d0a34fc0ad feat(quests): 2015-10 Pet 
Also adds Exhaust Strike-specific text to the remaining affected NPCs.
 2015-10-20 12:32:45 -04:00
Saravanan Ganesh df7fd2e036 fix(chat): #5864 API should return flagged messages in chat only to mods 2015-10-19 21:43:24 -07:00
Blade Barringer 9ad1dbd8ce Adjust mystic hourglass string to take in interpolation 2015-10-19 08:10:37 -05:00
Blade Barringer 1a2510e4da Adjsut string to take in interpolation 2015-10-19 08:03:27 -05:00
Ricardo Mendes 73924df241 Adds auto-equip UI to equipment view 2015-10-19 05:20:11 +00:00
ksami 65dc274e49 Make text in options/settings translatable 2015-10-16 20:48:12 +08:00
Sabe Jones 380265731f feat(world-boss): Exhaust Ian's text 2015-10-14 21:02:59 -04:00