f71ae355ae
minor copyedit
2016-01-26 15:14:02 -08:00
1368e2182a
UX: Distinguish between noun and verb for "Archive"
2016-01-26 22:41:49 +01:00
915afa703d
Update Translations
2016-01-26 23:41:00 +05:30
06e637fc4a
Merge remote-tracking branch 'upstream/master' into update-locale-vietnamese
...
* upstream/master: (185 commits)
SECURITY: Upgrade rails.
FIX: new user summary page was broken
Version bump to v1.5.0.beta9
Remove addressable from Discourse.
UX: change glyph when inviting existing user to a topic
FIX: Allow for large free disk space
Revert "FIX: disk_space should be a BigDecimal to handle large disk (closes #3923 )"
UX: improve styling of messages and mobile view of messages
FIX: correct counts on user summary
FIX: link to filtered down list of badges from summary FEATURE: pick featured badges in summary page
FIX: do not allow new email to be duplicate FIX: return proper error message when email already exists
retain unactivated accounts a bit longer default
FEATURE: blocked users can send and reply to private messages from staff
Remove Arel patch that has been merged upstream.
correct path
little typo
FIX: Missing tag in CSS.
PERF: remove 10-20ms of work from every page view
FIX: remove green background for wiki (this can be re-added via a customization if needed)
Hotfix for unsubscribe via email
...
# Conflicts:
# .tx/config
2016-01-26 12:44:29 +07:00
003399bf96
Update translation code
2016-01-22 14:54:48 +07:00
954e3be7cf
little typo
2016-01-21 15:05:03 +01:00
1cee914565
FEATURE: make top criteria formula multipliers controlled by site
...
setting
2016-01-21 10:30:06 +05:30
fc3bedaaed
Merge pull request #3921 from gschlager/locale-sk
...
Add Slovak locale
2016-01-20 15:38:48 +01:00
c2c01cdb5d
FIX: username suggester to account for the more relaxed username rules ( closes #3907 )
2016-01-20 15:37:34 +01:00
ea02b7f54d
Merge pull request #3961 from dandv/patch-5
...
Include backups among items uploadable to s3
2016-01-20 14:39:21 +01:00
f61537bc16
Merge pull request #3952 from gdpelican/unsubscribe-via-email
...
Unsubscribe via email
2016-01-20 14:38:14 +01:00
c7283751a3
Unsubscribe via email
2016-01-20 22:25:25 +13:00
7303f8f309
FEATURE: first pass at user summary page
2016-01-20 15:14:25 +11:00
11ea16a91a
FIX: localize S3 region names
2016-01-19 17:14:45 +01:00
5018a8033d
FIX: add link to user profile for staged users
2016-01-19 16:41:07 +01:00
29fbc2d7bc
FIX: add missing 'user_replied_pm' translation
2016-01-19 15:47:38 +01:00
3083657358
FEATURE: better email in support
...
FEATURE: new incoming_email model
FEATURE: infinite scrolling in emails admin
FEATURE: new 'emails:import' rake task
2016-01-19 00:57:55 +01:00
d0bcea3411
better copy on read only mode
2016-01-18 14:17:38 -08:00
28cbeaf6be
add reply formatting info to new user tips
2016-01-18 14:10:14 -08:00
bfa4e6b69c
Update Translations
2016-01-19 01:29:19 +05:30
ca3e2b4da3
FEATURE: you can not drill down and see why you have badges
...
Clicking on badges filters down the list to a particular user.
2016-01-18 17:59:20 +11:00
a566adc5b2
Include backups among items uploadable to s3
...
Enabling S3 backups comes with a warning "requires valid S3 credentials entered in Files settings". This commit amends the description of s3_access_key_id to confirm it's the correct location for backup as well as image uploads to S3.
2016-01-16 18:08:27 -08:00
b8299a2710
log when staff blocks/unblocks someone
2016-01-14 15:05:11 -05:00
12790d8dcc
FEATURE: staff can block users, which prevents them from creating topics and replies
2016-01-14 14:42:06 -05:00
ffb24bf82d
omit needless words
2016-01-14 00:31:57 -08:00
365301fb23
FIX: Typo.
2016-01-13 18:52:59 +08:00
0d51315ec0
Merge pull request #3930 from tgxworld/ux_better_representation
...
UX: Improve copy for toolbar button that triggers emojis modal.
2016-01-13 18:52:29 +08:00
f1b8d2c52b
UX: Improve copy for toolbar button that triggers emojis modal.
2016-01-13 18:51:46 +08:00
e676974f16
Merge pull request #3953 from techAPJ/wiki
...
FEATURE: allow users to wikify their own posts based on trust level
2016-01-13 09:53:33 +05:30
e2744fc19f
FIX: adding the 'contains_messages' column back
2016-01-12 12:06:51 +01:00
8049dfdfda
CLEANUP: remove 'contains_messages' leftover 💩
2016-01-12 11:29:26 +01:00
06bac23e5f
FEATURE: allow users to wikify their own posts based on trust level
2016-01-12 08:44:25 +05:30
14c1100209
make "Visit the Topic" first text / buttonon email line
2016-01-11 16:49:28 -08:00
98c0fac461
FEATURE: add small action post when adding/removing users in messages
2016-01-11 12:42:06 +01:00
d732c0876a
Update translations
2016-01-08 15:50:00 -05:00
593c22eda1
Update Translations
2016-01-04 21:01:49 +05:30
e0ffce1cad
Add locale for Vietnamese
2016-01-03 10:05:28 +00:00
e45caa7e2e
make wiki help text general
2015-12-30 14:43:35 +05:30
51ced7aeae
make site setting for read time word count per minute
2015-12-30 12:15:30 +05:30
a4587b18f5
FEATURE: allow users to archive messages from message page
2015-12-30 13:26:39 +11:00
cee4da82d8
FIX: remove max value of tl3 requires days visited site setting because tl3 time period is configurable now. Setting tl3 requires days visited higher than tl3 time period will disable tl3 promotions.
2015-12-29 12:59:59 -05:00
90d15ba588
Update Translations
2015-12-29 23:16:17 +05:30
70e0955498
fix desktop notification title for group mentions
2015-12-29 22:22:35 +05:30
6ef1537ee0
FEATURE: better unfurling of Discourse topics on Slack
2015-12-28 19:10:19 +05:30
47410f1b99
Update Translations
2015-12-23 17:01:43 +05:30
03ea0bfe22
FEATURE: allow users to archive messages
...
Messages are now in 3 buckets
- Inbox for all new messages
- Sent for all sent messages
- Archive for all messages you are done with
You can select messages from your Inbox or Sent and move them to your Archive,
you can move messages out of your Archive similarly
Similar concept applied to group messages, except that archiving and unarchiving
will apply to all group members
2015-12-23 11:09:30 +11:00
f40249faad
FEATURE: make trust level 3 time period admin setting
2015-12-22 23:26:19 +05:30
c87fff670d
add category list label and state
2015-12-21 23:07:16 +05:30
e83f050454
shorter email footer copy
2015-12-20 23:38:08 -08:00
63076a841e
Merge branch 'refactor_user_page'
2015-12-20 16:50:33 +11:00
a8b5192efd
FEATURE: User page refactor
...
Re-organise user page so it is easier to find interesting info
split it into tabs
- Introduce notifications and messages tabs
- Stop couting stuff for the user page to speed up rendering
- Suppress more information when viewing your own profile
2015-12-20 16:45:49 +11:00
fe10f3e0a3
Update translations
2015-12-18 10:48:02 -05:00
4c967d11b4
FEATURE: log site text changes
2015-12-18 19:42:06 +05:30
05b12d108f
FIX: broken links to user profile on subfolder install
2015-12-15 14:26:23 -05:00
2230879a24
Merge pull request #3922 from featheredtoast/username-email-from-field
...
username as from in emails
2015-12-15 21:23:53 +11:00
bffdc5907a
username as from in emails
...
Add a site setting to display name in from header for emails
2015-12-15 00:34:04 -08:00
15c229195f
FEATURE: notification_level on a per-group basis
2015-12-14 23:17:09 +01:00
e56f8fa471
Add Slovak locale
2015-12-14 21:55:36 +01:00
d0bbf5c9a6
Update Translations
2015-12-14 23:04:01 +05:30
e65a7370ef
FIX: disable avatar education message when 'allow_uploaded_avatars' is
...
disabled
FEATURE: setting to disable avatar education message
2015-12-14 22:47:35 +05:30
b2c73e7045
UX: On mobile use a dropdown for topic controls instead of many buttons
2015-12-11 15:09:09 -05:00
978a1539fa
new pop3_polling_enabled setting validator to ensure credentials are working before enabling it
2015-12-10 22:23:54 +01:00
1d70434de5
use light email template for staged users
2015-12-09 19:45:46 +01:00
c447900e3b
fix build
2015-12-09 12:33:09 +01:00
ccd8865bf3
make email unsubscribe footer a single line
2015-12-09 00:55:54 -08:00
e52852dd0f
FIX: Autoclose message was not correct when immediate
...
FEATURE: Warn when setting auto-close for right now
2015-12-08 18:16:48 +05:30
3aa5129f54
FEATURE: allow group members to see all messages on group page
2015-12-07 23:19:33 +01:00
b781b6aea3
Add `header_instructions` overridable translation for email headers.
2015-12-07 16:52:33 -05:00
b227897c44
Update Translations
2015-12-07 23:29:32 +05:30
a37d575d7d
FEATURE: new 'My Groups' messages filter in user page
2015-12-07 18:37:03 +01:00
578f606a1a
add 'incoming_email' to groups
2015-12-07 12:39:28 +01:00
8d49091572
PERF: stop running VACUUM FULL only run VACUUM
2015-12-07 20:14:26 +11:00
7917316f6f
FEATURE: display warning on top of composer for group mentions
...
If users attempt to mention a group that is "mentionable" display a warning
informing them that people will be notified.
2015-12-04 13:41:07 +11:00
18c9d966a1
reverse order of unsubscribe link options
...
should be in order that we want the user to do it
2015-12-03 16:14:43 -08:00
89d7c56fb2
email footer copy improvements
2015-12-03 16:00:24 -08:00
d84fa69ade
minor copyedit on dismiss unread
2015-12-03 15:31:56 -08:00
daada2b0d1
minor copyedits on flagging
2015-12-03 15:13:29 -08:00
19f1314a3a
remove unused locale strings
2015-12-02 13:07:58 +05:30
d3c9050e0f
improve copy
2015-12-02 15:57:50 +11:00
de88be2fbc
Support for "Only show overridden" in site text customization
2015-11-30 15:25:08 -05:00
04593b8fef
Update Translations
2015-12-01 01:09:45 +05:30
ad3dd161e7
FEATURE: first class group mentions built in
...
If you allow a group to be mentioned it can be mentioned with the @ symbol.
Keep in mind as a safety mechanism max_users_notified_per_group_mention is set to 100
2015-11-30 17:08:43 +11:00
5a7831265a
add search example for category name with space
2015-11-29 02:07:24 +05:30
86374c90de
FIX: if the email template has multiple subjects, link to customize text page
2015-11-28 11:50:02 +05:30
5e93140f85
FEATURE: Can override any translation via an admin interface
2015-11-27 11:35:19 -05:00
6354324f2f
FIX: validate automatic membership email domains
2015-11-27 12:35:33 +05:30
f74a6457ee
FEATURE: allow CJK to be tokenized in non CJK sites.
...
Meaning a mixed English/Chinese site can still have a functioning search.
2015-11-27 16:35:27 +11:00
ba0df7e4cd
rename 'is_support' to 'contains_messages'
2015-11-26 18:40:54 +01:00
9ef8397164
new Category.is_support attribute
2015-11-26 18:31:24 +01:00
8a4c91f3ef
Update translations
2015-11-25 17:09:48 -05:00
d65ec1af2e
Rename `ninja_edit_window` to `editing_grace_period` :'(
2015-11-24 14:28:42 -05:00
362c515f33
FEATURE: compose a new pre-filled message via URL
2015-11-24 18:55:45 +05:30
bde05fd334
Update Translations
2015-11-23 19:25:06 +05:30
db2799507b
FIX: admin trust level user list URL should be consistent with new naming
2015-11-23 14:28:56 +05:30
523138f1fd
FEATURE: add setting pending_users_reminder_delay to configure when to send reminders to moderators about user approvals based on how long new users have been waiting
2015-11-20 16:06:07 -05:00
6ec336e56f
Update Translations
2015-11-20 23:26:48 +05:30
8eeb027c65
Can revert changes to email templates
2015-11-20 12:30:21 -05:00
bb1d0dea8a
UX: better flagging options
2015-11-20 22:23:29 +05:30
f5b34d5f53
FEATURE: Admin interface for editing email templates
2015-11-19 16:39:34 -05:00
cf86f27415
FEATURE: New setting to allow all caps posts
...
Adds a setting to ignore text_sentinel's check on all caps content.
2015-11-18 09:50:50 -08:00
bb76c389fd
Merge pull request #3817 from gschlager/locale-pluralization
...
FIX: Pluralizations in English locale files
2015-11-17 12:35:24 -05:00
92ba6125c4
FEATURE: new 'automatically_unpin_topics' user preference
2015-11-17 18:21:40 +01:00
aeccc030d6
Update Translations
2015-11-16 20:55:35 +05:30
a00c373b6f
UX: Show translated modifier keys in editor shortcuts
2015-11-14 23:13:22 +01:00
c3724bd2cb
add note about UTC time to backup time of day
2015-11-13 16:38:59 -08:00
6e33a21a7a
FIX: Replace invalid pluralizations in locale files
2015-11-13 21:25:15 +01:00
236f8bb0f7
Update Translations
2015-11-12 22:06:59 +05:30
de95573d23
FEATURE: new 'backup_with_uploads' site setting
2015-11-12 16:23:59 +01:00
72a7bd38e1
FEATURE: new 'backup_time_of_day' site setting
2015-11-12 16:14:49 +01:00
6dd4bc7d57
FEATURE: support group owner, capable of controlling group membership
...
Group owners are regular users that can add or remove users to a group
The Admin UX allows admins to appoint group owners
The public group UX will display group owners first and unlock UI to
add and remove members
Group owners can only be appointed on non automatic groups
Group owners may not appoint another group owner
2015-11-10 00:56:57 +11:00
8ba7c06b7d
Merge pull request #3735 from riking/patch-4
...
FIX: Discourse.BaseUri should not default to /
2015-11-06 14:52:19 -05:00
6b197179c9
FEATURE: new 'automatically_unpin_topics' site setting
2015-11-06 17:12:12 +01:00
a800ff1985
Update translations
2015-11-04 13:25:29 -05:00
d00762dcd5
Merge pull request #3787 from gschlager/locale-keys
...
FIX: Some strings in locale files were not translatable
2015-11-02 13:40:22 -05:00
a44c2f6ea3
Update Translations
2015-11-02 17:49:57 +05:30
606b10445e
FEATURE: remove muted topics from suggested and latest
2015-11-02 09:20:22 +11:00
54da461024
UX: simplify Dismiss menu
2015-10-31 15:31:05 +11:00
7eafca8f9d
Remove unused translations
2015-10-30 15:31:44 -04:00
574805b682
Update Translations
2015-10-30 18:16:52 +05:30
b9437936ab
Merge pull request #3848 from gschlager/patch-2
...
Remove example CSS selectors from locale file
2015-10-29 10:01:52 +01:00
bb79e6aff7
FEATURE: new hide_user_profiles_from_public site setting
2015-10-28 19:56:08 +01:00
6b236d3c83
FEATURE: Bulk Unlisting of topics
2015-10-27 16:57:40 -04:00
47e25648df
FEATURE: Change user groups in bulk via admin
2015-10-26 15:57:30 -04:00
c3cadbb4d8
Update Translations
2015-10-26 22:38:34 +05:30
0ea54e9255
UX: don't show an empty list when all extensions are authorized
2015-10-22 20:11:17 +02:00
9793ea2c8a
UX: change Dismiss button title and add tooltip
2015-10-22 07:52:47 +05:30
717be06f17
Update Translations
2015-10-20 23:11:42 +05:30
4a880a758f
FEATURE: new Dismiss posts/topics modal
2015-10-20 16:07:02 +05:30
94b60e62a2
FEATURE: New markdown editor re-written in Ember
...
Note this commit leaves out the biggest occurrence of the editor
which is the post/topic composer.
To avoid major breakage, this replaces it everywhere else it was
used:
* User preferences (About Me)
* Admin Customizations > Text Content
* Category Templates
* Editing Queued Posts
A future commit will replace the main composer with this editor
and will remove the unused pagedown code.
2015-10-19 11:01:20 -04:00
9e01a7d834
copyedits on category description topic text
2015-10-16 13:12:34 -07:00
06f616792d
Update Translations
2015-10-15 18:19:04 +05:30
37c5909a31
FIX: use the first image in the first post in the topic as opengraph image
...
FEATURE: new 'default_opengraph_image_url' setting
2015-10-15 11:00:47 +02:00
a527c58c7d
UX: Show a nicer "Log In" screen if the user follows `/my/preferences`
2015-10-14 13:39:31 -04:00
b817bebdff
clarify wording on globally pinned topics
2015-10-13 14:53:55 -07:00
23f46cd6de
update copy for muted topics
2015-10-13 14:40:35 -07:00
7802757306
FIX: Username for topic creation is required
2015-10-13 16:33:26 -04:00
ae4ef1e70f
Add spinner to composer saving
2015-10-13 13:06:24 -04:00
e29fe77b45
FEATURE: make trust level for message sending configurable
...
- add min_trust_to_send_messages site setting (default 1) to allow admins
to configure when messages can be sent between members
2015-10-12 11:15:48 +11:00
b72434d024
FEATURE: add 'change ownership' button in post admin wrench
2015-10-11 23:53:45 +05:30
11a6b61cbd
Remove example CSS selectors from locale file
2015-10-11 14:48:37 +02:00
43cd0912e6
Update Translations
2015-10-11 02:11:28 +11:00
8cabc14099
FEATURE: Allow default period to be set for Top Page
2015-10-06 12:04:31 -04:00
cce830e42c
Fix run-on sentence re. entering HTML tables
2015-10-03 20:54:10 -07:00
1e5ad6f219
Update translations
2015-10-02 10:40:28 -04:00
7186b4d641
Adds pluralization to js.user.invited.truncated
...
https://meta.discourse.org/t/showing-the-first-count-invites-needs-pluralization/33988
2015-10-01 16:22:08 +02:00
4986314122
Add "more..." to emoji popup in composer.
2015-09-29 16:16:52 -04:00
083bdcc8aa
mild copyedits on rate limiting messages
2015-09-29 02:44:03 -07:00
a2e8e5f90b
Update Translations
2015-09-29 12:30:01 +05:30
7ca75a88ce
UX: always show logout link in user menu, use CSS to hide
...
.menu-panel .logout-link {display: none}
2015-09-25 12:15:34 +10:00
2422289c8b
FIX: whispers should not be revealed in reply to, or reply expansion
...
FEATURE: mark whisper as experimental
FIX: badges should never apply to whispers
2015-09-25 10:16:19 +10:00
0b4cb5cf0d
Add better error messages for rate limits.
2015-09-24 13:52:46 -04:00
f031558aa5
Update Translations
2015-09-24 18:08:25 +05:30
5ca26a7707
FEATURE: add site setting use_admin_ip_whitelist to enable/disable the whitelisting of admins by IP address
2015-09-23 12:15:08 -04:00
7d4dbc9962
Give example values for CSS rules in embedding
2015-09-23 12:10:15 -04:00
36309e50cc
Merge pull request #3767 from tgxworld/track_user_profile_views
...
Track user profile views
2015-09-23 11:38:18 +02:00
1aad58b642
Merge pull request #3781 from tgxworld/feature_log_category_settings
...
Feature log category settings
2015-09-23 11:34:08 +02:00
e36c0966d0
FIX: :( page was never showing the URL
2015-09-21 11:38:37 -07:00
7a9404750e
Update Translations
2015-09-21 17:51:42 +05:30
ccdd614d7f
missing updated copy for category notification prefs
2015-09-18 16:14:18 -07:00
ade31c4468
FIX: Remove duplicate keys from locale files
2015-09-19 00:14:26 +02:00
3457ecfd04
minor copy tweaks
2015-09-18 13:26:29 -07:00
49fc4571b0
Update Translations
2015-09-19 01:09:12 +05:30
f37f6f7673
minor embed style tweak
2015-09-18 02:44:13 -07:00
a4ace3f08e
FEATURE: ui for ordering search results in full page mode
2015-09-18 17:16:53 +10:00
f39b9124b6
FEATURE: Log staff actions for Category changes.
2015-09-18 10:53:08 +08:00
07e7b07b63
FIX: refreshing gravatar wasn't working
2015-09-17 19:42:44 +02:00
33f23500f9
minor copyedit
2015-09-17 00:20:34 -07:00
0969bd0f0d
tighten up post spacing on mobile
2015-09-16 23:48:15 -07:00
7e8f4286e3
FEATURE: Allow emoji in some translated strings
2015-09-16 18:33:17 -07:00
fbfdb4c28a
minor copyedit
2015-09-16 17:18:16 -07:00
4714483612
copyedits on anon user call to signup action
2015-09-16 17:16:17 -07:00
a2e51b0715
FIX: too few topics/posts notice will only show what needs to be done
2015-09-16 17:12:11 -04:00
390af7118a
Merge branch 'master' into signup-cta
...
Conflicts:
app/assets/javascripts/discourse/templates/topic.hbs
2015-09-16 10:06:47 -07:00
3ba6d54843
Update Translations
2015-09-16 19:50:29 +05:30
5277ec1ac0
FIX: ensure we have a bucket before enabling backups to S3
2015-09-16 15:55:26 +02:00
21725cc907
FEATURE: Admin dashboard data for user profile views.
2015-09-16 14:48:31 +08:00
7acc93b2a0
FEATURE: Track user profile views.
2015-09-16 14:48:31 +08:00
922c09784b
shorten so fits better in UI
2015-09-16 12:33:11 +10:00
b2ef9a02bf
Less words, correct copy
2015-09-16 11:37:56 +10:00
75e8fa3ee0
document new search predicates
2015-09-16 08:51:28 +10:00
a60a251c93
we actually support inline replies, mostly
2015-09-15 15:04:28 -07:00
d47f1db2be
Merge branch 'master' into signup-cta
...
Conflicts:
app/assets/javascripts/discourse/templates/topic.hbs
2015-09-15 13:52:12 -07:00
b12ace5f9d
FEATURE: Add staff gear icon to composer with options
2015-09-15 16:42:04 -04:00
2e2fa693f5
You need to translate the site settings, dummy
2015-09-15 12:42:14 -07:00
6be78861ca
Merge branch 'master' into signup-cta
...
Conflicts:
app/assets/javascripts/discourse/lib/key-value-store.js.es6
2015-09-15 12:26:25 -07:00
41721b0898
Rename variables
2015-09-15 12:25:29 -07:00
d49f382dcc
[CI SKIP] Typo.
2015-09-15 15:55:23 +08:00
3a93fafb58
FIX: Add `when` to split this topic text
2015-09-14 16:15:34 -04:00
632c170caa
Update Translations
2015-09-14 20:02:40 +05:30
a5f906db69
Merge branch 'master' into category-reorder
2015-09-13 19:07:36 -07:00
6891c7f8aa
little typo?
2015-09-13 22:45:26 +02:00
5af0f5f80e
FEATURE: Whisper posts
2015-09-11 14:05:21 -04:00
42263ac969
use translations (doh)
2015-09-11 09:46:54 -07:00
4f5d42ca69
Merge pull request #3749 from riking/patch-1
...
FIX: Don't allow editing seeded category security settings
2015-09-11 12:22:58 -04:00
6437cd0341
FEATURE: add support for generic external avatar services
...
This changes it so we only ship an avatar template down to the client
it has no magic, all it knows is how to plug in size
2015-09-11 15:10:56 +02:00
8ca2ab1b3b
Update some strings to meet referred options lists
...
The options which changed strings are referred, were changed to lists so these strings were supposed to be generalized.
2015-09-11 15:02:12 +03:00
d73d4d4769
FIX: UserNameSuggester should not suggest usernames with a sequence of 2 or more special chars
2015-09-11 16:53:26 +05:30
aca70805f1
FIX: Discourse.BaseUri should not default to /
2015-09-10 17:34:08 -07:00
2742602254
FEATURE: support for external letter avatars service
2015-09-11 02:12:40 +02:00
e43034f08f
Revert "FEATURE: SVG letter avatars (based on @eviltrout's spike)"
...
This reverts commit cd77465788
2015-09-11 00:23:52 +02:00
Jeff Atwood
Gerhard Schlager
Arpit Jalan
Khoa, Le Ngoc
David García-Navas López de Cuéllar
Régis Hanol
James Kiesel
Sam Saffron
Dan Dascalescu
Neil Lalonde
Guo Xiang Tan
root
Jeff Wong
Robin Ward
cpradio
Kane York
ismail-arilik