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

114 Commits

Author SHA1 Message Date
Tyler Renelle 07a47d353d Merge pull request #2666 from marcgenesis/develop 
Fixed inventory alignment. Issue #2158
 2014-02-04 11:00:52 -08:00
Cole Gleason 61a4a90d2c Merge pull request #2610 from etryn/develop 
Fixed unnecessary margin on button group buttons
 2014-02-01 23:56:43 -08:00
Marc-André Larivière 875698c111 Created new CSS entry for equipment-title and modified inventory.jade accordingly 2014-02-01 12:52:38 -05:00
Tyler Renelle a582a0546d feat(marketing): some frontpage updates, a screenshot, & "contact us" 
button mods
 2014-01-28 10:36:05 -08:00
Tyler Renelle 66f95cdd4c feat(premium): updates to group plans info page 2014-01-28 09:22:46 -08:00
Etryn 9fa8646768 Fixed unnecessary margin on button group buttons 
Buttons in groups in bootstrap are styled to touch on inside edges to
appear joined, so should not have a 5 px margin between them.
 2014-01-28 01:13:24 -08:00
Tyler Renelle f7f4a0c166 feat(administrators): start adding features page for admin accounts 2014-01-27 18:24:24 -08:00
Tyler Renelle 0ddaae4d75 feat(homepage): start cleaning up homepage, add navbar for play button & upcoming links 2014-01-27 17:40:43 -08:00
Tyler Renelle 2e18f0eb82 feat(premium): backport client-side premium code to public repo, it's 
client-side anyway (@colegleason @paglias)
 2014-01-27 16:34:22 -08:00
