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
7b753e7543
Merge pull request #4533 from HabitRPG/lefnire/one-module
...
Move to a single "habitrpg" module for services / directives / filters
2015-01-17 19:08:41 -07:00
503fd9ff51
refactor(services): remove un-used authService, cleanup authCtrl
2015-01-17 18:59:28 -07:00
2306b7c572
refactor(services): move to a single "habitrpg" module for services /
...
directives / filters
2015-01-17 18:43:37 -07:00
6a5210d3ad
fix(plans): when gifting subscription, set plan.dateUpdated so it can roll gemCapExtra next month. Fixes #4480 . Removes datedUpdated from previous version of fix.
2015-01-17 16:45:55 +10:00
f71737a84c
Merge pull request #4530 from HabitRPG/lefnire/httpinterceptor
...
move httpInterceptor from website/app.js to habitrpg-shared/config.js
2015-01-16 18:32:45 -07:00
90c7142da5
refactor(config): move httpInterceptor from website/app.js to habitrpg-shared/config.js.
2015-01-16 16:48:53 -07:00
9a087d2d90
update angular and do not send api key to loggly
2015-01-16 17:39:47 +01:00
290e602f21
Added brackets to quest.boss check. Closes #4526
2015-01-16 10:22:47 -06:00
94d003ca5d
Merge pull request #4524 from SabreCat/develop
...
T-Rex pet quest and party boss Rage implementation
2015-01-15 16:41:07 -06:00
35e8097b0c
refactor(challenges): wrap group.challenges as $resources, so they're
...
convenience functions $join/$leave/etc can be called directly
2015-01-15 15:24:02 -07: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
17ab1d660f
chore(news): Stress Strike 1 Bailey
2015-01-13 13:29:10 -06:00
04ff888819
fix(world-boss): Scale based on current HP
2015-01-13 13:19:04 -06:00
f00e1bc660
Merge pull request #4510 from SabreCat/stressbeast
...
Stressbeast healing on rage
2015-01-13 12:06:12 -06:00
ad7c02d50d
feat(world-boss): Healing on rage
2015-01-13 11:49:16 -06:00
86c25085fc
Merge remote-tracking branch 'upstream/develop' into fix-chat-visibility-2015-01-13
2015-01-13 07:53:52 +10:00
0bd22e7c77
disallow fetching of chat messages
2015-01-13 06:10:46 +10:00
ca2d45113c
fix(billing): script to fix current_period_end, see #4420
2015-01-12 11:50:46 -07:00
c9f5113daa
Merge pull request #4486 from kangabell/spell-active-highlight
...
Give greater indication to which spell is currently being cast.
2015-01-10 11:59:35 -06:00
22446a5ddb
apply active class to special spells too
2015-01-10 11:06:39 -05:00
d6dc2119cb
add active class to spell item when it is selected
2015-01-10 10:36:00 -05:00
0f2adcad14
highlight spell item when it has class of 'active'
2015-01-10 10:35:27 -05: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
64bb55e57b
Reworked mixin file to retain gembutton history
2015-01-09 13:48:19 -06:00
689b13ecb6
fix(world-boss): Justin not stressed yet
2015-01-09 10:00:16 -06:00
cda16d5bc0
Merge pull request #4494 from SabreCat/stressbeast
...
World boss for Winter Wonderland 2015
2015-01-08 15:51:04 -06:00
41d073d181
fix(world-boss): Achievement badge
2015-01-08 15:47:48 -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
cba232ef83
feat(presskit): add presskit page cc @lemoness
2015-01-08 13:41:23 -07:00
6626103d06
chore(cores): allow cores==0 to not use cluster at all (even w/ single
...
core). Good for running debugger. If cores==1, it will use cluster to
restart the single node on error
2015-01-08 13:19:11 -07:00
0b28f6df55
fix(plans): when gifting subscription, set plan.dateUpdated so it can
...
roll gemCapExtra next month. Fixes #4480
2015-01-07 14:59:38 -07:00
c96ae618db
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-07 10:32:58 -06:00
eca252a269
Corrected moment code to use new format instead of depreciating format
2015-01-07 10:28:46 -06:00
193b92c16b
fix(cds): max hour is 23 not 24
2015-01-06 23:12:03 +01:00
8ba0bb5d88
Changed spellObj to skill to be more semantic, and match the text in the
...
rewards column
2015-01-06 15:31:07 -06:00
870d9d7e86
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-06 15:04:47 -06:00
9da000ec4e
Changed spell to spellObj in ng-repeat for class spells in order to
...
assist with applying an active class to current spell. (would collide
with $scope.spell in rootCtrl.js)
2015-01-06 15:03:54 -06:00
96b48324f8
Merge pull request #4484 from crookedneighbor/fix-for-date-on-tasks
...
Fix for truncated dates on task due date. Closes #4482
2015-01-06 14:29:16 -06:00
53c466ee7f
Rounds tooltip for exp, health and mana to 2 decimal places
2015-01-06 13:52:22 -06:00
e416b03a59
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-06 09:39:04 -06:00
dd4e8d74c7
Fix for truncated dates on task due date. Closes #4482
2015-01-06 09:37:29 -06:00
b854663b92
fix(loggly): do not pass apiKey
2015-01-06 09:05:30 +01:00
8feffa5431
fix(news): Improve accuracy
2015-01-05 17:31:19 -06:00
f0c65be629
Fix to allow for challenges with the same award name. Closes #4479
2015-01-05 17:15:33 -06:00
scribblypanda