d2b74f11dd
Create analytics.track
2015-07-07 18:00:41 -05:00
e6ee4d303c
Set up purchase tracking
2015-07-06 08:11:31 -05:00
e6f0acba4c
Add initial server side analytics service
2015-07-01 18:36:43 -05:00
0ac76cfe34
Remove mixpanel mock
2015-07-01 18:32:11 -05:00
74d51e530f
Merge pull request #5541 from alexbragdon/gulp_fail_fix
...
Gulp Tests now report summaries even when some tests fail.
2015-07-01 15:44:49 -04:00
d248b74569
fix(event): Splash visual tweaks
2015-07-01 14:21:37 -05:00
d6a7bc36c7
Changes hard tabs to double space soft tabs in the error throwing failure block.
2015-07-01 15:20:47 -04:00
45ddc77eaa
Fixes a typo in test:api:safe, missed semicolon on line 97.
2015-07-01 14:45:27 -04:00
9b31cf462a
Creates safe versions of tests for Common, API, Karma, and E2E that don't pass errors via callback. The summary information will check if any tests failed and throw an error after all tests have been run.
2015-07-01 14:42:43 -04:00
d4b5620ada
Merge branch 'sabrecat/summer-splash' into develop
2015-07-01 13:13:23 -05:00
25dd82ffa0
feat(event): Summer Splash cont'd
...
Summer backgrounds, the Seafoam transformation item, and announcements for same.
2015-07-01 13:11:53 -05:00
0ea98880be
Merge pull request #5537 from HabitRPG/paglias/amazon-payments
...
feat(amazon-payments): add a lastBillingDate attribute
2015-07-01 19:11:48 +02:00
4e7afcbe94
feat(amazon-payments): add a lastBillingDate attribute
2015-07-01 18:59:51 +02:00
75c25dc7a9
Rollback of /social/index.jade to reverse previous commits changes and return branch to upstream parity.
2015-07-01 10:13:10 -04:00
cbb0988679
Adds a space to social/index.jade to test development platform and git tracking.
2015-07-01 09:59:48 -04:00
851868296f
Merge branch 'Alys-guild-list-links-2015-06-28' into develop
2015-06-30 22:40:35 -05:00
a3f5f626a6
Put h3 and a on one line
2015-06-30 22:39:48 -05:00
eeb9793eb8
Merge pull request #5526 from Alys/cron-fix-yet-again-2015-06-30
...
make api.shouldDo use the day being checked as the default date instead of today
2015-07-01 13:17:01 +10:00
ca36c5c632
Merge pull request #5531 from HabitRPG/paglias/amazon-payments
...
Amazon Payments Subscriptions
2015-07-01 01:40:27 +02:00
96ec70487f
fix(amazon-payments): remove unused config var
2015-07-01 01:39:52 +02:00
71d8fd2f0c
fix(analytics): Handle missing user object
2015-06-30 17:13:56 -05:00
3d15da61ec
fix(analytics): Correct user ID handling
2015-06-30 16:52:18 -05:00
46a7591492
Merge branch 'release-june-30th-2015' into develop
2015-06-30 13:39:51 -05:00
f88c5fb8b5
chore(news): June 30 Bailey
2015-06-30 12:35:16 -05:00
65f4aac23c
feat(amazon-payments): working subscriptions, put donations and gifts on hold
2015-06-30 17:59:30 +02:00
8747cf4cce
fix(amazon-oayments): use production url
2015-06-30 17:59:30 +02:00
dbce6f7676
fix(amazon-payments): use right url in production
2015-06-30 17:59:30 +02:00
271245f1e6
feat(amazon-payments): finalize one time purchases
2015-06-30 17:59:30 +02:00
78cca423f0
feat(amazon-payments): completely refactor client side flow, support subscription widgets WIP
2015-06-30 17:59:30 +02:00
e38f8bf4ef
amazon payments: wip
2015-06-30 17:59:30 +02:00
a377501f64
feat(amazon-payments): wip on donations
2015-06-30 17:59:30 +02:00
6faef6f737
wip amazon payments
2015-06-30 17:59:30 +02:00
b0643e7177
WIP: start working on amazon payments
2015-06-30 17:59:30 +02:00
cca3e8bfdf
chore(i18n): update locales
2015-06-30 17:59:11 +02:00
2cd34b0f6e
make api.shouldDo use the day being checked as the default date instead of today - fixes https://github.com/HabitRPG/habitrpg/issues/5521
2015-06-30 14:28:00 +10:00
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
547523c8f7
Merge branch 'crookedneighbor-blade-refactor-clone-challenges' into release-june-30th-2015
2015-06-29 17:56:42 -05:00
bc837fd4db
Moved menu stuff to own controller
2015-06-29 12:39:05 -05:00
2f48534342
chore(i18n): update locales
2015-06-29 18:14:46 +02:00
567ed1f28b
Correct seenMessage use in menu
...
Closes #5519
2015-06-29 08:58:51 -05:00
522181890e
Added additional check for chatChanged
2015-06-29 08:13:03 -05:00
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
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
a4e9e5dbfc
replace Gokul Theme audio files with new versions https://github.com/HabitRPG/habitrpg/pull/5407#issuecomment-116251843
2015-06-29 13:16:14 +10:00
b72b14fe6c
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-28 21:07:32 -05:00
11396d4756
make costume option more noticeable and understandable - fixes https://github.com/HabitRPG/habitrpg/issues/5204
2015-06-28 19:40:39 +10:00
b5ca45a713
convert name of guild to link to guild in index list of public guilds
2015-06-28 15:35:37 +10: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
Blade Barringer