Commit graph

542 commits

Author SHA1 Message Date
Tyler Renelle
bfc6bf44ff feat(accessories): head accessory 2014-03-21 13:17:17 -06:00
Tyler Renelle
531fe5eb31 feat(flower): add flower customization option 2014-03-21 12:29:57 -06:00
Tyler Renelle
2661034fbd Merge pull request #3076 from benmanley/toolbar-restyle
Redesign navbar
2014-03-21 12:29:06 -06:00
benmanley
3a899cf3a4 Fix broken logout link in submenu 2014-03-19 14:31:25 +00:00
Peter Hatch
31af4bdfcc In class choice popup, added a space between 'Choose your' and 'Class!'. 2014-03-19 00:06:48 -07:00
Tyler Renelle
809008e753 chore(bailey): pet mechanics, wondercon, LH poll 2014-03-18 16:19:06 -06:00
benmanley
ea650c8acf Fix gap at bottom of toolbar and remove unused code 2014-03-18 20:14:29 +00:00
benmanley
a5bce9e8b6 Close submenu when a navigation link is clicked 2014-03-18 17:33:14 +00:00
benmanley
055c25fac3 Remove gold and silver totals from Reward list 2014-03-18 17:30:57 +00:00
benmanley
addb05686b Hide .navbar-info on mobile until toggled 2014-03-17 23:47:43 +00:00
benmanley
bd79234570 Hide toolbar-submenu until toggled 2014-03-17 23:42:04 +00:00
benmanley
543e3695c2 Improve navbar layout
Make navbar fixed for desktop and static for mobile.
2014-03-16 23:53:15 +00:00
benmanley
6ca6bbedec Move sync button from submenu into navbar 2014-03-15 18:21:11 +00:00
benmanley
495e0fe60f Change hardcoded text to variable 2014-03-15 13:05:31 +00:00
benmanley
eef5e55ad9 Redesign navbar
Restyle navigation and improve mobile layout
2014-03-14 23:32:32 +00:00
James Hsiao
f192e2df39 fixed  /space issue 2014-03-10 08:57:41 -04:00
Tyler Renelle
7dcc9e29ea Merge pull request #2987 from thepeopleseason/member-modal-spacing
Member modal spacing
2014-03-09 16:48:55 -06:00
Tyler Renelle
cbd6e6f4e8 Merge pull request #3002 from Omnomnobot/patch-2
Update API footer link
2014-03-09 16:47:41 -06:00
Sabe Jones
d3f755d30c fix(buffs): Even out spacing on level tag
Inline CSS is bad! Also the buff icon looked lopsided on a character who also had the Rebirth badge.
2014-03-08 17:15:33 -06:00
Tyler Renelle
658598f9ea fix(extensions): redirect extensions page to wikia, fixes #3022 2014-03-07 12:14:54 -07:00
Omnomnobot
9daf3c2f97 Update API footer link
The Wiki page here on Github is quite useless now, the most useful infos are in https://habitrpg.com/static/api an the official Wiki
2014-03-04 22:41:29 +01:00
Matteo Pagliazzi
2321b40753 fix(i18n): do not translate DELETE when used to delete account 2014-03-04 19:53:15 +01:00
Tyler Renelle
129189f033 chore(bailey): bailey for march mystery 2014-03-02 14:40:11 -07:00
James Hsiao
a5cdbcc158 added spacing for member modal 2014-03-02 09:38:01 -05:00
Tyler Renelle
82c6c14985 chore(bailey): hedgehog quest 2014-03-01 08:41:47 -07:00
Matteo Pagliazzi
010883409d fix(i18n): use string for new subscriber item 2014-02-23 12:12:00 +01:00
Tyler Renelle
fda191ffc2 chore(bailey): mystery item 2014-02-22 22:10:39 -08:00
Tyler Renelle
a1e66ab99e feat(premium): mystery item notif in toolbar 2014-02-22 21:00:10 -08:00
Tyler Renelle
7311850d09 feat(accessories): add back accessory 2014-02-22 20:38:16 -08:00
Tyler Renelle
aaa38a5070 fix(static): move About => Features 2014-02-21 17:58:43 -08:00
Matteo Pagliazzi
d70b6fca17 Merge pull request #2875 from thepeopleseason/challenges_spacing_fix
Challenges spacing fix
2014-02-21 19:35:19 +01:00
Tyler Renelle
c13b18030b fix(rewards): hide special event spells section if empty, fixes #2909 2014-02-20 17:52:46 -08:00
James Hsiao
9fe8da3c12 fix space issues: contrib modal, challenge list 2014-02-20 20:33:10 -05:00
Tyler Renelle
02c283b628 chore(Merge): remote-tracking branch 'marcgenesis/develop' into develop
Conflicts:
	views/options/settings.jade
