Commit Graph

832 Commits

Author SHA1 Message Date
Blade Barringer f58dbb2a68 Send only analytics for use in cron 2015-07-08 08:10:48 -05:00
Blade Barringer 1c2ec66c93 Add format user data function to analytics server 2015-07-08 08:09:43 -05:00
Blade Barringer c4c4f4a3a5 Add analytics to utils 2015-07-08 07:47:52 -05:00
Blade Barringer d2b74f11dd Create analytics.track 2015-07-07 18:00:41 -05:00
Blade Barringer e6ee4d303c Set up purchase tracking 2015-07-06 08:11:31 -05:00
Blade Barringer e6f0acba4c Add initial server side analytics service 2015-07-01 18:36:43 -05:00
Sabe Jones d248b74569 fix(event): Splash visual tweaks 2015-07-01 14:21:37 -05:00
Sabe Jones d4b5620ada Merge branch 'sabrecat/summer-splash' into develop 2015-07-01 13:13:23 -05:00
Sabe Jones 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
Matteo Pagliazzi 4e7afcbe94 feat(amazon-payments): add a lastBillingDate attribute 2015-07-01 18:59:51 +02:00
Blade Barringer 851868296f Merge branch 'Alys-guild-list-links-2015-06-28' into develop 2015-06-30 22:40:35 -05:00
Blade Barringer a3f5f626a6 Put h3 and a on one line 2015-06-30 22:39:48 -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
Sabe Jones 46a7591492 Merge branch 'release-june-30th-2015' into develop 2015-06-30 13:39:51 -05:00
Sabe Jones f88c5fb8b5 chore(news): June 30 Bailey 2015-06-30 12:35:16 -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 e38f8bf4ef amazon payments: 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
Blade Barringer 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
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
Alys 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
Alys 03d1f12a7c fix isOnQuest function to correctly check for quest being active - fixes https://github.com/HabitRPG/habitrpg/issues/5518 2015-06-29 19:42:22 +10:00
Blade Barringer b72b14fe6c Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-28 21:07:32 -05:00
Alys 11396d4756 make costume option more noticeable and understandable - fixes https://github.com/HabitRPG/habitrpg/issues/5204 2015-06-28 19:40:39 +10:00
Alys b5ca45a713 convert name of guild to link to guild in index list of public guilds 2015-06-28 15:35:37 +10: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 bcf141840d Merge branch 'TheHollidayInn-tasks-search-checklists' into develop 2015-06-27 22:23:08 -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
Blade Barringer 5c4732304a Merge pull request #5504 from Alys/cid-2015-06-25
prevent challenge tasks being deleted when challenge ID has been lost
2015-06-27 17:07:10 -05:00
Blade Barringer 3262c2d869 Refactored avatar 2015-06-27 16:08:38 -05:00
hairlessbear 9f70598d64 Fix comment typo 2015-06-27 12:40:53 -04:00
hairlessbear 76a0bf48f2 Fix typo 2015-06-27 12:33:04 -04:00
hairlessbear 7616c6d224 Fixed ng-class syntax 2015-06-27 12:16:43 -04:00
hairlessbear 4ba82f80da Added mixin to reduce code duplication 2015-06-27 12:12:01 -04:00
Blade Barringer 6d11de8769 Correct missing one 2015-06-27 10:07:14 -05:00
Blade Barringer 7d92b39790 Correct usage of ng-class 2015-06-27 09:57:59 -05:00
Alys 0fc14f129d prevent challenge tasks being deleted when challenge ID (cid) has been lost - possible fix for https://github.com/HabitRPG/habitrpg/issues/4466 2015-06-27 14:19:40 +10:00
hairlessbear 01b3df17af Changed all double-spans in avatar.jade to single spans used ternary operators 2015-06-26 17:15:04 -04:00
TheHollidayInn 8ba621795a Task filter now searches checklists 2015-06-25 22:33:08 -05:00