b72b14fe6c
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-28 21:07:32 -05:00
5f29e19aa7
Merge pull request #5452 from gisikw/isolate-directives
...
Encapsulate directive functions in anonymous functions
2015-06-27 22:33:29 -05:00
bcf141840d
Merge branch 'TheHollidayInn-tasks-search-checklists' into develop
2015-06-27 22:23:08 -05:00
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
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
3262c2d869
Refactored avatar
2015-06-27 16:08:38 -05:00
9f70598d64
Fix comment typo
2015-06-27 12:40:53 -04:00
76a0bf48f2
Fix typo
2015-06-27 12:33:04 -04:00
7616c6d224
Fixed ng-class syntax
2015-06-27 12:16:43 -04:00
4ba82f80da
Added mixin to reduce code duplication
2015-06-27 12:12:01 -04:00
6d11de8769
Correct missing one
2015-06-27 10:07:14 -05:00
7d92b39790
Correct usage of ng-class
2015-06-27 09:57:59 -05:00
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
01b3df17af
Changed all double-spans in avatar.jade to single spans used ternary operators
2015-06-26 17:15:04 -04:00
8ba621795a
Task filter now searches checklists
2015-06-25 22:33:08 -05:00
07541ea7e4
Merge branch 'TheHollidayInn-settings-unsubscribe-email-checkall-fix' into develop
2015-06-25 20:51:19 -05:00
08c7ca1833
Refactor email notifications
2015-06-25 20:49:38 -05:00
f9ee0657f6
Merge pull request #5493 from gisikw/temporarily-disable-nr
...
Disable NR to check memory issues
2015-06-25 19:42:31 -04:00
e93cb817be
Disable NR to check memory issues
2015-06-25 19:21:45 -04:00
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
81a05230e7
Uncheck all email notication options when we click unsubscribe all
2015-06-24 21:38:02 -05:00
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
01755a6d98
setTimeout all the analytics stuff
2015-06-24 03:23:48 -04:00
c7fea86aa5
Revert "Debug all the things"
...
This reverts commit be79d20864
2015-06-24 03:21:30 -04:00
be79d20864
Debug all the things
2015-06-24 02:33:58 -04:00
1318cdd1fb
Added selectableInventory class to selected food on Pets page
2015-06-23 23:45:51 -04:00
981e1f553f
Merge pull request #5468 from HabitRPG/sabrecat/analytics-service
...
Analytics service
2015-06-23 12:36:22 -07:00
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
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
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
78b5ac4fdc
Changed completion modal watch to be on instead of
2015-06-22 20:06:37 -04:00
f8e3120b3a
fix(analytics): Move landing page tracking
...
...to AuthCtrl
2015-06-22 18:49:15 -05:00
f5dfa5f015
fix(analytics): Define Analytics on scope
2015-06-22 18:30:47 -05:00
2ce1daffb8
feat(analytics): call service from app
2015-06-22 16:35:17 -05:00
83e0eb374f
fix(analytics): Load scripts in factory
2015-06-22 16:32:44 -05:00
196490ecb1
WIP(analytics): Enable service
2015-06-22 15:44:33 -05:00
56a461c513
Revert "feat(analytics): Analytics service"
...
This reverts commit 9a0e31db40
2015-06-22 14:14:33 -05:00
8579bb86df
Merge branch 'develop' into sabrecat/analytics-service
2015-06-22 12:37:17 -05:00
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
78b424e247
Encapsulate directive functions in anonymous functions - avoid the global namespace
2015-06-21 23:52:08 -04:00
5ab3a80b57
Closes #5360
2015-06-21 17:49:59 -05:00
34c08e941f
Wrap service in anonymous function; put constants at top of file
2015-06-21 17:16:06 -05:00
fbc466cb29
Create private methods for analytics functions
2015-06-21 17:07:48 -05:00
15c08f091d
Remove mixpanel from analytics service
2015-06-21 17:07:22 -05:00
7ee1899807
Refactore analytics service and tests
2015-06-21 16:39:32 -05:00
1be73011eb
Merge branch 'develop' into add-user-to-analyticsService
2015-06-21 14:04:17 -05:00
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
11fcb54c03
Corrected watch check
...
https://github.com/hairlessbear/habitrpg/commit/4fc04fea24889d3550cfb01f508466ff56c5ad40#commitcomment-11784493
2015-06-21 10:44:59 -05:00
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
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
Blade Barringer