2014-02-20 16:34:28 -08:00
Matteo Pagliazzi
477937a72c fix(i18n): add missing string 2014-02-19 17:27:07 +01:00
Matteo Pagliazzi
7baaf42884 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2014-02-18 20:31:14 +01:00
Matteo Pagliazzi
3cbe848f0c fix(i18n): add string 2014-02-18 20:30:59 +01:00
Tyler Renelle
f25fd411df chore(bailey): translations, bountysource 2014-02-18 11:11:35 -08:00
Tyler Renelle
55782512bf feat(valentine): remove valentine event 2014-02-18 11:22:31 -07:00
Marc-André Larivière
dc75834ec4 Changed hints style (and small quick fixes) 2014-02-16 10:13:16 -05:00
Matteo Pagliazzi
4018ec885b fix(header): use strings and a small css fix 2014-02-16 14:51:48 +01:00
deilann
a624ea702d fix inventory dropdown for pets 2014-02-15 06:48:29 -08:00
Matteo Pagliazzi
8f19f225f1 fix(misc): some styles & translations 2014-02-14 18:35:21 +01:00
Sabe Jones
e241429cc3 fix(toolbar): Tweak Settings drop-down
"Site" was the best I could come up with for all the miscellany in Settings > Settings.
2014-02-14 08:14:02 -06:00
Sabe Jones
4454204f47 fix(toolbar): Tweak icon popovers
Changed "Profile" toolbar icon popover to "User" and "Market" icon popover to "Inventory". Straightens out weird paths, so you don't go "Market > Market" or "Profile > Profile".
2014-02-13 20:39:22 -06:00
Tyler Renelle
677c83c592 chore(bailey): valentine 2014-02-13 18:45:36 -07:00
Tyler Renelle
fd6eb8724e feat(valentine): valentine event 2014-02-13 18:40:33 -07:00
Tyler Renelle
7456f00dc6 feat(toolbar): try with icons instead of text, test against prod / beta
& get a vote.
2014-02-12 22:17:26 -07:00
Tyler Renelle
5501d57e10 fix(toolbar): tweaks 2014-02-12 21:51:35 -07:00
Tyler Renelle
f6abfc67b3 feat(tracking): gems > toolbar separately from wallet 2014-02-12 21:44:27 -07:00
Tyler Renelle
2750548d35 chore(bailey): bailey for chat notifs & toolbar 2014-02-12 21:37:14 -07:00
Tyler Renelle
c95c6a4c3b chore(modals): remove mathUpdates modal (no longer in use). reference
this commit for any future emergency updates
2014-02-12 21:24:50 -07:00
Tyler Renelle
f72cb21300 feat(toolbar): add toolbar featuring navigation, gems / subs, bailey, &
chat / invite notifications
2014-02-12 21:21:36 -07:00
Matteo Pagliazzi
c4244bc3b6 fix(misc) 2014-02-11 21:43:17 +01:00
Matteo Pagliazzi
fa2c64d2d8 chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings 2014-02-11 19:30:55 +01:00
Matteo Pagliazzi
19139f562b fix(misc): isStaticPage and debug buttons 2014-02-11 18:44:22 +01:00
Tyler Renelle
2480591444 refactor(bs3): put paypal button back in, use javascript API to
construct button on `ng-init` (since you can't nest script tags)
2014-02-10 13:28:16 -07:00
Tyler Renelle
ffb42906e1 feat(event-tracking): start adding some client-side GA event-tracking 2014-02-10 11:33:40 -07:00
Matteo Pagliazzi
3f28d16478 refactor(bs3): add fixed height modals & panels 2014-02-09 16:25:10 +01:00
Matteo Pagliazzi
1a44c3cf0c refactor(bs3): css 2014-02-09 16:16:43 +01:00
Matteo Pagliazzi
5874941b94 refactor(bs3): inventory & misc 2014-02-09 12:32:12 +01:00
Matteo Pagliazzi
46053cc520 refactor(bs3): spaces 2014-02-08 20:10:37 +01:00
Matteo Pagliazzi
5e98fa013d refactor(bs3): typo 2014-02-08 19:56:31 +01:00
Matteo Pagliazzi
9ea9ed841d refactor(bs3): buyQuest fix, add back badges colors, minor fixes 2014-02-08 19:20:10 +01:00
Matteo Pagliazzi
0fe0cb4f2d refactor(bs3): labels style and text, buttons classes 2014-02-08 16:27:34 +01:00
Tyler Renelle
37340d2318 fix(mounts): fix pets & mounts css to position the user based on
pet/mount equip
2014-02-07 21:48:11 -07:00
Tyler Renelle
3473b73452 chore(Merge): branch 'develop' into bs3
Conflicts:
	views/options/inventory/inventory.jade
2014-02-07 17:42:12 -07:00
Tyler Renelle
5d0ef55429 chore(bailey): update with stability info & subscriber links 2014-02-07 13:43:41 -07:00
Tyler Renelle
677d23939d chore(bailey): add images for previous commit 2014-02-07 11:53:01 -07:00
Tyler Renelle
82241634b3 chore(bailey): bailey re: rainbow hair, critical hammer, mystery item 2014-02-07 11:42:05 -07:00
Matteo Pagliazzi
e4bd817443 refactor(bs3): sync with develop 2014-02-06 17:36:33 +01:00
Matteo Pagliazzi
90e9a1aeaa i18n(refactor): load all files in a locale, not the ones defined in app.json, move env.t client code to own file, add env.isStaticPage (from isFrontPage) 2014-02-06 17:17:21 +01:00
Matteo Pagliazzi
5d4d82ad51 refactor(bs3): port options (profile, inventory, social (groups and hall)) and misc 2014-02-05 19:05:42 +01:00
Matteo Pagliazzi
ce5edbee58 refactor(bs3): consistent style for modals 2014-02-05 16:51:35 +01:00
Matteo Pagliazzi
ccc1230828 refactor(bs3): misc 2014-02-04 22:21:12 +01:00
Matteo Pagliazzi
d711d61a1f refactor(bs3): re-enable two columns views for tablets 2014-02-04 21:54:19 +01:00
Matteo Pagliazzi
c663221229 refactor(bs3): misc fixes, use bootstrap own grid for tasks lists 2014-02-04 21:27:05 +01:00
Matteo Pagliazzi
3f4d266b00 refactor(bs3): sync with develop 2014-02-04 19:59:48 +01:00
Tyler Renelle
4c094ebf47 Merge pull request #2729 from deilann/fixclass
pull correct information for member modal class
2014-02-03 12:45:56 -08:00
deilann
1a652eefd6 pull correct information for member modal class 2014-02-03 12:42:09 -08:00
Matteo Pagliazzi
56133894d8 refactor(bs3): sync with develop 2014-02-03 18:45:25 +01:00
Cole Gleason
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
Sabe Jones
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
Lorian
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
Matteo Pagliazzi
07593dc122 refactor(bs3): port quests modals, fix restore modal and various bugs 2014-02-02 16:43:58 +01:00
Matteo Pagliazzi
571954b5cf refactor(bs3): misc fixes, port restore, delete and reset modals 2014-02-02 16:06:30 +01:00
Matteo Pagliazzi
317a148760 refactor(bs3): port newStuff and member modals, misc fixes 2014-02-02 15:55:01 +01:00
Matteo Pagliazzi
3e077fea6d refactor(bs3): port rebirth and reroll modals, misc fixes 2014-02-02 13:52:42 +01:00
Matteo Pagliazzi
211be37cfc refactor(bs3): fix classes modal 2014-02-02 13:42:29 +01:00
Matteo Pagliazzi
f31723b0ab refactor(bs3): sync with develop 2014-02-02 13:26:35 +01:00
Tyler Renelle
527f230ee5 Merge pull request #2701 from deilann/wizardtomage
Change "Wizard" to "Mage" in member modal & inventory
2014-02-01 16:21:32 -08:00
deilann
8843577858 show mage not wizard in inventory and member modal 2014-02-01 15:17:14 -08:00
Matteo Pagliazzi
8b29eb530a refactor(bs3): port drops modals 2014-02-01 19:39:05 +01:00
Matteo Pagliazzi
f6a8b9e4cb refactor(bs3): port some modals & css fixes 2014-02-01 19:19:48 +01:00
Matteo Pagliazzi
4dcf74a38a refactor(bs3): port avatar level label 2014-02-01 17:18:37 +01:00
Matteo Pagliazzi
af42ec263e refactor(bs3): port several modals & css fixes 2014-02-01 17:04:21 +01:00
Matteo Pagliazzi
0a047f5b2f Merge branch 'develop' into paglias/bs3 2014-02-01 16:47:32 +01:00
Matteo Pagliazzi
ff49695635 refactor(bs3): misc fixes & port death modal 2014-02-01 16:46:48 +01:00
Tyler Renelle
a9d7add1e3 chore(bailey): baconsaur update 2014-01-31 22:03:52 -07:00
Tyler Renelle
b29231056b chore(bailey): vice notif 2014-01-31 15:36:47 -07:00