b9784fa4aa
Added notice for rebirth in seasonal shop
2015-01-26 22:15:24 -06:00
7eae5db256
Added comment describing the silly conditional for transparency in the
...
seasonal shop
2015-01-26 19:25:53 -06:00
3b1743dee8
Corrected ng-class condition to show transparent class
...
on seasonal shop items after rebirth
2015-01-26 18:55:10 -06:00
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
c3c144223a
Merge branch 'develop' into mountmaster
2015-01-19 14:47:17 -06:00
1318d0de38
Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting
...
Group Sorting
2015-01-18 23:08:40 -06:00
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
137ff71bc8
Added one way binding for email
2015-01-18 15:55:39 -06:00
e0a081b0ff
Adjusted spacing and line breaks
2015-01-18 15:55:39 -06:00
cdad6e36da
Adjusted some spacing and line breaks
2015-01-18 15:55:39 -06:00
4a5fe1867d
Removed target="_blank" attribute from mailto link
2015-01-18 15:55:39 -06:00
b3c9371d9f
changed links to relative, corrected mailto link
2015-01-18 15:55:39 -06:00
1c151f57c2
applied .muted to text so less cluttered looking
2015-01-18 15:55:39 -06:00
b978852e11
added description of login name and link to page to edit display name
2015-01-18 15:55:39 -06:00
ae90889dec
added description of display name and link to page to edit login name
2015-01-18 15:55:39 -06:00
18317f3346
fixed emailChange message, displays properly on localhost
2015-01-18 15:55:39 -06:00
5a4ebda187
plain text to translatable strings
2015-01-18 15:55:39 -06:00
c4113994e6
plain text to translatable strings
2015-01-18 15:55:38 -06:00
330a9191a5
added new translatable string emailChange
2015-01-18 15:55:38 -06:00
7c990ba109
changed Username to Login Name
2015-01-18 15:55:38 -06:00
10bc7e4eac
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-16 10:44:52 -06:00
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
1557907a1c
Updated string names
2015-01-12 13:12:40 -06:00
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
2b20c52a8d
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-10 09:25:18 -06:00
38f7c1e634
Closes #4490 . Day start saves on blur instead of change
2015-01-09 19:10:10 -06:00
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
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
0807e7856c
Merge remote-tracking branch 'upstream/develop' into mountmaster
2015-01-08 11:31:45 -06:00
193b92c16b
fix(cds): max hour is 23 not 24
2015-01-06 23:12:03 +01:00
aa6b1e3f81
add remove-watch to markdown-directive
2015-01-05 22:19:05 +01:00
ad8add58d7
Merge pull request #4461 from negue/markdownText
...
change markdown ngModel to text attribute
2015-01-05 22:12:06 +01:00
f3676fcbf4
Added spaces between quantity and gem symbol
2015-01-05 13:33:43 -06:00
5deb72c457
Added ability to send chat via cmd/ctrl + enter
2015-01-05 13:17:23 -06:00
3c3bbcafb9
Simplified count in stable
2015-01-02 14:11:04 -06:00
1049e5e152
Key shows up when you have either 90 pets or 90 mounts. Opens lg modal
2015-01-02 13:08:45 -06:00
3a0de8f9c4
chore(January): news and deactivate cards
2015-01-01 23:20:59 -06:00
a45797a1ba
Adjusted text in view to show mountMaster progress
2015-01-01 17:06:34 -06:00
b3ccdc2859
change markdown ngModel to text attribute
2015-01-01 20:57:57 +01:00
d1355faa31
Merge pull request #4452 from SabreCat/nye
...
New Year's event features
2014-12-30 22:18:11 -06:00
edf66cbb59
feat(discount) google discount & use sub.key instead of sub.months
2014-12-30 20:05:07 -07:00
51acc477fe
feat(NYE): New Year's cards
2014-12-30 19:57:24 -06:00
b4975bb8a4
Merge branch 'groupSorting' of https://github.com/vIiRuS/habitrpg into vIiRuS-groupSorting
...
Conflicts:
public/js/controllers/headerCtrl.js
views/options/social/group.jade
2014-12-30 12:57:32 -06:00
303d30a270
Merge pull request #4439 from crookedneighbor/transparent-gems
...
Added transparent class to gem purchasing if zero gems are available for purchase
2014-12-30 11:11:32 -06:00
d8cfc1dd4b
WIP(NYE): New Year's cards
2014-12-29 20:58:28 -06:00
53fff0dbc6
feat(seasonal): Implement Snowball
...
Adds the snowball from Winter 2014 to the Seasonal Shop.
2014-12-29 19:40:11 -06:00
4eca27f19e
Corrected class name closes #4434
2014-12-29 19:15:51 -06:00
0ddbbc93a3
Merge branch 'develop' of https://github.com/melissamcewen/habitrpg into melissamcewen-develop
2014-12-29 18:33:14 -06:00
4a37bec652
fix(pr): indentation and simplify
2014-12-29 21:21:54 +01:00
752161b284
Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat
2014-12-29 21:09:04 +01:00
Blade Barringer