a9757c9dbb
Refactor member service; Remove logic in functions that were never used
2015-07-18 16:00:03 -05:00
dbf406c921
Fixes #5623 and fixes #5135 (correctly displays equipment stats in member modals)
2015-07-18 16:00:02 -05:00
2407c9eeb8
feat(quests): Improve buy confirm dialog
2015-07-16 12:56:26 -05:00
73a1c7c596
fix(style): Remove extra class
2015-07-16 11:29:04 -05:00
e25819f6de
feat(party): Conclude invite experiment
2015-07-16 11:22:19 -05:00
695c793f6e
Merge pull request #5632 from HabitRPG/paglias/amazon-payments
...
Amazon Payments: implement one time purchases
2015-07-16 13:24:42 +02:00
c15f2b1f80
Merge branch 'sabrecat/quests-page' into develop
2015-07-15 14:12:05 -05:00
4a54363966
fix(quests): Show info modal for Gold quests
2015-07-15 14:02:49 -05:00
ecc98411c7
refactor amazon payments and add one time purchases once again
2015-07-15 20:07:17 +02:00
bade139b4b
wip amazon payments donation
2015-07-15 20:07:17 +02:00
32a74471db
Merge branch 'sabrecat/quests-page' into develop
2015-07-14 18:56:32 -05:00
7ad2839f05
Adjust look of page blurbs
2015-07-14 08:18:02 -05:00
7e60864d41
Fixing color on blurbs
2015-07-14 07:46:57 -05:00
65b7465081
adding blurbs to pages
2015-07-14 07:44:51 -05:00
316c3e9c2e
Sort out conflicts from develop
2015-07-12 13:51:42 -05:00
6ac049cc71
Allow animal ears to be added to costume or equipped gear
2015-07-12 09:23:03 -05:00
92bfc66c67
fix a bug where if you had "Use Costume" ticked, any Battle Gear or Costume choice would be added to your costume, never to Battle Gear
2015-07-12 18:18:31 +10:00
b71f68ef32
Merge branch 'develop' into equipment-refactor-merge-into-develop
2015-07-11 15:55:53 -05:00
dccc10aa4d
Refactor
2015-07-11 15:05:58 -05:00
c33a22ceb3
Put locale key creation into private function
2015-07-11 12:07:20 -05:00
94cd0bb852
Use user variable
2015-07-11 11:18:19 -05:00
d2e61bf5ef
Change string to str
2015-07-11 11:15:04 -05:00
cb4b2e43bf
Change variable name to itemList
2015-07-11 11:14:50 -05:00
00f7af7807
Introducing a class for buttons allowing wrapping
...
New .btn-wrap class for buttons with long text allowing wrapping
2015-07-10 02:33:09 +05:00
c0d35dc472
WIP(quests): Quests page cont'd
...
Test fixes and addition of function for buying Quests with Gold
2015-07-08 17:43:08 -05:00
78d4989544
WIP(event): Summer Splash cont'd
...
Splits Quests out to a new page. Refactors inventory Jade files and controllers to more manageable structures.
2015-07-08 16:13:23 -05:00
6845e8caf3
fix(experiment): Style fixes
...
Corrects the display of Google Experiment variants in the absence of an API callback, and widens the avatar stat bar for users who don't have a party.
2015-07-03 13:46:22 -05:00
fb81c79b78
feat(analytics): Invite Friends experiment
...
Disables the prior landing page Google Experiment and begins a new one involving the placement and captioning of the button for inviting friends to the user's party.
2015-07-02 16:13:22 -05:00
4d7a3afc93
Merge branch 'LionC-develop' into develop
2015-07-02 07:58:59 -05:00
4bcff71859
Adjust login modal
...
* Rename loginForm
* Use larger buttons for logging in or registering
* Use fully translated placeholder text
2015-07-02 07:58:11 -05:00
25dd82ffa0
feat(event): Summer Splash cont'd
...
Summer backgrounds, the Seafoam transformation item, and announcements for same.
2015-07-01 13:11:53 -05:00
ca36c5c632
Merge pull request #5531 from HabitRPG/paglias/amazon-payments
...
Amazon Payments Subscriptions
2015-07-01 01:40:27 +02:00
71d8fd2f0c
fix(analytics): Handle missing user object
2015-06-30 17:13:56 -05:00
3d15da61ec
fix(analytics): Correct user ID handling
2015-06-30 16:52:18 -05:00
46a7591492
Merge branch 'release-june-30th-2015' into develop
2015-06-30 13:39:51 -05:00
65f4aac23c
feat(amazon-payments): working subscriptions, put donations and gifts on hold
2015-06-30 17:59:30 +02:00
8747cf4cce
fix(amazon-oayments): use production url
2015-06-30 17:59:30 +02:00
dbce6f7676
fix(amazon-payments): use right url in production
2015-06-30 17:59:30 +02:00
271245f1e6
feat(amazon-payments): finalize one time purchases
2015-06-30 17:59:30 +02:00
78cca423f0
feat(amazon-payments): completely refactor client side flow, support subscription widgets WIP
2015-06-30 17:59:30 +02:00
a377501f64
feat(amazon-payments): wip on donations
2015-06-30 17:59:30 +02:00
6faef6f737
wip amazon payments
2015-06-30 17:59:30 +02:00
b0643e7177
WIP: start working on amazon payments
2015-06-30 17:59:30 +02:00
d44a0a1608
Shortened another line using new the object
2015-06-30 17:16:09 +10:00
4304e56e70
Merge pull request #5511 from Alys/use-costume-explanation-2015-06-28
...
make costume option more noticeable and understandable
2015-06-29 19:25:44 -05:00
547523c8f7
Merge branch 'crookedneighbor-blade-refactor-clone-challenges' into release-june-30th-2015
2015-06-29 17:56:42 -05:00
bc837fd4db
Moved menu stuff to own controller
2015-06-29 12:39:05 -05:00
567ed1f28b
Correct seenMessage use in menu
...
Closes #5519
2015-06-29 08:58:51 -05:00
522181890e
Added additional check for chatChanged
2015-06-29 08:13:03 -05:00
a946f2b5a5
rename "show more/less" locale keys to be generic; change to those keys for Use Costume text and Custom Day Start text; move Use Costume "show less" link to bottom of section
2015-06-29 21:49:54 +10:00
Blade Barringer