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
7719f46e49
Removed style preventing user from selecting tasks with keyboard
2015-06-30 16:54:04 -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
d44a0a1608
Shortened another line using new the object
2015-06-30 17:16:09 +10: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
0094d3267d
Fixed equivalency check (added missing '=')
2015-06-29 18:28:08 -04:00
bcfc17dd18
Added check for user id in active quest to 'isOnQuest'
2015-06-29 15:42:45 -04:00
860e68ee15
Merge remote-tracking branch 'upstream/develop' into update_isOnQuest_logic
2015-06-29 14:57:54 -04:00
bc837fd4db
Moved menu stuff to own controller
2015-06-29 12:39:05 -05:00
0b1cc5f0ea
Removed user.party.quest.key checks from isOnQuest. They are no longer accurate checks due to changes made in #5298
2015-06-29 13:12:29 -04: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
c8dd666939
Implemented changes as suggested by @crookedneighbour
...
Should be passing all tests now.
2015-06-29 18:11:12 +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
122920975d
add Trivial difficulty/priority setting to task Advanced Options (also remove whitespace at ends of lines)
2015-06-28 14:41:02 +10:00
fdbd18a8ed
New string in stats if gear has no benefits (take 2)
2015-06-28 09:23:49 +05:00
44a120b577
Revert "New string if gear has no benefits"
...
This reverts commit c2f0f89f2b
2015-06-28 09:18:39 +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
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
Blade Barringer