Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,833 Commits 64 Branches 1,256 Tags
7e97b73e8b6899385a6e6fdff202681fd39b2433
Commit Graph

10833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matteo Pagliazzi e03bf6a711 fix(i18n): remove unused, empty string that was breaking Transifex 2015-06-23 10:38:30 +02:00
Matteo Pagliazzi 2c41553d7a chore(i18n): update locales 2015-06-23 10:31:10 +02:00
Alys a7e1c30dca remove http from link to fonts.googleapis.com to prevent Mixed Content Warnings - partial fix for #5464 2015-06-23 16:47:18 +10:00
hairlessbear 0e4e7a032a Added explanatory comment 2015-06-22 21:36:06 -04:00
hairlessbear f0ddbae775 Added quest completion modal test for when RSVPNeeded is true; modified quest invite test to use 'to.not.be.calledWith' 2015-06-22 21:33:38 -04:00
hairlessbear c942c10c17 Added a line break 2015-06-22 21:21:38 -04:00
hairlessbear b249e103de Removed duplicated test 2015-06-22 21:04:28 -04:00
hairlessbear f75bbb6e5f Modified 'RSVPNeeded is not true' test to not set user.party.quest.completed because it is not needed for the test 2015-06-22 20:55:50 -04:00
hairlessbear 8026e99219 Added quest completion modal watch tests 2015-06-22 20:48:11 -04:00
hairlessbear c5292e7ff8 Changed 'invite modal does not open' tests to focus on completion modal opening, but being the only modal to open. Also modified the named of two tests to be more intuitive and accurate 2015-06-22 20:33:49 -04:00
hairlessbear 78b5ac4fdc Changed completion modal watch to be on instead of 2015-06-22 20:06:37 -04:00
Sabe Jones f8e3120b3a fix(analytics): Move landing page tracking 
...to AuthCtrl
 2015-06-22 18:49:15 -05:00
Sabe Jones f5dfa5f015 fix(analytics): Define Analytics on scope 2015-06-22 18:30:47 -05:00
hairlessbear a1a46933eb Merge branch 'crookedneighbor-quest-invite-modal-on-sync' into quest_invite_modal_on_user_sync 2015-06-22 18:08:09 -04:00
Sabe Jones 2ce1daffb8 feat(analytics): call service from app 2015-06-22 16:35:17 -05:00
Sabe Jones 83e0eb374f fix(analytics): Load scripts in factory 2015-06-22 16:32:44 -05:00
Sabe Jones 196490ecb1 WIP(analytics): Enable service 2015-06-22 15:44:33 -05:00
Sabe Jones 56a461c513 Revert "feat(analytics): Analytics service" 
This reverts commit 9a0e31db40.
 2015-06-22 14:14:33 -05:00
Blade Barringer 78689e6e7c Made analytics mock, adjusted sandbox 2015-06-22 12:52:24 -05:00
Blade Barringer 8579bb86df Merge branch 'develop' into sabrecat/analytics-service 2015-06-22 12:37:17 -05:00
Matteo Pagliazzi afc6fba5bf chore(i18n): update locales 2015-06-22 18:24:37 +02:00
Sabe Jones 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
Kevin Gisi 78b424e247 Encapsulate directive functions in anonymous functions - avoid the global namespace 2015-06-21 23:52:08 -04:00
Blade Barringer f5647ecd76 Wrap task service in anon function 2015-06-21 20:35:45 -05:00
Blade Barringer 10c709a9f2 Merge branch 'develop' into TheHollidayInn-challenges-clone 2015-06-21 20:05:20 -05:00
Blade Barringer b4c4b891a1 Moved sandbox.js to mocks directory 2015-06-21 20:02:48 -05:00
Blade Barringer 7064871557 Create Vagrantfile.example 2015-06-21 19:28:19 -05:00
Blade Barringer 4574501e07 Set base stats lower for vagrantfile 2015-06-21 19:10:36 -05:00
Blade Barringer d98e6081e6 Merge branch 'develop' into kusold-vagrant-more-power 2015-06-21 19:02:43 -05:00
Blade Barringer 38e24571da Merge branch 'develop' into TheHollidayInn-challenges-clone 
Take specHelper off of global scope
 2015-06-21 18:59:11 -05:00
Blade Barringer 5ab3a80b57 Closes #5360 2015-06-21 17:49:59 -05:00
Blade Barringer a98d9ac29c Merge pull request #5437 from crookedneighbor/add-user-to-analyticsService 
Add user to analytics service, rewrite updateUser to match test
 2015-06-21 17:22:57 -05:00
Blade Barringer 73f8f48450 Merge branch 'sabrecat/analytics-service' into add-user-to-analyticsService 2015-06-21 17:21:17 -05:00
Blade Barringer 232afffbb8 Merge branch 'develop' into sabrecat/analytics-service 2015-06-21 17:19:12 -05:00
Blade Barringer 34c08e941f Wrap service in anonymous function; put constants at top of file 2015-06-21 17:16:06 -05:00
Blade Barringer fbc466cb29 Create private methods for analytics functions 2015-06-21 17:07:48 -05:00
Blade Barringer 15c08f091d Remove mixpanel from analytics service 2015-06-21 17:07:22 -05:00
Blade Barringer 7ee1899807 Refactore analytics service and tests 2015-06-21 16:39:32 -05:00
Blade Barringer 1be73011eb Merge branch 'develop' into add-user-to-analyticsService 2015-06-21 14:04:17 -05:00
Blade Barringer 54509d234c Clean up groups controller 
* Put nullifying variables back in per https://github.com/HabitRPG/habitrpg/pull/5437/files#r32896108
* converted questStart to a hoisted function
 2015-06-21 14:02:40 -05:00
Blade Barringer 11fcb54c03 Corrected watch check 
https://github.com/hairlessbear/habitrpg/commit/4fc04fea24889d3550cfb01f508466ff56c5ad40#commitcomment-11784493
 2015-06-21 10:44:59 -05:00
Alys 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
Alys 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
Sabe Jones c3b4950314 Merge branch 'sabrecat/summer-splash' into develop 2015-06-20 23:08:03 -05:00
Sabe Jones 3641bea441 feat(event): Summer Splash 2015 
Summer seasonal event for 2015, including festive NPC graphics, the summer edition of the Seasonal Shop, and new class equipment available in Rewards.
 2015-06-20 23:07:14 -05:00
Blade Barringer 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
Blade Barringer 19f8ca7980 Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-20 17:36:32 -05:00
Blade Barringer 96162b37bd Merge pull request #5433 from gisikw/ultimate-gear-fix 
Ultimate gear fix
 2015-06-20 17:34:47 -05:00
Blade Barringer 11ba5ad368 Merge branch 'develop' into add-user-to-analyticsService 2015-06-20 16:56:29 -05:00
Blade Barringer 95f1c01b01 Removed more variable assignments that were never getting set 2015-06-20 16:54:33 -05:00