Commit Graph

2642 Commits

Author SHA1 Message Date
Matteo Pagliazzi d211bc7f86 feat(email-notifications): implement email notifications for events 2015-02-02 15:40:56 +01:00
Blade Barringer 403554ae3a Users cannot block admins. Also corrected logic so user cannot block
themselves
2015-02-01 15:26:16 -06:00
Blade Barringer cbc4e1efea Adjusted subscription page to use correct formatting with one time
bindings
2015-02-01 09:27:10 -06:00
Matt T Elliott 1da26acc93 fix jade vs angular 2015-02-01 09:27:10 -06:00
Matt T Elliott f6aefa5cf4 fix spacing 2015-02-01 09:27:09 -06:00
Matt T Elliott cec5797fc9 fix presskit and header 2015-02-01 09:27:09 -06:00
Matt T Elliott 978ba0186e fix bg popover translations 2015-02-01 09:25:44 -06:00
Matt T Elliott 71436288ff fix quest rewards translation 2015-02-01 09:25:44 -06:00
Matt T Elliott 0d08f3edb0 fix translations on presskt page 2015-02-01 09:25:43 -06:00
Matt T Elliott aefcd116ab fix translations on coupon page 2015-02-01 09:25:43 -06:00
Matt T Elliott 026b4ed716 add translations to subscription page 2015-02-01 09:25:43 -06:00
Matt T Elliott c31272a154 add subscriptitonRateText 2015-02-01 09:25:43 -06:00
Sabe Jones 18afb1ce18 Merge pull request #4592 from SabreCat/birthday
Habit Birthday 2015
2015-01-30 13:55:00 -06:00
Sabe Jones 47d14a1f99 fix(news): Prettify Bailey more 2015-01-30 13:51:48 -06:00
Sabe Jones 4fe4c01f3c fix(news): Left right left 2015-01-30 13:48:44 -06:00
Sabe Jones 0007e870ed chore(news): Bailey 2015-01-30 13:44:09 -06:00
negue 3e41b62bc9 Include mixins.jade also in layout.jade 2015-01-30 17:47:55 +01:00
negue e6a5feeeb6 Merge pull request #4590 from negue/fixAchievementsOnMobile
aLink mixin to handle mobile links
2015-01-30 00:17:10 +01:00
Negue e165f5dac4 move aLink to mixins.jade 2015-01-29 20:40:06 +01:00
Sabe Jones 4ebc2953f5 feat(event): Habit Birthday 2015 2015-01-29 13:02:26 -06:00
Blade Barringer 6b25797154 Added reminder about swearing to the tavern chat box 2015-01-29 12:22:26 -06:00
Negue 4a16deb50d aLink mixin to handle mobile links 2015-01-29 18:16:33 +01:00
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 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 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 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 b56c5af978 Changed popover text for quest scrolls. Closes #4575 2015-01-27 19:32:06 -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
Matt T Elliott 2c40097403 move from left div to right 2015-01-26 23:14:19 -08:00
Blade Barringer b9784fa4aa Added notice for rebirth in seasonal shop 2015-01-26 22:15:24 -06:00
Blade Barringer 7eae5db256 Added comment describing the silly conditional for transparency in the
seasonal shop
2015-01-26 19:25:53 -06:00
Blade Barringer 3b1743dee8 Corrected ng-class condition to show transparent class
on seasonal shop items after rebirth
2015-01-26 18:55:10 -06:00
Blade Barringer eceaaef954 Merge pull request #4567 from crookedneighbor/add-audio-watts
Added Watts' Theme to Audio Choices
2015-01-26 11:27:27 -06:00
Sabe Jones 65af7f362e Merge branch 'scrolls' into develop
Conflicts:
	views/shared/new-stuff.jade
2015-01-26 11:18:48 -06:00
Sabe Jones ad08f1be9a fix(news): Errant parenthesis 2015-01-26 11:11:04 -06:00
Sabe Jones 524761f1cf feat(mystery): January subscriber set 2015-01-26 11:00:02 -06:00
Blade Barringer de59c76609 Added watts themes to audio choices 2015-01-23 14:53:30 -06:00
Sabe Jones 412417505f feat(quests): Differentiated scrolls
Implements logic to show specific scroll images per quest, falling back to the present scroll image if none is present. Also implements a "locked scroll" picture for unavailable quests in addition to the current background dimming.
2015-01-23 10:40:32 -06:00
Sabe Jones ec114d6a3e chore(news): Victory Bailey
Also includes a fix to disallow party quest bosses from using Rage healing to exceed initial Health.
2015-01-23 10:20:50 -06:00
Blade Barringer 042f2fbceb Merge pull request #4498 from crookedneighbor/see-mp
See mp on stats page
2015-01-22 11:57:15 -06:00
Sabe Jones 9d7fc1efbb chore(news): Stress Strike 3 Bailey 2015-01-21 10:17:19 -06:00
Blade Barringer c73fb9eb31 Added in missing p tag 2015-01-20 16:44:49 -06:00
Blade Barringer d4ab70b174 Removed errant comma 2015-01-20 16:41:36 -06:00
Blade Barringer e95b238041 Gave credit to badge creators 2015-01-20 16:33:18 -06:00