Commit Graph

913 Commits

Author SHA1 Message Date
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 978ba0186e fix bg popover translations 2015-02-01 09:25:44 -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
Blade Barringer 6b25797154 Added reminder about swearing to the tavern chat box 2015-01-29 12:22:26 -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
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
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
Blade Barringer c3c144223a Merge branch 'develop' into mountmaster 2015-01-19 14:47:17 -06:00
Blade Barringer 1318d0de38 Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting
Group Sorting
2015-01-18 23:08:40 -06:00
Blade Barringer 5d572c2a40 Merge pull request #4501 from crookedneighbor/fix-day-start
Closes #4490. Day start saves on blur instead of change
2015-01-18 22:57:23 -06:00
Blade Barringer 137ff71bc8 Added one way binding for email 2015-01-18 15:55:39 -06:00
Blade Barringer e0a081b0ff Adjusted spacing and line breaks 2015-01-18 15:55:39 -06:00
Blade Barringer cdad6e36da Adjusted some spacing and line breaks 2015-01-18 15:55:39 -06:00
Blade Barringer 4a5fe1867d Removed target="_blank" attribute from mailto link 2015-01-18 15:55:39 -06:00
scribblypanda b3c9371d9f changed links to relative, corrected mailto link 2015-01-18 15:55:39 -06:00
scribblypanda 1c151f57c2 applied .muted to text so less cluttered looking 2015-01-18 15:55:39 -06:00
scribblypanda b978852e11 added description of login name and link to page to edit display name 2015-01-18 15:55:39 -06:00
scribblypanda ae90889dec added description of display name and link to page to edit login name 2015-01-18 15:55:39 -06:00
scribblypanda 18317f3346 fixed emailChange message, displays properly on localhost 2015-01-18 15:55:39 -06:00
scribblypanda 5a4ebda187 plain text to translatable strings 2015-01-18 15:55:39 -06:00
scribblypanda c4113994e6 plain text to translatable strings 2015-01-18 15:55:38 -06:00
scribblypanda 330a9191a5 added new translatable string emailChange 2015-01-18 15:55:38 -06:00
scribblypanda 7c990ba109 changed Username to Login Name 2015-01-18 15:55:38 -06:00
Blade Barringer 10bc7e4eac Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster 2015-01-16 10:44:52 -06:00
Sabe Jones 0b63e48c6e feat(quest): T-Rex pet
Includes news announcements for 1/15/2014, Market implementation for T-Rex dual quest, and the ability for "healing" type Rage meters to work in party-scale boss fights.
2015-01-15 15:38:51 -06:00
Blade Barringer 1557907a1c Updated string names 2015-01-12 13:12:40 -06:00
Blade Barringer 1c0520c94d Removed link to picture of all pets, since it is now inaccurate and
there is no corresponding one for mounts
2015-01-10 09:38:03 -06:00
Blade Barringer 2b20c52a8d Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster 2015-01-10 09:25:18 -06:00
Blade Barringer 38f7c1e634 Closes #4490. Day start saves on blur instead of change 2015-01-09 19:10:10 -06:00
Blade Barringer dc37442691 Merge pull request #4478 from crookedneighbor/cmd-enter-for-chat
Cmd/Ctrl + enter for chat and pms.
2015-01-09 13:51:21 -06:00
Sabe Jones ee339fba4a feat(event): World boss
Implements the second HabitRPG world boss, the Abominable Stressbeast of Stoïkalm!
2015-01-08 15:22:42 -06:00
Blade Barringer 0807e7856c Merge remote-tracking branch 'upstream/develop' into mountmaster 2015-01-08 11:31:45 -06:00
Matteo Pagliazzi 193b92c16b fix(cds): max hour is 23 not 24 2015-01-06 23:12:03 +01:00
negue aa6b1e3f81 add remove-watch to markdown-directive 2015-01-05 22:19:05 +01:00
negue ad8add58d7 Merge pull request #4461 from negue/markdownText
change markdown ngModel to text attribute
2015-01-05 22:12:06 +01:00
Blade Barringer f3676fcbf4 Added spaces between quantity and gem symbol 2015-01-05 13:33:43 -06:00
Blade Barringer 5deb72c457 Added ability to send chat via cmd/ctrl + enter 2015-01-05 13:17:23 -06:00
Blade Barringer 3c3bbcafb9 Simplified count in stable 2015-01-02 14:11:04 -06:00
Blade Barringer 1049e5e152 Key shows up when you have either 90 pets or 90 mounts. Opens lg modal 2015-01-02 13:08:45 -06:00