Tyler Renelle 47bcaf83e7 feat(homepage): use .marketing for centering, add playbutton as static 
in footer. This is pretty
ugly (http://gyazo.com/215e20729569689ab48cf56c71c1fe28), let's iterate
/ prettify. @deilann
 2014-01-26 14:22:01 -08:00
Dušan Juretić 70001b1feb Mark collected items in collection quests 2014-01-24 22:28:19 -03:00
Tyler Renelle 9fa4521739 feat(challenges): add angular-ui-select2 for simpler find/select 
challenge winner.
 2014-01-22 23:22:21 -08:00
Sabe Jones 6e821fa681 Create drop notification Growl style 2014-01-14 22:02:22 -06:00
Sabe Jones 1a92ec1748 Beef up critical hit notification with its own style and icon 2014-01-07 12:03:07 -06:00
steve hiemstra fd56c17518 work on #2183 resize checklist items 
such that they resize dynamically; however the text will still not wrap
due to the fact that it is an input.
 2014-01-06 21:21:01 -05:00
Tyler Renelle f6e6d115ac chat: add +1 (like) to messages. @snicker does views/options/social/chat-message.jade flag you for any performance issues which should be optimized with bindonce? (I'm still a bit of a bo-noob) 2014-01-05 22:12:02 -07:00
Tyler Renelle 7f3b6a4470 Merge pull request #2209 from benblank/pet-alignment 
Fix (apparent) misalignment of paws on pets/mounts grids
 2014-01-01 20:14:44 -08:00
Ben Blank 56613910f0 prevent popover shadows from being clipped/overlapped 2013-12-31 14:58:47 -08:00
Ben Blank 32d1ff68b4 fix apparent misalignment of paws on pets/mounts grids 2013-12-31 14:34:24 -08:00
Tyler Renelle 968b091ccd checklists: checklist as <li> instead of <label>, so that inline-editing 
doesn't trigger checkmark. Unfortunately means we need to replicate some
bootstrap css
 2013-12-30 10:33:48 -07:00
Tyler Renelle 74c905f1e1 checklists WIP 2013-12-30 10:33:17 -07:00
Tyler Renelle 61dfb8d129 Merge pull request #2086 from HabitRPG/sabe/tweak2 
Remove sliding effect on avatar mouseover
 2013-12-29 16:19:09 -08:00
Tyler Renelle e9cb9b8a9f task-icons: larger emoji in task text than chat 2013-12-29 01:24:02 -07:00
Tyler Renelle e863d5927a Merge pull request #2138 from HabitRPG/sabe/tweak4 
Remove padding from <li> when used in Markdown
 2013-12-27 07:53:52 -08:00
Tyler Renelle 13e1792685 Merge pull request #2123 from HabitRPG/sabe/tweak3 
Fix #2072 (add Mana delta alerts)
 2013-12-27 07:53:12 -08:00
Sabe Jones f3798c0bc8 Remove padding from <li> when used in Markdown 2013-12-27 08:56:55 -06:00
Sabe Jones 601af6ddc0 Make better use of space for customizations and Market 2013-12-26 07:56:01 -06:00
Sabe Jones 3074cc8f16 Fix #2072 (add Mana delta alerts) 2013-12-26 07:31:00 -06:00
Tyler Renelle ecb354e2cc Quests: initial Bosses WIP - invite, accept, reject, etc 2013-12-22 17:46:54 -07:00
Sabe Jones 485209ed74 Remove sliding effect on avatar mouseover 2013-12-22 12:20:35 -06:00
Tyler Renelle 8b8f385fff winter: make bailey head more visible with holiday gear (remember to 
revert this after 1/31!)
 2013-12-20 23:14:08 -07:00
Tyler Renelle 676112c1b5 winter event! npcs, snowball=>snowman, new hairs/beards. Fixes to beard/chin overlays. move Fortify Service => "Fortify Potion" Special. @sabrecat let me know what you think: http://gyazo.com/55cd424f104b8f3acb557b99d918cb4b). Sorry for mixing concerns in this commit, some rebase difficulties 2013-12-20 10:26:23 -07:00
Tyler Renelle 12cc6f51eb classes: reposition inventory, fix saddle confirm dialog, gems & food tweaks 2013-12-15 13:25:19 -07:00
Tyler Renelle 26697546e8 classes: header z-index:100, generalized shop_money classes, only show 
owned gear if == true
 2013-12-14 11:34:41 -07:00
Tyler Renelle 478be61113 fix(classes) misc class fixes (not @snicker, ng-if on item store since 
we dynamically swap it sometimes)
 2013-12-12 20:03:32 -07:00
Tyler Renelle f8f8a1334b Merge branch 'develop' into classes 
Conflicts:
	views/options/inventory/stable.jade
 2013-12-07 20:23:26 -07:00
Tyler Renelle 88c64a6f80 classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9 2013-12-04 16:52:06 -07:00
Tyler Renelle 19b6eb73e0 Merge branch 'develop' into classes 
Conflicts:
	public/css/index.styl
	src/models/user.js
	views/options/profile.jade
	views/shared/header/avatar.jade
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
 2013-12-02 18:24:33 -07:00
Nick Gordon aa133cc5c6 removes line on li elements in markdown, fixes #1951 2013-12-02 15:37:09 -08:00
Tyler Renelle 7200ab16f4 thanksgiving: back to normal 2013-11-30 10:25:51 -07:00
Tyler Renelle 7c20988c41 Merge branch 'thanksgiving' into develop 2013-11-27 11:53:18 -07:00
Tyler Renelle db5befb570 thanksgiving turkey & npcs 2013-11-27 11:50:18 -07:00
Matteo Pagliazzi bdf32325f6 remove emoji css from manifest and move into index.styl 2013-11-27 16:19:56 +01:00
Matteo Pagliazzi 17c97308f3 stable, pets row 100% width 2013-11-25 16:50:51 +01:00
Nick Gordon 38225896f4 fix for https://github.com/HabitRPG/habitrpg/issues/1860 change tags to scroll horizontally rather than stack floating left 2013-11-23 17:37:20 -08:00
Nick Gordon b793d2b753 fix for https://github.com/HabitRPG/habitrpg/issues/1900 2013-11-23 16:45:14 -08:00
Nick Gordon 2604d8e21e fix for https://github.com/HabitRPG/habitrpg/issues/1903 2013-11-23 16:20:34 -08:00
Tyler Renelle 83e3a6aff2 classes WIP 2013-11-23 16:59:41 -07:00
Adrien Lemaire 47cf0eb07d add npc color, update leader background 2013-11-24 10:49:33 +11:00
Tyler Renelle c5a42cbf5a Merge pull request #1899 from Fandekasp/header_colors 
change avatars lvl colors
 2013-11-23 13:12:36 -08:00