Commit Graph

282 Commits

Author SHA1 Message Date
Blade Barringer a9757c9dbb Refactor member service; Remove logic in functions that were never used 2015-07-18 16:00:03 -05:00
hairlessbear dbf406c921 Fixes #5623 and fixes #5135 (correctly displays equipment stats in member modals) 2015-07-18 16:00:02 -05:00
Sabe Jones 2407c9eeb8 feat(quests): Improve buy confirm dialog 2015-07-16 12:56:26 -05:00
Sabe Jones e25819f6de feat(party): Conclude invite experiment 2015-07-16 11:22:19 -05:00
Matteo Pagliazzi 695c793f6e Merge pull request #5632 from HabitRPG/paglias/amazon-payments
Amazon Payments: implement one time purchases
2015-07-16 13:24:42 +02:00
Sabe Jones 4a54363966 fix(quests): Show info modal for Gold quests 2015-07-15 14:02:49 -05:00
Matteo Pagliazzi ecc98411c7 refactor amazon payments and add one time purchases once again 2015-07-15 20:07:17 +02:00
Matteo Pagliazzi bade139b4b wip amazon payments donation 2015-07-15 20:07:17 +02:00
Blade Barringer 316c3e9c2e Sort out conflicts from develop 2015-07-12 13:51:42 -05:00
Blade Barringer 6ac049cc71 Allow animal ears to be added to costume or equipped gear 2015-07-12 09:23:03 -05:00
Alys 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
Blade Barringer b71f68ef32 Merge branch 'develop' into equipment-refactor-merge-into-develop 2015-07-11 15:55:53 -05:00
Blade Barringer dccc10aa4d Refactor 2015-07-11 15:05:58 -05:00
Blade Barringer c33a22ceb3 Put locale key creation into private function 2015-07-11 12:07:20 -05:00
Blade Barringer 94cd0bb852 Use user variable 2015-07-11 11:18:19 -05:00
Blade Barringer d2e61bf5ef Change string to str 2015-07-11 11:15:04 -05:00
Blade Barringer cb4b2e43bf Change variable name to itemList 2015-07-11 11:14:50 -05:00
Sabe Jones 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
Sabe Jones 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
Sabe Jones 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
Blade Barringer 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
Matteo Pagliazzi ca36c5c632 Merge pull request #5531 from HabitRPG/paglias/amazon-payments
Amazon Payments Subscriptions
2015-07-01 01:40:27 +02:00
Sabe Jones 71d8fd2f0c fix(analytics): Handle missing user object 2015-06-30 17:13:56 -05:00
Sabe Jones 3d15da61ec fix(analytics): Correct user ID handling 2015-06-30 16:52:18 -05:00
Matteo Pagliazzi 65f4aac23c feat(amazon-payments): working subscriptions, put donations and gifts on hold 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi 8747cf4cce fix(amazon-oayments): use production url 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi dbce6f7676 fix(amazon-payments): use right url in production 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi 271245f1e6 feat(amazon-payments): finalize one time purchases 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi 78cca423f0 feat(amazon-payments): completely refactor client side flow, support subscription widgets WIP 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi a377501f64 feat(amazon-payments): wip on donations 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi 6faef6f737 wip amazon payments 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi b0643e7177 WIP: start working on amazon payments 2015-06-30 17:59:30 +02:00
sablecliff d44a0a1608 Shortened another line using new the object 2015-06-30 17:16:09 +10:00
Blade Barringer 547523c8f7 Merge branch 'crookedneighbor-blade-refactor-clone-challenges' into release-june-30th-2015 2015-06-29 17:56:42 -05:00
Blade Barringer bc837fd4db Moved menu stuff to own controller 2015-06-29 12:39:05 -05:00
Blade Barringer 567ed1f28b Correct seenMessage use in menu
Closes #5519
2015-06-29 08:58:51 -05:00
Blade Barringer 522181890e Added additional check for chatChanged 2015-06-29 08:13:03 -05:00
sablecliff c8dd666939 Implemented changes as suggested by @crookedneighbour
Should be passing all tests now.
2015-06-29 18:11:12 +10:00
Blade Barringer b72b14fe6c Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-28 21:07:32 -05:00
Blade Barringer 5f29e19aa7 Merge pull request #5452 from gisikw/isolate-directives
Encapsulate directive functions in anonymous functions
2015-06-27 22:33:29 -05:00
Blade Barringer 4abd7f85f8 Adjustments to PR#5494
* Update filter name to be more accurate
* Add additional tests
* Simplify checklist checking logic
* Prevent errors from multiple matches in checklist
2015-06-27 22:21:50 -05:00
sablecliff 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
TheHollidayInn 8ba621795a Task filter now searches checklists 2015-06-25 22:33:08 -05:00
sablecliff 459d5bfee3 Fixed small error with ternary statement and assignment of string 2015-06-25 19:45:34 +10:00
sablecliff 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
Kevin Gisi 01755a6d98 setTimeout all the analytics stuff 2015-06-24 03:23:48 -04:00
Kevin Gisi c7fea86aa5 Revert "Debug all the things"
This reverts commit be79d20864.
2015-06-24 03:21:30 -04:00
Kevin Gisi be79d20864 Debug all the things 2015-06-24 02:33:58 -04:00
Sabe Jones 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
Sabe Jones 8b04768b37 fix(analytics): Resolve errors
Should correct 400 Bad Request errors with Amplitude and cannot read undefined errors in tmp_static_front.
2015-06-23 09:30:18 -05:00