Commit Graph

9205 Commits

Author SHA1 Message Date
Negue e165f5dac4 move aLink to mixins.jade 2015-01-29 20:40:06 +01:00
Sabe Jones 0cc819cc64 fix(event): Robes shop icon 2015-01-29 13:19:32 -06:00
Sabe Jones c8b9cf2873 feat(event): Habit Birthday 2015 2015-01-29 13:05:05 -06:00
Sabe Jones 4ebc2953f5 feat(event): Habit Birthday 2015 2015-01-29 13:02:26 -06:00
Blade Barringer 36a72e3da8 Updated tavern message per lemoness 2015-01-29 12:30:18 -06:00
Blade Barringer 6b25797154 Added reminder about swearing to the tavern chat box 2015-01-29 12:22:26 -06:00
Blade Barringer e2b9e03d8a Added reminder about swearing in the tavern 2015-01-29 12:21:54 -06:00
Matteo Pagliazzi 70ff1a8fee chore(i18n): update locales 2015-01-29 19:09:29 +01:00
Negue 4a16deb50d aLink mixin to handle mobile links 2015-01-29 18:16:33 +01:00
Matteo Pagliazzi 01d695cae5 fix(grunt): allow caching of spritesheets, fix #4542 2015-01-29 17:59:30 +01:00
Negue e2cd4dca19 open external links 2015-01-29 17:40:27 +01:00
Blade Barringer c9294897f7 Merge pull request #456 from Sporax/develop
Changed capitalization of 'dailies', 'daily', and 'habit(s)'
2015-01-29 10:06:55 -06:00
Blade Barringer 4aef4dfd0f Merge branch 'develop' into common-convert 2015-01-29 09:23:10 -06:00
Saagar Saini c69e3195df updated capitalization of habit(s), daily, dailies 2015-01-29 16:47:39 +05:30
Blade Barringer 154b8a00e5 Merge pull request #4585 from crookedneighbor/quest-scroll-popover-and-modal-changes
Quest scroll popover and modal changes
2015-01-28 15:39:32 -06:00
Blade Barringer 5f1d138241 Added comment about questPopover function 2015-01-28 15:38:41 -06:00
Blade Barringer 275f55cbfe Removed extra space 2015-01-28 15:36:13 -06:00
Blade Barringer c328d0fd3c Removed hp from popover function 2015-01-28 15:11:32 -06:00
Blade Barringer 043baf4961 Removed hp from modals 2015-01-28 15:10:21 -06:00
Blade Barringer e6e1ea086e Fixed alignment of notes on tasks 2015-01-28 14:51:51 -06:00
Blade Barringer d3d12bc638 Added popover-append-to-body to inventory popovers 2015-01-28 14:23:38 -06:00
Blade Barringer 84552597d6 Adjusted hrs for popovers 2015-01-28 14:00:06 -06:00
Blade Barringer 6acec132b0 Recompiled shared 2015-01-28 13:53:19 -06:00
Blade Barringer 6def48e77e Merge pull request #455 from crookedneighbor/new-tasks-for-onboarding
New tasks for onboarding
2015-01-28 13:52:12 -06:00
Blade Barringer 75eb6304eb Renamed variable name 2015-01-28 13:51:03 -06:00
Blade Barringer 520df87362 fixed default todo note 2015-01-28 13:50:11 -06:00
Blade Barringer 21be3e8957 Adjusted default tasks per lemoness 2015-01-28 13:43:15 -06:00
Blade Barringer 4c6bf8f543 Added append to body to quest scroll popovers 2015-01-28 13:37:34 -06:00
Matteo Pagliazzi 50bc48f325 fix(share): addthis in static pages 2015-01-28 20:32:35 +01:00
Blade Barringer ca897d7cf3 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-28 10:56:57 -06:00
Blade Barringer 23c31083ef Fixed triad count to actually check and make sure count is 90 2015-01-28 10:56:16 -06:00
Matteo Pagliazzi dca6880d13 chore(i18n): update locales 2015-01-28 17:30:54 +01:00
Saagar Saini cd19ef9607 changed capitalization of 'dailies', 'daily', and 'habit(s)' 2015-01-28 20:08:09 +05:30
benmanley dc5f980083 fix(tasks): improve habit icon alignment
See #4539

Align habit buttons using a different CSS technique to prevent plus
icon from being cropped on Chrome for Windows.
2015-01-28 13:25:24 +00:00
Blade Barringer 7ef0c70b8b Added placeholder blank notes 2015-01-27 21:52:54 -06:00
Blade Barringer b890326545 Added new tasks for onboarding per lemoness 2015-01-27 21:50:41 -06:00
Blade Barringer e19cf6b37f Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop 2015-01-27 20:46:18 -06:00
Blade Barringer 70d3901000 New strings for quest modal 2015-01-27 20:46:01 -06:00
Blade Barringer d8e09884a0 Added quest image and info to quest invitation modal 2015-01-27 20:37:09 -06:00
Blade Barringer a77a46c543 Added one time bindings to quest modals 2015-01-27 20:27:14 -06:00
Blade Barringer eaaa09c75a Added quest details to buy quest and show quest modals 2015-01-27 20:16:11 -06:00
Blade Barringer 4e1716a8db Added hp to quest popover 2015-01-27 20:15:28 -06:00
Blade Barringer b56c5af978 Changed popover text for quest scrolls. Closes #4575 2015-01-27 19:32:06 -06:00
Matteo Pagliazzi 5ba1e96b3c chore(i18n): update locales 2015-01-27 20:36:03 +01:00
Sabe Jones 6a1e9e616d chore(grunt): grunt sprite 2015-01-27 12:01:12 -06:00
Sabe Jones b8d9f047b1 fix(sprites): Rooster recolors
Fixes https://github.com/HabitRPG/habitrpg/issues/4576.
2015-01-27 11:54:16 -06:00
Blade Barringer 0096873cf5 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-27 09:47:03 -06:00
Blade Barringer 58650baba3 Merge branch 'issue#4556' of https://github.com/matttelliott/habitrpg into border 2015-01-27 09:10:46 -06:00
Matteo Pagliazzi 42c0b443d7 fix(i18n): language selection working on static pages 2015-01-27 15:48:57 +01:00
Alice Harris 68573b1f31 Merge pull request #453 from Sporax/develop
changed description for A stern talking-to from - habit to negative Habit - fixes https://github.com/HabitRPG/habitrpg/issues/4570
2015-01-27 19:05:48 +10:00