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
3f4d266b00
refactor(bs3): sync with develop
2014-02-04 19:59:48 +01:00
4c094ebf47
Merge pull request #2729 from deilann/fixclass
...
pull correct information for member modal class
2014-02-03 12:45:56 -08:00
1a652eefd6
pull correct information for member modal class
2014-02-03 12:42:09 -08:00
2e2fcfcf46
fix(swagger): fix jade script warning in swagger
2014-02-03 11:53:52 -07:00
4d32092e8f
refactor(addthis): remove superfluous addthis inclusion
2014-02-03 11:53:32 -07:00
67ee011aa3
fix(footer): ensure window.env is accessible from static pages, so we
...
can get deferred scripts on frontpage (esp google analytics)
2014-02-03 11:43:03 -07:00
56133894d8
refactor(bs3): sync with develop
2014-02-03 18:45:25 +01:00
f8796e9028
feat(winter): remove purchasable winter hair colors, keep available if
...
they purchased during event
2014-02-02 23:17:54 -07:00
8eaa5f6e9f
Merge pull request #2717 from lorian/mouseover-tags
...
Hovering over a task's tag icon displays a list of that task's tag
2014-02-02 19:54:23 -08:00
4f911a68d8
fix(buffs): Move help bubble to left of special buffs
...
Corrects an issue where the popover text for Stealth and Chilling Frost inherited the "strong" formatting of the buff name label, and improves visual consistency with the attribute readout above them.
2014-02-02 21:19:01 -06:00
e99118b6a7
Edited appliedTags call to actually call the correct function; now hovering over a task's tag icon displays a list of that task's tags.
2014-02-02 16:35:36 -08:00
f193790550
Merge pull request #2698 from deilann/fixstats
...
changing order of stats in character build
2014-02-02 15:58:54 -08:00
2e3ee3f97c
removes progress bar of unfeedable pets
2014-02-02 13:22:24 -08:00
07593dc122
refactor(bs3): port quests modals, fix restore modal and various bugs
2014-02-02 16:43:58 +01: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
3e077fea6d
refactor(bs3): port rebirth and reroll modals, misc fixes
2014-02-02 13:52:42 +01:00
211be37cfc
refactor(bs3): fix classes modal
2014-02-02 13:42:29 +01:00
f31723b0ab
refactor(bs3): sync with develop
2014-02-02 13:26:35 +01:00
527f230ee5
Merge pull request #2701 from deilann/wizardtomage
...
Change "Wizard" to "Mage" in member modal & inventory
2014-02-01 16:21:32 -08:00
dafd015173
wizard to mage in inventory
2014-02-01 15:20:02 -08:00
8843577858
show mage not wizard in inventory and member modal
2014-02-01 15:17:14 -08:00
d581986dd9
changing order of stats in character build
2014-02-01 13:14:51 -08:00
8b29eb530a
refactor(bs3): port drops modals
2014-02-01 19:39:05 +01:00
f6a8b9e4cb
refactor(bs3): port some modals & css fixes
2014-02-01 19:19:48 +01:00
0afaa69d7d
Created new CSS entry for equipment title and modified inventory.jade accordingly
2014-02-01 13:17:21 -05: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
0a047f5b2f
Merge branch 'develop' into paglias/bs3
2014-02-01 16:47:32 +01:00
ff49695635
refactor(bs3): misc fixes & port death modal
2014-02-01 16:46:48 +01:00
52f8f0d5b0
feat(winter): remove winter scrolls & snowballs
2014-02-01 07:43:25 -08:00
a9d7add1e3
chore(bailey): baconsaur update
2014-01-31 22:03:52 -07:00
b29231056b
chore(bailey): vice notif
2014-01-31 15:36:47 -07:00
800231cf64
feat(quests): allow html in quest notes
2014-01-31 15:06:56 -07:00
49e1bf1ba4
refactor(bs3): fix
2014-01-31 22:05:09 +01:00
823296fc41
refactor(bs3): sync with develop
2014-01-31 21:56:39 +01:00
f4c30390f5
refactor(bs3): start porting app, general layout and filters
2014-01-31 21:18:44 +01:00
179316e10f
feat(restore): add restore-gp back in. Parly to end the winter event,
...
partly due to the convo at #2681 regarding subscriptions. Fixes #2681
2014-01-31 12:54:37 -07:00
4ba5a9cf26
refactor(restore): remove restore-gear commented-out code, that stuff is
...
incompatible with new gear setup (circa class system)
2014-01-31 12:50:13 -07:00
cc348b2f11
refactor(bs3): sync with develop & misc
2014-01-31 20:04:40 +01:00
0764aa8c17
refactor(bs3): convert icons to new format
2014-01-31 19:47:48 +01:00
0a0c6c73a5
chore(bailey): fix bailey notifs to say Jan 31 for cut off dates @lemoness
2014-01-30 21:34:06 -07:00
aff885c05c
feat(habitBirthday): add habitrpg birthday event. includes cakes for all
...
pets, absurd party robes, npc swap, badge, etc. @lemoness
2014-01-30 19:20:07 -07:00
2e64b03a63
Fixed inventory alignment. Issue #2158
2014-01-30 19:58:34 -05:00
49ec9d2e5c
Fixed inventory alignment. Issue #2158
2014-01-30 19:57:50 -05:00
c7c6181bbc
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-01-30 22:26:28 +01:00
76db2d49c2
18n(merge): merge @Sinza- pr, @lefnire now it is ready
2014-01-30 22:25:42 +01:00
Matteo Pagliazzi