685b7a3cd2
Merge branch 'develop' into paglias/bs3
2014-02-04 20:16:00 +01:00
07a47d353d
Merge pull request #2666 from marcgenesis/develop
...
Fixed inventory alignment. Issue #2158
2014-02-04 11:00:52 -08:00
571954b5cf
refactor(bs3): misc fixes, port restore, delete and reset modals
2014-02-02 16:06:30 +01:00
317a148760
refactor(bs3): port newStuff and member modals, misc fixes
2014-02-02 15:55:01 +01:00
f31723b0ab
refactor(bs3): sync with develop
2014-02-02 13:26:35 +01:00
61a4a90d2c
Merge pull request #2610 from etryn/develop
...
Fixed unnecessary margin on button group buttons
2014-02-01 23:56:43 -08:00
f6a8b9e4cb
refactor(bs3): port some modals & css fixes
2014-02-01 19:19:48 +01:00
875698c111
Created new CSS entry for equipment-title and modified inventory.jade accordingly
2014-02-01 12:52:38 -05:00
4dcf74a38a
refactor(bs3): port avatar level label
2014-02-01 17:18:37 +01:00
af42ec263e
refactor(bs3): port several modals & css fixes
2014-02-01 17:04:21 +01:00
ff49695635
refactor(bs3): misc fixes & port death modal
2014-02-01 16:46:48 +01:00
f4c30390f5
refactor(bs3): start porting app, general layout and filters
2014-01-31 21:18:44 +01:00
7354efc1d5
refactor(bs3): working register & prettier login modal
2014-01-29 21:28:11 +01:00
4c9da6883f
refactor(bs3): static pages
...
works everything exeception made for the login modal, it opens but since this directive has had a lot of changes in angular-ui-bootstrap it will require more work (like all modals), @lefnire
2014-01-29 18:26:58 +01:00
f0ebd597b3
refactor(dependencies): update dependencies for bootstrap 3 upgrade @lefnire
2014-01-29 16:44:12 +01:00
a582a0546d
feat(marketing): some frontpage updates, a screenshot, & "contact us"
...
button mods
2014-01-28 10:36:05 -08:00
66f95cdd4c
feat(premium): updates to group plans info page
2014-01-28 09:22:46 -08:00
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
f7f4a0c166
feat(administrators): start adding features page for admin accounts
2014-01-27 18:24:24 -08:00
0ddaae4d75
feat(homepage): start cleaning up homepage, add navbar for play button & upcoming links
2014-01-27 17:40:43 -08:00
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
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
70001b1feb
Mark collected items in collection quests
2014-01-24 22:28:19 -03:00
9fa4521739
feat(challenges): add angular-ui-select2 for simpler find/select
...
challenge winner.
2014-01-22 23:22:21 -08:00
6e821fa681
Create drop notification Growl style
2014-01-14 22:02:22 -06:00
1a92ec1748
Beef up critical hit notification with its own style and icon
2014-01-07 12:03:07 -06:00
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
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
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
56613910f0
prevent popover shadows from being clipped/overlapped
2013-12-31 14:58:47 -08:00
32d1ff68b4
fix apparent misalignment of paws on pets/mounts grids
2013-12-31 14:34:24 -08:00
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
74c905f1e1
checklists WIP
2013-12-30 10:33:17 -07:00
61dfb8d129
Merge pull request #2086 from HabitRPG/sabe/tweak2
...
Remove sliding effect on avatar mouseover
2013-12-29 16:19:09 -08:00
e9cb9b8a9f
task-icons: larger emoji in task text than chat
2013-12-29 01:24:02 -07:00
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
13e1792685
Merge pull request #2123 from HabitRPG/sabe/tweak3
...
Fix #2072 (add Mana delta alerts)
2013-12-27 07:53:12 -08:00
f3798c0bc8
Remove padding from <li> when used in Markdown
2013-12-27 08:56:55 -06:00
601af6ddc0
Make better use of space for customizations and Market
2013-12-26 07:56:01 -06:00
3074cc8f16
Fix #2072 (add Mana delta alerts)
2013-12-26 07:31:00 -06:00
ecb354e2cc
Quests: initial Bosses WIP - invite, accept, reject, etc
2013-12-22 17:46:54 -07:00
485209ed74
Remove sliding effect on avatar mouseover
2013-12-22 12:20:35 -06:00
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
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
12cc6f51eb
classes: reposition inventory, fix saddle confirm dialog, gems & food tweaks
2013-12-15 13:25:19 -07:00
26697546e8
classes: header z-index:100, generalized shop_money classes, only show
...
owned gear if == true
2013-12-14 11:34:41 -07:00
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
f8f8a1334b
Merge branch 'develop' into classes
...
Conflicts:
views/options/inventory/stable.jade
2013-12-07 20:23:26 -07:00
88c64a6f80
classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9
2013-12-04 16:52:06 -07:00
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
Matteo Pagliazzi