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

204 Commits

Author SHA1 Message Date
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
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
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
Blade Barringer 0894a3ea2d Merge branch 'develop' into srrvnn-develop 2015-11-02 06:45:45 -06: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 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
Sabe Jones 380265731f feat(world-boss): Exhaust Ian's text 2015-10-14 21:02:59 -04:00
Sabe Jones d27fb9dba2 WIP(world-boss): Rage and rewards 
Also finishes out written story content.
 2015-10-06 15:59:16 -04:00
Sabe Jones 3ca836a81c fix(world-boss): Pass test 
Also uncomment the line used to hide display of the boss in the Tavern, because we won't be doing a dry run of that style this time around.
 2015-10-05 17:18:44 -04:00
Sabe Jones f6abcc0ddf WIP(world-boss): Initial stats outlay 
Also quest reward sprites, groundwork for world damage, and partial content build.
 2015-10-05 16:59:19 -04:00
Sabe Jones 6d6f0f597b feat(world-boss): Dry run 2015-09-24 15:39:16 -04:00
TheHollidayInn 43c9683a8b Added param to filter challenges by guild when a challenge is first clicked from guild 2015-09-21 19:35:14 -05:00
Blade Barringer 2a530a207d Rename translation key 2015-09-19 10:41:21 -05:00
LuneFox ec336c4f88 added link to the newbies guild 2015-09-19 01:11:27 +03:00
Blade Barringer b32e521c56 Pull in client side changes for quest routes 2015-09-15 09:35:17 -05:00
Sabe Jones 54fde74c29 feat(analytics): Track another partying button 2015-09-07 22:31:41 -04:00
Sabe Jones 2c0d59989a feat(groups): Hide sync button when irrelevant 
Also extends the "your party chat is empty" message to have a counterpart in Guilds.
 2015-09-01 15:14:38 -04:00
Sabe Jones 6f85fcfde2 Merge branch 'develop' into sabrecat/party-page 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
 2015-09-01 13:40:20 -05:00
Blade Barringer 41c38c6e63 Merge branch 'TheHollidayInn-directives-test-task-focus' into develop 2015-08-31 20:36:07 -05:00
Blade Barringer f4ca8bb78d Rename task-focus focus-element 2015-08-31 20:31:03 -05:00
Blade Barringer 3e44c3a8ce Change focus-me to use task-focus 2015-08-31 20:16:14 -05:00
Blade Barringer ee0bcb5309 Correct class name 2015-08-30 17:52:16 -05:00
Blade Barringer 8cb11aa85d Remove merge conflict marking 2015-08-29 07:18:17 -05:00
Blade Barringer a0040d736f Merge branch 'develop' into sabrecat/party-page 2015-08-28 23:06:00 -05:00
Blade Barringer 4af1a4d6ac Rename image rendering class 2015-08-28 21:48:42 -05:00
Blade Barringer df3c498fcc Add rasterize class 2015-08-28 21:41:53 -05:00
Blade Barringer ce7d0039f8 Q-ify save functions 2015-08-24 17:36:06 -05:00
Blade Barringer 66d16fefc3 Send back 204 from questLeave route 2015-08-24 12:38:43 -05:00
Blade Barringer bc24fa8130 Add front end button to leave quest 2015-08-23 22:38:55 -05:00
Blade Barringer 6955add15d Use locale string 2015-08-23 15:05:49 -05:00
Blade Barringer 427fbb959b Add join existing party button 2015-08-23 14:59:06 -05:00
Blade Barringer 63315ce281 Remove extra ng-if 2015-08-23 10:23:41 -05:00
Blade Barringer 12137428e9 Show loading new party message when creating a solo party 2015-08-23 10:17:48 -05:00
Blade Barringer 1144defbca Restructure party page 2015-08-23 10:15:00 -05:00
Blade Barringer 74bef58537 Simplify text-centering 2015-08-23 09:32:59 -05:00
Blade Barringer 08edcb6743 Move loading new party to own partial 2015-08-23 09:31:46 -05:00
Blade Barringer 963b136a91 Reorg party views 2015-08-23 09:28:45 -05:00
Blade Barringer a36c08930e Separate out party sections 2015-08-23 09:24:55 -05:00