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
e25819f6de
feat(party): Conclude invite experiment
2015-07-16 11:22:19 -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
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
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
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
ca36c5c632
Merge pull request #5531 from HabitRPG/paglias/amazon-payments
...
Amazon Payments Subscriptions
2015-07-01 01:40:27 +02:00
3d15da61ec
fix(analytics): Correct user ID handling
2015-06-30 16:52:18 -05: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
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
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
c8dd666939
Implemented changes as suggested by @crookedneighbour
...
Should be passing all tests now.
2015-06-29 18:11:12 +10:00
b72b14fe6c
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-28 21:07:32 -05:00
96a3653620
Now includes the refactoring into different files.
...
Currently there a multiple ways to create the string being shown.
This will be changed upon the decision of which is prefered.
I personally prefer the first method, which uses a function inside the
object being created in content.coffee
2015-06-26 19:33:39 +10:00
459d5bfee3
Fixed small error with ternary statement and assignment of string
2015-06-25 19:45:34 +10:00
ebcfa849a2
implemented the object and checking function to retrieve objects from it.
...
At the moment it is only one instance in the rootCtrl.js file but once shown to work and in the proper setout the change will be propograted.
2015-06-25 11:46:19 +10:00
fcd278c2f6
fix(analytics): Pass tests
...
Restores the "UUID" property so that tests no longer fail. Corrects various typos in analytics service test. Moves landing page tracking to the Jade file to avoid duplicate tracking.
2015-06-23 10:11:03 -05:00
78b5ac4fdc
Changed completion modal watch to be on instead of
2015-06-22 20:06:37 -04:00
f8e3120b3a
fix(analytics): Move landing page tracking
...
...to AuthCtrl
2015-06-22 18:49:15 -05:00
f5dfa5f015
fix(analytics): Define Analytics on scope
2015-06-22 18:30:47 -05:00
2ce1daffb8
feat(analytics): call service from app
2015-06-22 16:35:17 -05:00
56a461c513
Revert "feat(analytics): Analytics service"
...
This reverts commit 9a0e31db40
2015-06-22 14:14:33 -05:00
9a0e31db40
feat(analytics): Analytics service
...
Inject Analytics service into controllers where needed. Call Analytics service instead of GA or Mixpanel for tracking within the app.
2015-06-22 11:21:02 -05:00
38e24571da
Merge branch 'develop' into TheHollidayInn-challenges-clone
...
Take specHelper off of global scope
2015-06-21 18:59:11 -05:00
11fcb54c03
Corrected watch check
...
https://github.com/hairlessbear/habitrpg/commit/4fc04fea24889d3550cfb01f508466ff56c5ad40#commitcomment-11784493
2015-06-21 10:44:59 -05:00
c6256d7fa1
fix https://github.com/HabitRPG/habitrpg/issues/5439 for the other darned gear types that I freaking forgot about
2015-06-21 17:32:46 +10:00
fc9f511542
allow Body Accessory equipment to be purchased from Seasonal Shop - fixes https://github.com/HabitRPG/habitrpg/issues/5439
2015-06-21 16:37:56 +10:00
4fc04fea24
Adjustments to PR #5298
...
* Put watch on $scope
* Check for quest.completed !== true or false
* Add test for quest invite modal watch
2015-06-20 21:10:18 -05:00
19f8ca7980
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-20 17:36:32 -05:00
86f18e9a5a
Refactor clone challenges PR
2015-06-19 20:49:24 -05:00
caec2d8476
Added editTask function back
2015-06-17 23:04:42 -05:00
838c912906
Moved clone tasks function to task service
2015-06-17 22:22:55 -05:00
e9269d332c
Removed dateCreated from being cloned in tasks
2015-06-17 21:08:33 -05:00
b81024bdd6
Fixed task clone functionality and updated code organization/semantics
2015-06-17 21:08:33 -05:00
hairlessbear