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
2dd7894a2c
Merge branch 'image-min' into develop
2015-06-27 16:41:24 -05:00
eceae75631
Merge pull request #5482 from Alys/startDate-fix-2015-06-25
...
Refactor api.shouldDo and fix https://github.com/HabitRPG/habitrpg/issues/5395
2015-06-28 07:31:04 +10:00
7aa2bb0db5
Chore(compile sprites)
2015-06-27 16:24:12 -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
94abf9ca8c
Merge branch 'crookedneighbor-fix_ng-class_for_hb' into refactor_avatar_view
2015-06-27 12:16:56 -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
d7a203ccc2
set all daily repeat code and tests to use true/false instead of 1/0 for consistency with DailySchema; comment-out unused default Daily repeat code
2015-06-27 20:06:04 +10:00
24f35d84e7
add imagemin task to grunt, to shrink file size after spritesmith
2015-06-27 00:13:03 -06: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
fd11b054eb
chore(i18n): update locales
2015-06-26 18:17:14 +02:00
0fb911016a
shrink spritesmith images to reduce page load
2015-06-25 22:25:14 -06: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
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
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
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
Blade Barringer