Blade Barringer
eeae12b002
Refactore inventory pages
2015-07-11 13:50:30 -05:00
Blade Barringer
066206f41c
Refactored inventory into separate files
2015-07-11 13:13:00 -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
sablecliff
d44a0a1608
Shortened another line using new the object
2015-06-30 17:16:09 +10:00
sablecliff
c8dd666939
Implemented changes as suggested by @crookedneighbour
...
Should be passing all tests now.
2015-06-29 18:11:12 +10: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
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
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
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
