3109d111a4
Merge pull request #3092 from vector-im/feature/bca/paged_room_list
...
Room List performance PR (use Live PagedList via Monarchy)
2021-04-06 14:13:47 +02:00
f42d143679
Merge pull request #3097 from vector-im/feature/bma/retrofit_suspend
...
Migrate Retrofit interface to coroutine calls
2021-04-06 14:11:07 +02:00
2d4866cdc5
Add better support for empty room name fallback
2021-04-06 09:57:33 +02:00
f998c2f945
Fix avatar rendering for DMs, after initial sync ( #2693 )
...
Also better handling of previous DMs management
2021-03-31 22:55:53 +02:00
cd6fab0e2d
Fix empty state + cleaning + changelog
2021-03-31 18:05:08 +02:00
6a91c2b355
Migrate Retrofit interface to coroutine calls
2021-03-31 17:59:13 +02:00
295be5286b
Merge branch 'develop' into feature/bma/cleanup
2021-03-31 17:55:50 +02:00
f4c84d599f
Add changelog for the next release.
2021-03-31 11:39:06 +02:00
c7c76d1e67
Timeline: clean code and update CHANGES
2021-03-30 20:04:26 +02:00
86e23a5300
Merge branch 'develop' into develop
2021-03-26 17:25:57 +01:00
40929b9640
Update CHANGES.md for a release with 1.1.4
2021-03-26 17:21:33 +01:00
7453509df4
Merge remote-tracking branch 'upstream/develop' into develop
2021-03-26 14:09:21 +01:00
a7539d0f95
Be more robust when parsing some enums
2021-03-26 12:15:06 +01:00
627e9a9543
Add version details on the login screen, in debug or developer mode
2021-03-25 11:18:26 +01:00
967b8f4afb
Merge branch 'develop' into feature/bma/reply_image_preview
2021-03-22 20:49:32 +01:00
7db1d81eb6
Changelog added.
2021-03-22 16:19:51 +01:00
7b8ede03bc
Picture preview when replying. Also add the image preview in the message detail bottomsheet ( #2916 )
2021-03-19 20:09:53 +01:00
fa37070884
Disable URL preview for some domains ( #2995 )
2021-03-19 17:23:19 +01:00
43fd9910e3
Merge pull request #3031 from vector-im/feature/bma/other_fixies
...
Some fixies
2021-03-19 17:06:54 +01:00
1214abdd44
Merge branch 'develop' into feature/bma/split_key_request
2021-03-19 15:57:55 +01:00
485c44454b
Handle encrypted reactions ( #2509 )
2021-03-19 15:27:56 +01:00
adca3de3b5
Improve message with Emoji only detection ( #3017 )
2021-03-19 13:48:49 +01:00
3b16351308
Fix bad theme change for the MainActivity
2021-03-19 13:36:24 +01:00
6b284f2a16
Merge branch 'develop' into feature/bca/bulk_no_olm
2021-03-19 10:23:37 +01:00
cfefde0c06
Update CHANGES.md
2021-03-19 10:23:23 +01:00
9f47598950
Display the room shield in all room setting screens
2021-03-18 18:01:21 +01:00
35635c859d
Send several NO_OLM in one request
2021-03-18 15:08:56 +01:00
9946ba8aa4
Split network request `/keys/query` into smaller requests (250 users max) ( #2925 )
2021-03-18 10:41:52 +01:00
3078adf0da
Version++
2021-03-18 10:40:33 +01:00
1eda7fa5bb
Prepare release 1.1.3
2021-03-18 10:35:03 +01:00
bab01ea309
Merge branch 'develop' into feature/bma/improve_perf
2021-03-17 18:10:14 +01:00
67ff43cecc
Changelog
2021-03-17 15:04:39 +01:00
1f82b1442d
Merge branch 'develop' into feature/fga/fix_ui_timeline
2021-03-17 15:03:22 +01:00
5edf7ca520
Version++
2021-03-16 22:31:25 +01:00
2d64fe96c1
Prepare release 1.1.2
2021-03-16 22:08:29 +01:00
616a46294c
Update CHANGES
2021-03-16 20:14:20 +01:00
3b5dacd7e2
Merge branch 'develop' into feature/bca/fix_video_wont_play
2021-03-16 16:15:24 +01:00
f90bc17eb3
Merge pull request #3005 from vector-im/feature/bma/restore_code
...
Restore code
2021-03-16 15:54:57 +01:00
a52d20eeff
Regression: Video will not play upon tap
2021-03-16 15:26:06 +01:00
b3ccd788f6
Merge pull request #2997 from ShadowJonathan/no-bold
...
Change ISSUE_TEMPLATE bold lines to proper headers
2021-03-16 15:03:15 +01:00
e541a3b962
Merge branch 'develop' into feature/bca/workaround_stuck_message
2021-03-16 15:00:55 +01:00
641ce206c2
Move change to correct release version ( #3001 )
2021-03-16 14:48:27 +01:00
4273a6a1be
Merge pull request #3001 from timokoesters/fix-parsing-servername
...
fix: make cross signing work with server names containing :
2021-03-16 14:46:47 +01:00
431d450fec
Merge branch 'develop' into feature/bma/rr
2021-03-16 14:46:10 +01:00
5b94540f76
Quick Work around to remove stuck messages
2021-03-16 12:16:11 +01:00
dd2a7397a4
fix: make cross signing work with server names containing :
...
Server names are allowed to contain ':' to specify a port, see https://matrix.org/docs/spec/appendices#server-name
User ids on the other hand are not allowed to contain ':', even
historical user ids, see https://matrix.org/docs/spec/appendices#historical-user-ids
Therefore we can use the first instance of ':' to split the user
localpart from the server name.
2021-03-15 22:31:34 +01:00
4f3734f932
Ensure message are decrypted in the room list after a clear cache
2021-03-15 16:53:19 +01:00
13cbfaf5e7
Do not load room members in e2e after init sync
2021-03-15 15:29:20 +01:00
863e199995
Update CHANGES.md to include the correct PR number
2021-03-15 01:33:46 +01:00
e8015bfbd4
Update emoji_picker_datasource.json to Unicode 13.1 and dynamically filter reactions by renderability
2021-03-15 00:20:59 +01:00
2708b85a20
Update CHANGES.md
2021-03-14 19:17:05 +01:00
857bfcb971
Cleanup
2021-03-12 12:18:21 +01:00
e8d4fab305
Add template for 1.1.2
2021-03-12 12:17:29 +01:00
8c24dd0fba
Add entry in changelog
2021-03-10 21:55:59 +01:00
5aa8b0255a
Fix MainActivity display ( Fixes #2927 )
2021-03-10 15:34:28 +01:00
8356d18a67
Improve Snackbar duration ( Fixes #2929 )
2021-03-10 14:49:52 +01:00
1fe8dfa810
Merge pull request #2978 from vector-im/feature/fga/send_queue_rework
...
Feature/fga/send queue rework
2021-03-10 09:27:21 +01:00
3c7a108940
Send: clean and update CHANGES
2021-03-09 18:18:28 +01:00
25ea1ba641
Fix issue with local echo
2021-03-09 14:08:33 +01:00
9719c0b2f9
Split init sync insertion into 2 transactions.
...
Ephemeral Events can be inserted later, so the room list can be displayed faster.
2021-03-05 09:47:57 +01:00
e5656e264a
Merge pull request #2940 from vector-im/feature/bma/various_fixies
...
Rework event edition management
2021-03-04 18:03:45 +01:00
e401252c03
Merge pull request #2956 from vector-im/feature/bma/scripts
...
Add a script to download and install APK from Buildkite
2021-03-04 14:01:30 +01:00
0b5135b841
Add a script to download and install APK from Buildkite
2021-03-03 20:37:19 +01:00
57df61dadf
Changelog
2021-03-03 14:55:45 +01:00
5c9750fb07
Moar cleanup after rebase and before merge
2021-03-02 19:18:19 +01:00
ae648c3e11
Make outbound key sharing strategy configurable.
2021-03-02 18:49:11 +01:00
d504a1f266
Merge pull request #2948 from vector-im/feature/bma/redactedEvent
...
Make Event.type optional
2021-03-02 18:06:11 +01:00
56af0b5191
Merge pull request #2947 from kafji/kfj/room-preview-tooltip
...
Add tooltip for room quick actions
2021-03-02 16:36:49 +01:00
4e2e73637a
Be robust if Event.type is missing ( #2946 )
2021-03-02 16:14:57 +01:00
3357c78375
Add tooltip for room quick actions
...
Add tooltip for low priority, favorite, and room settings quick actions.
Signed-off-by: Kafji <k@kafji.net>
2021-03-02 19:47:33 +07:00
33b3f0650c
Permit cleartext for .onion addresses
...
The Tor and Onion service protocols provide encryption and authentication
respectively. Since Domain Validation certificates aren't currently being
issued for .onion addresses, the HTTPS requirement makes Element practically
incompatible with homeservers operated by individuals on Tor.
Signed-off-by: Martin Häger <martin.haeger@gmail.com>
2021-03-02 12:46:12 +01:00
097668b762
Rework edition of event management - step 2
2021-03-01 20:42:47 +01:00
c152964323
Merge pull request #2908 from vector-im/feature/bma/jitsi_pip
...
PIP support for Jitsi call
2021-03-01 11:41:34 +01:00
60cc441092
Merge pull request #2905 from vector-im/feature/bma/preview_fix
...
Try to fix crash about UrlPreview (#2640 )
2021-02-23 16:07:16 +01:00
486815b9ab
Pip
2021-02-23 11:28:38 +01:00
29359ad119
Update change after rebase
2021-02-23 10:31:58 +01:00
c938795576
Read init sync to a file and split into smaller files to handle it
2021-02-23 10:31:19 +01:00
bebb956005
Try to fix crash about UrlPreview ( #2640 )
2021-02-22 17:44:11 +01:00
b38ff46af4
Merge pull request #2896 from vector-im/feature/bma/dependabot
...
Upgrade dependencies
2021-02-22 12:22:43 +01:00
ef3d8f365a
Changelog
2021-02-21 16:52:19 +01:00
80524fb8c1
Cleanup
2021-02-19 21:29:23 +01:00
e1f778e21a
Changelog
2021-02-19 21:28:44 +01:00
747a5ded1a
Version++
2021-02-19 21:10:27 +01:00
809c0e720e
Prepare release 1.1.0
2021-02-19 19:30:38 +01:00
1294d211d6
Merge branch 'develop' into feature/bma/fix_redirection
2021-02-19 14:43:01 +01:00
2df9b43abc
Make the code a bit easier to understand (no change)
2021-02-18 18:42:55 +01:00
fc1c2bc2c0
Merge pull request #2828 from vector-im/feature/bma/color_step_1
...
First step about color cleanup
2021-02-17 18:27:44 +01:00
0e322630f1
Ignore url override from credential if it is not valid ( #2822 )
2021-02-17 18:18:36 +01:00
6aa5dc992d
Migrate AuthenticationService API to coroutines ( #2449 )
2021-02-17 18:18:36 +01:00
9501fd74f0
Merge pull request #2826 from vector-im/feature/bma/fix_crash
...
Fix crash reported by PlayStore (#2707 )
2021-02-16 13:10:21 +01:00
3ac3f09df0
Merge branch 'develop' into feature/bma/lang
2021-02-16 11:40:24 +01:00
bec4af7c87
Fix crash reported by PlayStore ( #2707 )
2021-02-16 11:23:36 +01:00
b0ea7cecb5
Move all colors to the same file and rename it
2021-02-16 10:37:17 +01:00
cf0b4d2581
Merge branch 'develop' into feature/bca/devtools
2021-02-15 16:00:32 +01:00
7c865e1a26
changelog
2021-02-12 20:59:20 +01:00
ca09feb2e5
Merge branch 'develop' into feature/bma/room_settings_ux
2021-02-11 22:00:58 +01:00
bfa384ad5b
Merge pull request #2807 from vector-im/feature/bca/fix_404_initialize_xs
...
fix post initial sync crash on 404
2021-02-11 14:02:15 +01:00
c93fd2a05d
Merge pull request #2806 from vector-im/feature/bma/upgrade_jitsi
...
Upgrade jitsi
2021-02-11 13:58:05 +01:00
ebe9d42780
Also update the template year
2021-02-11 12:07:22 +01:00
7e2f892904
CHANGES.md: fix typos
...
- it's 2021
Signed-off-by: Maximillian Bensch <lorddavidiii@qi0.de>
2021-02-10 23:36:20 +01:00
ba24c30d38
Improve room profile UX
2021-02-10 17:32:36 +01:00
0957ff69c4
fix post initial sync crash on 404
2021-02-10 16:39:26 +01:00
1ec4424c0a
Upgrade Jitsi library from 2.9.3 to 3.1.0
2021-02-10 12:15:32 +01:00
e5da026f1f
Dev tools initial commit
2021-02-10 10:17:19 +01:00
aaeca96336
Merge branch 'develop' into feature/fga/voip_v1_start
2021-02-09 21:23:55 +01:00
08b65b57e4
Version++
2021-02-09 21:08:46 +01:00
a8086ceb43
Prepare release 1.0.17
2021-02-09 21:07:25 +01:00
f78c72db59
Merge branch 'develop' into feature/fga/voip_v1_start
2021-02-09 11:52:18 +01:00
fade21de57
Merge branch 'develop' into feature/bma/jitsi_in_timeline
2021-02-08 17:43:49 +01:00
0ed327646a
Merge branch 'develop' into feature/fga/voip_v1_start
2021-02-08 16:45:15 +01:00
eecb789603
Merge pull request #2765 from vector-im/feature/bma/big_e2e_rooms
...
[DANGEROUS PR] Properly delete all objects from Realm, avoid orphaned
2021-02-08 15:44:43 +01:00
d2c912e5c4
Merge branch 'develop' into feature/bma/url_preview_fixes
2021-02-08 14:32:55 +01:00
55f410636f
Merge pull request #2797 from vector-im/feature/bma/app_name
...
Change app name from "Element (Riot.im)" to "Element"
2021-02-08 14:26:25 +01:00
1212bb8d70
Change app name from "Element (Riot.im)" to "Element"
2021-02-08 12:39:35 +01:00
93890343b6
Merge pull request #2786 from vector-im/feature/bma/rtl
...
Feature/bma/rtl
2021-02-08 11:52:06 +01:00
07220d7a59
URL preview on reply fallback ( #2756 )
2021-02-07 15:28:07 +01:00
ed99b503f5
Open image from URL Preview ( #2705 )
2021-02-07 15:00:07 +01:00
d47ba6bd11
Create a WidgetItemFactory and use it for better rendering of Jitsi widget change (video conference)
2021-02-06 16:52:46 +01:00
d903dfb40b
Merge branch 'develop' into feature/bma/widget_url_robustness
2021-02-06 11:19:15 +01:00
41e4e823fb
HTML unescaping for URL preview ( #2766 )
2021-02-05 20:40:57 +01:00
407134a89f
RTL: some arrows should be rotated in RTL ( #2757 )
2021-02-05 19:56:39 +01:00
627d3b5b79
Merge branch 'develop' into feature/bca/fix_duplicate_thumbs
2021-02-05 18:48:56 +01:00
ad187f99bf
Merge pull request #2779 from vector-im/feature/bca/fix_join_by_alias_deferation
...
Join room other federation via alias error
2021-02-05 18:48:23 +01:00
5b3065730e
Widget: avoid empty user display name
2021-02-05 09:36:29 +01:00
6d5f89b65b
Fixes #2778
2021-02-04 18:06:35 +01:00
34fd5e7191
Upgrade build tools
2021-02-04 18:02:47 +01:00
6cd462f852
Merge branch 'develop' into feature/fga/voip_v1_start
2021-02-04 16:52:06 +01:00
64694a4eda
Fix duplicate thumbs reactions
2021-02-04 16:13:57 +01:00
d11ed8c4ef
Version++
2021-02-04 15:17:46 +01:00
e51f2b8bc1
Prepare release 1.0.16
2021-02-04 13:25:12 +01:00
3c06517d9e
Fix crash on API < 30 and light theme ( #2774 )
2021-02-04 12:32:13 +01:00
a65f846929
Version++
2021-02-03 17:09:32 +01:00
061f3c6919
Prepare release 1.0.15
2021-02-03 17:07:49 +01:00
bc22647b48
Merge pull request #2753 from vector-im/feature/bca/sso_reauth
...
Feature/bca/sso reauth
2021-02-03 16:12:54 +01:00
3b65761110
Delete on cascade
2021-02-02 21:23:57 +01:00
49aed39711
Fix multiple tasks
2021-02-02 17:11:45 +01:00
e6fc605b08
Data for Worker overload ( #2721 )
2021-02-02 11:40:52 +01:00
8129cd0cd3
Cleaning + changelog
2021-02-02 09:32:04 +01:00
9c9c1fa79c
VoIP: make some clean up and update CHANGES
2021-02-01 19:19:46 +01:00
06be3e691d
Support $matrix_widget_id parameter.
2021-02-01 18:13:26 +03:00
57dba2f29a
Merge branch 'develop' into feature/ons/fix_url_preview_on_edit
2021-01-25 16:05:26 +01:00
0a96841336
Merge branch 'develop' into develop
2021-01-22 17:20:36 +01:00
4dcd7846b0
Merge pull request #2616 from vector-im/feature/ons/android_11_migration
...
Migrate to Android 11, API 30.
2021-01-22 17:17:04 +01:00
883a7cecf0
Fix viewbinding npe crashes.
2021-01-22 15:34:40 +03:00
daf019b288
Identity: Recompute hashes after M_INVALID_PEPPER
...
When a new pepper is retrieved after an M_INVALID_PEPPER response,
recompute hashes with that pepper, and send those new hashes in the next
lookup attempt instead of reusing the original hashes.
Signed-off-by: Andrew Ferrazzutti <fair@miscworks.net>
2021-01-21 21:52:19 -05:00
5eeb545ae2
Update url preview when the event is edited.
2021-01-21 15:20:19 +03:00
277fc4bf61
Merge branch 'develop' into feature/bma/fix_clear_cache
2021-01-20 17:15:02 +01:00
4709002429
Fix clear cache issue: sometimes, after a clear cache, there is still a token, so the init sync service is not started.
...
Migratiing to supend methods fixes the problem, I'm not sure why...
2021-01-20 15:19:48 +01:00
f36bab0a7a
Limit drawer layout with max width.
2021-01-19 15:33:35 +03:00
2c0b7ce0f4
Dagger: update to 2.31 and use new AssistedInject
2021-01-15 15:23:24 +01:00
72ee1ace48
Version++
2021-01-15 11:14:59 +01:00
f0f0aafa1b
Prepare release 1.0.14
2021-01-15 11:13:36 +01:00
844fe2c4cd
Merge branch 'develop' into feature/bca/crypto_store_outbound
2021-01-14 10:43:38 +01:00
c88072e55f
Merge branch 'develop' into feature/bma/investigation
2021-01-14 10:38:56 +01:00
1f1eeccc32
Option to hide emoji keyboard is added.
2021-01-13 13:28:46 +03:00
7446b12827
Fix request too large Uri error when joining a room
2021-01-12 18:16:35 +01:00
5431584b3c
Merge pull request #2627 from vector-im/feature/bma/edit_power_level
...
Edit power level
2021-01-12 10:31:17 +01:00
ce92533525
Update CHANGES.md
...
No need to gender users :)
2021-01-09 00:39:24 +00:00
992edb2ee2
Merge branch 'develop' into feature/ons/fix_show_sending_image
2021-01-08 17:38:59 +01:00
e21c8792e6
Fix switch theme issue, and white field issue ( #2599 , #2528 )
...
Remove some workarounds. I cannot reproduce the bug of signout which does not destroy the HomeActivityViewModel...
2021-01-08 15:55:32 +01:00
d91ed2985d
Sync: fix initial sync is not retried correctly when there is some network error. [ #2632 ]
2021-01-08 12:42:36 +01:00
2d91865277
Merge pull request #2624 from vector-im/feature/bma/avoidEventBus2
...
Remove dependency to org.greenrobot.eventbus library
2021-01-08 10:04:38 +01:00
55f5f90c45
Use ContentResolver and DocumentFile instead of legacy File.
...
Fixes #409 .
2021-01-07 19:32:04 +03:00
bd3bdd6996
Merge pull request #2594 from vector-im/feature/ons/fix_room_topic_scroll
...
Disable scroll effect when click to a link in the topic.
2021-01-07 15:20:47 +01:00
c4a019f0d3
Edit room permissions ( #2471 )
2021-01-06 17:42:28 +01:00
963c30a275
Remove dependency to org.greenrobot.eventbus library
2021-01-05 18:56:24 +01:00
474ade01cf
Merge branch 'develop' into feature/ons/fix_room_topic_scroll
2021-01-05 15:08:15 +03:00
3a9b80127f
Warn user when he is leaving a not public room ( #1460 )
2021-01-05 11:46:59 +01:00
4ee34126bd
Persist outbound group session
2021-01-05 10:04:34 +01:00
4f59ec37ca
Tapping drawer having more than 1 room in notifications gives "malformed link" error ( #2605 )
2021-01-04 18:18:34 +01:00
23623b8895
Migrate to Android 11, API 30.
2021-01-04 17:12:49 +03:00
a7d8e74468
Merge pull request #2604 from vector-im/feature/ons/fix_hide_member_events
...
Feature/ons/fix hide member events
2021-01-04 10:48:22 +01:00
05013d2559
Fix changelog.
2020-12-30 12:17:25 +03:00
3240cadb94
Fix membership event visibility condition.
2020-12-30 12:08:27 +03:00
3ea3d0fc91
Unspecced msgType field in m.sticker ( #2580 )
2020-12-29 15:42:12 +01:00
17e8581ef0
Merge pull request #2597 from Tigermouthbear/develop
...
Add System theme option and set as default
2020-12-29 09:47:58 +01:00
3e78098c43
Add System theme option and set as default; closes #904 , closes #2387
2020-12-28 23:32:06 -05:00
cbdacc199a
Disable scroll effect when click to a link in the topic.
2020-12-28 17:17:01 +03:00
a755536a2f
Merge branch 'develop' into feature/ons/wait_members_before_sending_event
2020-12-21 12:41:24 +03:00
5744939c05
Merge pull request #2561 from SpiritCroc/url_preview_visibility
...
Properly hide preview URLs for messages that don't support previews
2020-12-20 20:40:19 +01:00
d5e76c515e
Enable URL-previews for notices
...
Desktop has those too.
2020-12-20 09:10:37 +01:00
9fcf7263b5
Properly hide preview URLs for messages that don't support previews
...
Notices and formatted messages don't have imageContentRenderer and
previewUrlRetriever set.
Accordingly, when recycling messages that previously had an URL preview,
we do not want to keep that preview, but actually hide it, instead of
returning early (without rendering any update).
2020-12-20 09:05:15 +01:00
7732bd47ce
Update Changelog after release
2020-12-18 16:01:39 +01:00
80396fcd39
Changelog added.
2020-12-18 16:00:32 +01:00
2b780a8b76
Merge pull request #2542 from vector-im/feature/bma/view_bindings
...
View bindings
2020-12-18 15:57:34 +01:00
0518e5f18d
Version++
2020-12-18 11:03:01 +01:00
d53650c8ae
Prepare release 1.0.13
2020-12-18 10:59:43 +01:00
3491774e7b
Add changelog
2020-12-17 12:09:53 +01:00
706736273c
Migrate to ViewBindings ( #1072 ) - WIP
2020-12-16 00:46:52 +01:00
6cdb192955
Version++
2020-12-15 14:18:35 +01:00
e230cd8ee3
Prepare release 1.0.12
2020-12-15 14:16:08 +01:00
7828e3f501
Merge pull request #2485 from vector-im/feature/ons/fix_hide_state_events
...
Fix UTD when hiding member state events.
2020-12-15 12:16:27 +01:00
7da8b13cde
Chat Effects
2020-12-15 09:39:16 +01:00
09040b7095
Clear history ( #1933 )
2020-12-14 16:22:22 +01:00
23e05200b5
Social login: cleanup
2020-12-14 14:13:36 +01:00
b321838502
Merge branch 'develop' into feature/ons/fix_hide_state_events
2020-12-14 12:03:49 +03:00
903936368d
Merge branch 'develop' into feature/bca/fix_mxto
2020-12-11 21:43:56 +01:00
5b74eb3bca
Merge branch 'develop' into feature/state_service_coroutines
2020-12-11 16:54:41 +01:00
989f1c6268
Merge branch 'develop' into feature/bma/url_preview
2020-12-11 15:39:20 +01:00
544345bbf3
Update change log
2020-12-11 15:16:10 +01:00
Benoit Marty
Benoit Marty
Valere
ganfra
oogm
oogm
Onuray Sahin
Timo Kösters
Jonathan de Jong
Kafji
Martin Häger
Maximillian Bensch
ganfra
Andrew Ferrazzutti
Ed Geraghty
Onuray Sahin
Tigermouthbear
SpiritCroc
Travis Ralston