Commit Graph

2657 Commits

Author SHA1 Message Date
ojintoad a6106dc6ca removed space 2015-02-08 23:33:15 -05:00
ojintoad d3054a3c7b Adding blade to moderators list and graphic 2015-02-08 23:26:27 -05:00
Sabe Jones 4b96ee83b6 chore(news): 2/8 Bailey 2015-02-08 15:21:43 -06:00
Matteo Pagliazzi 7d139b4adc add quest invitation email (disabled for now) and fixes 2015-02-07 22:20:16 +01:00
Matteo Pagliazzi 637928371b better browser monitoring 2015-02-04 17:03:18 +01:00
Tyler Renelle 035fe8c0de Merge pull request #4625 from HabitRPG/lefnire/facebook-to-local
feat(facebook-to-local): allow users to move from facebook=>local
2015-02-03 19:27:20 -07:00
Tyler Renelle 5ec2c118a5 feat(facebook-to-local): allow users to move from facebook=>local 2015-02-03 19:23:49 -07:00
Sabe Jones 58af9622d6 chore(news): Feb backgrounds Bailey 2015-02-03 19:05:42 -06:00
Tyler Renelle b013c61b3b feat(change-email): remove blurb about changing email address 2015-02-03 15:46:51 -07:00
Tyler Renelle ca2c7a99ed Merge pull request #4621 from HabitRPG/lefnire/change-email
feat(change-email): allow changing email address
2015-02-03 15:40:06 -07:00
Tyler Renelle 8852ac6b69 feat(change-email): allow changing email address 2015-02-03 15:35:48 -07:00
Blade Barringer 1e642fa4a8 Closed #4616. Added modal attribute habitrpg-tasks directive to
determine whether modals should be appended to body or to the task
2015-02-03 10:29:36 -06:00
Alice Harris 1a8a688c61 add link variables to seasonalShopClosedText 2015-02-03 18:06:41 +10:00
Sabe Jones 1b0cd6b073 chore(news): Feb 2 Bailey 2015-02-02 19:06:52 -06:00
Sabe Jones 48246d6a72 feat(seasonal): Normal view 2015-02-02 18:55:06 -06:00
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