Commit Graph

809 Commits

Author SHA1 Message Date
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
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
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
Alys 03d1f12a7c fix isOnQuest function to correctly check for quest being active - fixes https://github.com/HabitRPG/habitrpg/issues/5518 2015-06-29 19:42:22 +10:00
Blade Barringer b72b14fe6c Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-28 21:07:32 -05:00
Alys 11396d4756 make costume option more noticeable and understandable - fixes https://github.com/HabitRPG/habitrpg/issues/5204 2015-06-28 19:40:39 +10:00
Blade Barringer 5f29e19aa7 Merge pull request #5452 from gisikw/isolate-directives
Encapsulate directive functions in anonymous functions
2015-06-27 22:33:29 -05:00
Blade Barringer bcf141840d Merge branch 'TheHollidayInn-tasks-search-checklists' into develop 2015-06-27 22:23:08 -05:00
Blade Barringer 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
Blade Barringer 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
Blade Barringer 3262c2d869 Refactored avatar 2015-06-27 16:08:38 -05:00
hairlessbear 9f70598d64 Fix comment typo 2015-06-27 12:40:53 -04:00
hairlessbear 76a0bf48f2 Fix typo 2015-06-27 12:33:04 -04:00
hairlessbear 7616c6d224 Fixed ng-class syntax 2015-06-27 12:16:43 -04:00
hairlessbear 4ba82f80da Added mixin to reduce code duplication 2015-06-27 12:12:01 -04:00
Blade Barringer 6d11de8769 Correct missing one 2015-06-27 10:07:14 -05:00
Blade Barringer 7d92b39790 Correct usage of ng-class 2015-06-27 09:57:59 -05:00
Alys 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
hairlessbear 01b3df17af Changed all double-spans in avatar.jade to single spans used ternary operators 2015-06-26 17:15:04 -04:00
TheHollidayInn 8ba621795a Task filter now searches checklists 2015-06-25 22:33:08 -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 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
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
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
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
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 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
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 8579bb86df Merge branch 'develop' into sabrecat/analytics-service 2015-06-22 12:37:17 -05:00