sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 08:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9762 commits 3 branches 0 tags 1.6 GiB
Commit graph

9762 commits

This branch
This branch
All branches
Author SHA1 Message Date
GihHubSphinx
aa0aec8d4b Revert "New string in stats if gear has no benefits (take 2)" 
This reverts commit fdbd18a8ed.
 2015-07-16 10:54:17 +05:00
GihHubSphinx
fdbd18a8ed New string in stats if gear has no benefits (take 2) 2015-06-28 09:23:49 +05:00
GihHubSphinx
44a120b577 Revert "New string if gear has no benefits" 
This reverts commit c2f0f89f2b.
 2015-06-28 09:18:39 +05:00
GihHubSphinx
c2f0f89f2b New string if gear has no benefits 2015-06-26 21:49:48 +05:00
GihHubSphinx
3501dbf027 Make gear attributes translatable in stats 2015-06-26 20:49:35 +05:00
Blade Barringer
07541ea7e4 Merge branch 'TheHollidayInn-settings-unsubscribe-email-checkall-fix' into develop 2015-06-25 20:51:19 -05:00
Blade Barringer
08c7ca1833 Refactor email notifications 2015-06-25 20:49:38 -05:00
Kevin Gisi
f9ee0657f6 Merge pull request #5493 from gisikw/temporarily-disable-nr 
Disable NR to check memory issues
 2015-06-25 19:42:31 -04:00
Kevin Gisi
e93cb817be Disable NR to check memory issues 2015-06-25 19:21:45 -04:00
Sabe Jones
335acd276c fix(sprites): Reposition snorkely things 2015-06-25 15:08:26 -05:00
Sabe Jones
e6b6a5e468 Merge pull request #5487 from HabitRPG/sabrecat/summer-splash 
Summer Splash / June Mystery
 2015-06-25 11:27:06 -07:00
Sabe Jones
e9877b6684 Revert "Update node version" 
This reverts commit 837c26415d.
 2015-06-25 12:35:23 -05:00
Sabe Jones
775f903c3d feat(events): Limited edition 
Summer Splash skins and June mystery item. Also announces the Gokul sound theme.
 2015-06-25 11:19:01 -05:00
Matteo Pagliazzi
7f0b826943 chore(i18n): update locales 2015-06-25 11:51:48 +02:00
TheHollidayInn
81a05230e7 Uncheck all email notication options when we click unsubscribe all 2015-06-24 21:38:02 -05:00
Blade Barringer
ac7c1a1436 Merge pull request #5474 from hairlessbear/show_selected_food 
Added selectableInventory class to selected food on Pets page
 2015-06-24 08:29:03 -05:00
Blade Barringer
2d78f6c838 Remove only from karma test 2015-06-24 08:15:33 -05:00
Kevin Gisi
44c83eb341 Merge pull request #5477 from gisikw/fix-analytics-again 
Fix analytics
 2015-06-24 03:52:30 -04:00
Kevin Gisi
8c343c1845 *ahem* You saw nothing. 2015-06-24 03:45:25 -04:00
Kevin Gisi
c8b5480157 Repair tests to respect setTimeout 2015-06-24 03:41:49 -04: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
hairlessbear
1318cdd1fb Added selectableInventory class to selected food on Pets page 2015-06-23 23:45:51 -04:00
Blade Barringer
095f0f17c0 Merge pull request #5472 from gisikw/api-test-watch 
Add gulp test:api:watch
 2015-06-23 21:08:33 -05:00
Kevin Gisi
10cb1d651a Add gulp test:api:watch 2015-06-23 21:33:05 -04:00
Sabe Jones
981e1f553f Merge pull request #5468 from HabitRPG/sabrecat/analytics-service 
Analytics service
 2015-06-23 12:36:22 -07: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
Matteo Pagliazzi
782ae4f81c chore(i18n): update locales 2015-06-23 10:43:29 +02:00
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
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
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
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
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