Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,890 Commits 64 Branches 1,256 Tags
a6d162bfc08535b0eebf8d8d28642d1a64a7fe38
Commit Graph

9890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer a6d162bfc0 Update how info is sent to google 2015-07-09 22:17:27 -05:00
Blade Barringer d6444f922b Remove double instantiation 2015-07-09 22:16:50 -05:00
Blade Barringer 7bc74f2c11 Track unsubscription 2015-07-08 21:47:57 -05:00
Blade Barringer c92cf58acb Track purchases with analytics service 2015-07-08 08:11:27 -05:00
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 73b2d816d1 Track cron with analytics service 2015-07-08 08:08:45 -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
Blade Barringer 0ac76cfe34 Remove mixpanel mock 2015-07-01 18:32:11 -05:00
Kevin Gisi 74d51e530f Merge pull request #5541 from alexbragdon/gulp_fail_fix 
Gulp Tests now report summaries even when some tests fail.
 2015-07-01 15:44:49 -04:00
Sabe Jones d248b74569 fix(event): Splash visual tweaks 2015-07-01 14:21:37 -05:00
Alexander Bragdon d6a7bc36c7 Changes hard tabs to double space soft tabs in the error throwing failure block. 2015-07-01 15:20:47 -04:00
Alexander Bragdon 45ddc77eaa Fixes a typo in test:api:safe, missed semicolon on line 97. 2015-07-01 14:45:27 -04:00
Alexander Bragdon 9b31cf462a Creates safe versions of tests for Common, API, Karma, and E2E that don't pass errors via callback. The summary information will check if any tests failed and throw an error after all tests have been run. 2015-07-01 14:42:43 -04: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 0ea98880be Merge pull request #5537 from HabitRPG/paglias/amazon-payments 
feat(amazon-payments): add a lastBillingDate attribute
 2015-07-01 19:11:48 +02:00
Matteo Pagliazzi 4e7afcbe94 feat(amazon-payments): add a lastBillingDate attribute 2015-07-01 18:59:51 +02:00
Alexander Bragdon 75c25dc7a9 Rollback of /social/index.jade to reverse previous commits changes and return branch to upstream parity. 2015-07-01 10:13:10 -04:00
Alexander Bragdon cbb0988679 Adds a space to social/index.jade to test development platform and git tracking. 2015-07-01 09:59:48 -04: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
Alys eeb9793eb8 Merge pull request #5526 from Alys/cron-fix-yet-again-2015-06-30 
make api.shouldDo use the day being checked as the default date instead of today
 2015-07-01 13:17:01 +10:00
Matteo Pagliazzi ca36c5c632 Merge pull request #5531 from HabitRPG/paglias/amazon-payments 
Amazon Payments Subscriptions
 2015-07-01 01:40:27 +02:00
Matteo Pagliazzi 96ec70487f fix(amazon-payments): remove unused config var 2015-07-01 01:39:52 +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
Matteo Pagliazzi cca3e8bfdf chore(i18n): update locales 2015-06-30 17:59:11 +02:00
Alys 2cd34b0f6e make api.shouldDo use the day being checked as the default date instead of today - fixes https://github.com/HabitRPG/habitrpg/issues/5521 2015-06-30 14:28:00 +10: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
Matteo Pagliazzi 2f48534342 chore(i18n): update locales 2015-06-29 18:14:46 +02: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