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
335acd276c
fix(sprites): Reposition snorkely things
2015-06-25 15:08:26 -05:00
e6b6a5e468
Merge pull request #5487 from HabitRPG/sabrecat/summer-splash
...
Summer Splash / June Mystery
2015-06-25 11:27:06 -07:00
e9877b6684
Revert "Update node version"
...
This reverts commit 837c26415d
2015-06-25 12:35:23 -05: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
7f0b826943
chore(i18n): update locales
2015-06-25 11:51:48 +02:00
459d5bfee3
Fixed small error with ternary statement and assignment of string
2015-06-25 19:45:34 +10:00
81a05230e7
Uncheck all email notication options when we click unsubscribe all
2015-06-24 21:38:02 -05:00
51fb278438
stop changing the task's actual Start Date, move related task Start Date code tothe same place, adjust comments
2015-06-25 12:19:27 +10:00
9b8b7af7d5
replace api.numDaysApart (not used elsewhere and new to the EveryXDays code) with moment#diff
2015-06-25 12:19:26 +10:00
e7e82a2aed
keep startDate as a moment(), fix check for Start Date in future (ignore time, don't do incorrect CDS conversion), add comments
2015-06-25 12:19:26 +10:00
266055c0d4
rename 'day' variable to 'startOfDayWithCDSTime' (more verbose, sorry, but clearer)
2015-06-25 12:19:26 +10:00
99bc09fb25
move dayOfWeekNum to correct scope and improve comment
2015-06-25 12:19:26 +10:00
f6cdc57228
move dailyTask.repeat error handling to correct location; add dailyTask.everyX error handling (might not be needed)
2015-06-25 12:19:26 +10:00
bacd35b895
refactor shouldDo check for Daily's startDate being in the future
2015-06-25 12:19:26 +10:00
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
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
2d78f6c838
Remove only from karma test
2015-06-24 08:15:33 -05:00
44c83eb341
Merge pull request #5477 from gisikw/fix-analytics-again
...
Fix analytics
2015-06-24 03:52:30 -04:00
8c343c1845
*ahem* You saw nothing.
2015-06-24 03:45:25 -04:00
c8b5480157
Repair tests to respect setTimeout
2015-06-24 03:41:49 -04: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
095f0f17c0
Merge pull request #5472 from gisikw/api-test-watch
...
Add gulp test:api:watch
2015-06-23 21:08:33 -05:00
10cb1d651a
Add gulp test:api:watch
2015-06-23 21:33:05 -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
782ae4f81c
chore(i18n): update locales
2015-06-23 10:43:29 +02:00
e03bf6a711
fix(i18n): remove unused, empty string that was breaking Transifex
2015-06-23 10:38:30 +02:00
2c41553d7a
chore(i18n): update locales
2015-06-23 10:31:10 +02: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
0e4e7a032a
Added explanatory comment
2015-06-22 21:36:06 -04:00
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
c942c10c17
Added a line break
2015-06-22 21:21:38 -04:00
b249e103de
Removed duplicated test
2015-06-22 21:04:28 -04:00
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
8026e99219
Added quest completion modal watch tests
2015-06-22 20:48:11 -04:00
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
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
a1a46933eb
Merge branch 'crookedneighbor-quest-invite-modal-on-sync' into quest_invite_modal_on_user_sync
2015-06-22 18:08:09 -04:00
2ce1daffb8
feat(analytics): call service from app
2015-06-22 16:35:17 -05:00
TheHollidayInn