520 Commits

Author	SHA1	Message	Date
Christian Pauly	2bd00e6bb3	fix: Share view	2021-02-06 13:15:25 +01:00
Christian Pauly	4c10ef5213	fix: More minor fixes	2021-02-05 16:43:05 +01:00
Christian Pauly	2d3c4409a1	change: Minor design changes	2021-02-05 16:35:15 +01:00
Christian Pauly	14f633bc2b	fix: Remove old code	2021-02-05 08:46:57 +01:00
Christian Pauly	b9be33c16b	change: Implement contact list instead of status	2021-02-05 08:43:44 +01:00
Christian Pauly	6960618f55	fix: Inputborder	2021-02-03 18:48:48 +01:00
Christian Pauly	5429697cff	fix: Wrong fab action	2021-02-03 16:23:32 +01:00
Christian Pauly	692cb48aaf	design: Improve new design	2021-02-03 15:51:49 +01:00
Christian Pauly	29076db135	fix: Wrong urls	2021-02-02 17:42:19 +01:00
Christian Pauly	08f24d7e28	fix: BottomNavigationbar colors	2021-02-02 16:46:59 +01:00
Krille Fear	e38879d37f	Merge branch 'soru/fix-regressions' into 'main' ... fix: Emote settings and discovery fallback See merge request famedly/fluffychat!366	2021-02-02 13:08:24 +00:00
Sorunome	8f8b8d8bf7	fix: Emote settings and discovery fallback	2021-02-02 11:24:37 +01:00
Christian Pauly	33dd1d2371	feat: new design	2021-02-02 10:53:29 +01:00
Christian Pauly	408c8109f9	fix: reportEvent uses positive int	2021-02-01 22:00:41 +01:00
Christian Pauly	baafebb5f9	fix: Autofillhints on readonly	2021-02-01 21:39:34 +01:00
Christian Pauly	d553685dea	feat: Implement reporting of events	2021-02-01 21:26:02 +01:00
Krille Fear	71a0f6a932	Revert "feat: Implement experimental new design" ... This reverts commit 10cf8daf25	2021-02-01 20:00:35 +00:00
Krille Fear	34124f24be	Merge branch 'krille/experimental-new-design' into 'main' ... feat: Implement experimental new design See merge request famedly/fluffychat!363	2021-02-01 18:42:34 +00:00
Christian Pauly	10cf8daf25	feat: Implement experimental new design	2021-02-01 19:28:39 +01:00
Sorunome	6b01a833a1	fix: Bring back proper emote settings	2021-02-01 16:25:28 +01:00
Christian Pauly	2bafcabef4	change: Use launch url for mozilla sso	2021-02-01 12:14:53 +01:00
Christian Pauly	d7aae3aedc	feature: Deprecated authwebview and use platform browser	2021-02-01 11:47:33 +01:00
Christian Pauly	41a24574ce	feat: Implement autofillhints	2021-02-01 11:08:29 +01:00
Christian Pauly	56edb77b68	change: Minor design colors	2021-01-31 23:54:33 +01:00
Christian Pauly	aef809030d	chore: Redesign textfields	2021-01-24 17:26:59 +01:00
Christian Pauly	189f65a544	refactor: Theme and iOS stuff	2021-01-24 16:38:25 +01:00
Krille Fear	d673e0ea36	Merge branch 'krille/bootstrap' into 'main' ... chore: Simplify bootstrap See merge request famedly/fluffychat!358	2021-01-23 18:37:31 +00:00
Christian Pauly	c81158a1c9	fix: Homeserver readonly if conifg wants it	2021-01-23 12:11:02 +01:00
Christian Pauly	2df4a78c7d	chore: Simplify bootstrap	2021-01-23 11:57:47 +01:00
Christian Pauly	2f7dece4c7	refactor: Upgrade to latest flutter_sound_lite	2021-01-23 11:17:34 +01:00
Christian Pauly	b6dca5b7a7	fix: Search mxid for private chat	2021-01-23 10:13:21 +01:00
Christian Pauly	5f54057666	fix: Remove unnecessary padding	2021-01-23 09:42:51 +01:00
Christian Pauly	e402a020f6	chore: Redesign homepicker page	2021-01-22 21:39:37 +01:00
Christian Pauly	a05215fc4c	chore: Update SDK	2021-01-21 08:44:17 +01:00
Sorunome	8ffb3db8c9	fix: Make tapping on pills join if remote directory is private	2021-01-20 16:51:29 +01:00
Christian Pauly	4b8ad1bde9	chore: Change startpage design	2021-01-19 21:41:41 +01:00
Sorunome	ed570a6e1e	fix: Allow joining of unpublished aliases again	2021-01-19 18:12:42 +01:00
Christian Pauly	03b00b7d26	fix: Persistent settings	2021-01-19 16:36:21 +01:00
Christian Pauly	d273b2ad84	fix: Voice message recording dialog	2021-01-19 16:30:11 +01:00
Christian Pauly	38e8e1bce1	fix: UserBottomSheet	2021-01-19 15:48:50 +01:00
Christian Pauly	5f0ce49c46	fix: Dialogs	2021-01-19 15:46:43 +01:00
Christian Pauly	d1d470deb6	feat: Implement sso	2021-01-18 23:31:57 +01:00
Christian Pauly	fde2f8b2a8	fix: Send file	2021-01-18 10:43:00 +01:00
Christian Pauly	913f3cfa70	fix: APL	2021-01-18 10:07:37 +01:00
Christian Pauly	6d12168ce5	fix: app lock	2021-01-18 09:43:53 +01:00
Krille Fear	c2b4f005eb	Merge branch 'krille/applock' into 'main' ... feat: Implement app lock Closes #223 See merge request famedly/fluffychat!343	2021-01-18 07:56:04 +00:00
Christian Pauly	25da65f366	fix: mxid validation	2021-01-18 08:43:29 +01:00
Christian Pauly	77ee2ef3c9	feat: Implement app lock	2021-01-18 08:38:19 +01:00
Christian Pauly	81e706aaf5	fix: Startpage textfield padding	2021-01-18 07:59:01 +01:00
Avi0n	70f96bfee8	feat: Dismiss keyboard on view scroll. ... Added the ability for the software keyboard to be dismissed when scrolling on a ListView in a chat and the chat list. This will help iOS users since they don't have a back button like Android.	2021-01-18 06:56:02 +00:00
Christian Pauly	e1e60c4d71	feat: Display version number in app	2021-01-17 15:43:38 +01:00
Christian Pauly	3c713518fb	chore: Redesign homeserver picker page	2021-01-17 15:33:31 +01:00
Christian Pauly	83e238551c	fix: Change size	2021-01-17 08:05:34 +01:00
Christian Pauly	d4dbe83c69	chore: Minor design improvements	2021-01-16 22:18:22 +01:00
Christian Pauly	06581e21e9	chore: Minor design tweaks	2021-01-16 21:50:01 +01:00
Christian Pauly	9b5a3cadce	fix: Typing update	2021-01-16 21:44:34 +01:00
Christian Pauly	a35c4d083f	fix: Column width	2021-01-16 20:52:39 +01:00
Christian Pauly	c0958c6733	fix: Dont send only whitespaces	2021-01-16 19:44:46 +01:00
Christian Pauly	0458064c44	fix: Ignore list	2021-01-16 18:09:41 +01:00
Christian Pauly	079c35e37b	fix: chat padding	2021-01-16 17:32:56 +01:00
Christian Pauly	672eca6302	fix: Video calls	2021-01-16 16:39:07 +01:00
Christian Pauly	a5e95539e3	fix: loading history	2021-01-16 16:11:50 +01:00
Christian Pauly	e13a732688	chore: redesign start first chat	2021-01-16 16:03:25 +01:00
Christian Pauly	cf07eed211	fix: Missing divider	2021-01-16 15:36:06 +01:00
Christian Pauly	41483dd6fd	fix: Display current theme mode	2021-01-16 15:33:41 +01:00
Christian Pauly	5a1085ad0c	fix: Better authwebview	2021-01-16 15:18:32 +01:00
Christian Pauly	d76df0ae4a	chore: Better authwebview	2021-01-16 15:15:22 +01:00
Christian Pauly	2f7749a0c5	fix: authwebview	2021-01-16 15:13:29 +01:00
Krille Fear	05b95513f9	fix: Minor apl bugs	2021-01-16 13:24:52 +00:00
Krille Fear	cbcfa1581e	refactor: Use APL	2021-01-16 11:46:38 +00:00
Christian Pauly	880f9cce4b	refactor: Use Provider	2021-01-15 19:59:30 +01:00
Christian Pauly	5d52c26146	refactor: Use adaptive_theme	2021-01-15 19:41:55 +01:00
Sorunome	1da643fa31	feat: Handle matrix: URIs as per MSC2312	2021-01-10 18:20:16 +01:00
Sorunome	f5e11c2a21	feat: Regulate when thumbnails are animated as per MSC2705	2020-12-29 11:00:56 +01:00
Christian Pauly	92684da3c3	fix: reactions	2020-12-27 19:24:47 +01:00
Sorunome	e4b6e1035e	fix: Don't show loading dialog on request history	2020-12-27 11:59:03 +01:00
Christian Pauly	e84bc25602	refactor: Switch to loading dialog	2020-12-25 09:58:34 +01:00
Christian Pauly	0ae36f0a3f	fix: Read receipts and filtered events	2020-12-23 11:23:19 +01:00
Christian Pauly	45b9c4f26c	chore: Update SDK and logviewer	2020-12-22 14:23:23 +01:00
Christian Pauly	3c4a29b517	feat: Better invite search bar	2020-12-20 17:00:22 +01:00
Christian Pauly	f0d1f5aed2	feat: Open alias in discover page	2020-12-20 16:53:37 +01:00
Christian Pauly	6381cea62d	chore: Context icon improvements	2020-12-20 16:44:55 +01:00
Sorunome	377b06a462	Merge branch 'soru/space-after-mention' into 'main' ... fix: Have a space after mentions, making it consistent with @-completion Closes #204 See merge request ChristianPauly/fluffychat-flutter!315	2020-12-19 19:25:16 +00:00
Christian Pauly	5cc0b3d706	Merge branch 'main' of gitlab.com:ChristianPauly/fluffychat-flutter into main	2020-12-19 16:38:24 +01:00
Sorunome	bce709f521	Merge branch 'soru/better-read-indicator' into 'main' ... fix: Respect hidden events when calculating read receipt message See merge request ChristianPauly/fluffychat-flutter!310	2020-12-19 15:37:58 +00:00
Christian Pauly	1675740cb1	Merge branch 'main' of gitlab.com:ChristianPauly/fluffychat-flutter into main	2020-12-19 16:37:55 +01:00
Christian Pauly	64c5ea93c3	fix: logger	2020-12-19 16:37:32 +01:00
Sorunome	b18e81ae95	fix: Have a space after mentions, making it consistent with @-completion	2020-12-19 16:37:28 +01:00
Sorunome	702895f09d	fix: Respect hidden events when calculating read receipt message	2020-12-19 16:20:48 +01:00
Sorunome	0066a3307d	fix: Store emoji picker history and make sure you can't send the same emoji twice	2020-12-19 16:16:25 +01:00
Christian Pauly	714c7b41dd	feat: Implement logger	2020-12-19 13:14:35 +01:00
Christian Pauly	3d70b1efbf	fix: Update typing	2020-12-17 19:14:33 +01:00
Christian Pauly	20b3157473	feat: Implement emojipicker for reactions	2020-12-12 17:19:53 +01:00
Christian Pauly	1e7bac3614	feat: Enhanced configuration	2020-12-11 17:40:33 +01:00
Christian Pauly	32acc21a45	refactor: Update sdk	2020-12-11 13:22:34 +01:00
Christian Pauly	f6945f7476	feat: Implement experimental bootstrapping	2020-12-10 15:06:17 +01:00
Christian Pauly	775a33bb94	chore: Update SDK	2020-12-10 11:25:49 +01:00
Christian Pauly	38c8775a45	Merge branch 'mark_unread' into 'main' ... feat: add ability to mark a room as unread See merge request ChristianPauly/fluffychat-flutter!286	2020-12-09 17:23:42 +00:00
Kévin Commaille	0f69e8fc9b	transparent background for logo	2020-12-09 10:55:37 +01:00
Christian Pauly	9e5fb7075d	fix: Format	2020-12-08 15:55:42 +01:00
Marcus Hoffmann	fe2b391046	feat: add ability to mark a room as unread ... This also add tooltips to all the room context actions.	2020-12-08 15:28:04 +01:00
Christian Pauly	30883e57a2	fix: join public room	2020-12-06 14:54:58 +01:00
Christian Pauly	e728ccc1ba	feat: Implement discover groups page	2020-12-06 12:51:40 +01:00
Christian Pauly	adb445f668	design: Use outlined icons	2020-12-06 10:31:35 +01:00
Christian Pauly	bf4b439572	feat: Add chat permissions settings	2020-12-05 13:03:57 +01:00
Christian Pauly	cb191e211a	fix: Missing localization	2020-12-01 07:11:49 +01:00
Christian Pauly	8d05a83970	feat: Multiline dialog text field	2020-11-27 11:30:21 +01:00
Christian Pauly	2c5b247b49	Merge branch 'krille/add-notification-settings' into 'main' ... feat: Implement rich notification settings See merge request ChristianPauly/fluffychat-flutter!297	2020-11-25 21:14:47 +00:00
Christian Pauly	87a73dd777	feat: Implement rich notification settings	2020-11-25 21:52:12 +01:00
Christian Pauly	be428dd8a8	fix: Analyzer bug	2020-11-25 21:50:47 +01:00
Christian Pauly	621fcb77a9	fix: Set chat avatar on web	2020-11-25 20:54:30 +01:00
Christian Pauly	d9ec9f66b4	feat: Annoy user with dialog to add a recovery method	2020-11-24 15:49:27 +01:00
Christian Pauly	4b2fef548c	feat: Implement password recovery	2020-11-24 14:30:11 +01:00
Christian Pauly	11e2dd5c1b	fix: Minor fixes	2020-11-23 14:27:10 +01:00
Christian Pauly	0061660142	chore: Update adaptive dialogs	2020-11-23 08:06:15 +01:00
Christian Pauly	1f9e953296	refactor: Make verification in dialogs	2020-11-22 22:48:10 +01:00
Christian Pauly	1aa9c08a3e	refactor: matrix to link prefix	2020-11-22 21:51:30 +01:00
Christian Pauly	fc0c0386e2	feat: Collapse room create states	2020-11-22 19:34:19 +01:00
Christian Pauly	418a4e2397	Merge branch 'krille/minor-design-improvements' into 'main' ... feat: Minor design improvements See merge request ChristianPauly/fluffychat-flutter!291	2020-11-22 14:47:05 +00:00
Christian Pauly	0b8cc24117	feat: Minor design improvements	2020-11-22 15:25:13 +01:00
Christian Pauly	0ed29b60cd	fix: Minor key request design fix	2020-11-22 14:52:14 +01:00
Christian Pauly	2516848e81	feat: Improved encryption UI	2020-11-22 11:53:19 +01:00
Sorunome	0cb262c39c	fix: Copying an event did not obey edits	2020-11-21 15:30:51 +01:00
Sorunome	f70bbc3333	feat: Add svg support and better image handling	2020-11-19 10:26:31 +01:00
Sorunome	2c3693e4eb	fix: resolve some sentry issues	2020-11-16 11:31:31 +01:00
Christian Pauly	9ea7afc4f2	chore: Switch to adaptive dialogs	2020-11-14 10:24:01 +01:00
Christian Pauly	e2195935c0	chore: Switch from bottoast to flushbar	2020-11-14 09:17:42 +01:00
Sorunome	a9fe65a6a1	Merge branch 'soru/hide-events' into 'main' ... feat: Option to hide redacted and unknown events Closes #147 See merge request ChristianPauly/fluffychat-flutter!257	2020-11-09 09:35:29 +00:00
Sorunome	36315a45ec	feat: Option to hide redacted and unknown events	2020-11-08 20:10:00 +01:00
Sorunome	25b2997025	fix: Don't re-render message widgets on insertion of new messages, making e.g. audio playing not stop ... fix: Don't cancle playing audio if a new message arrives fix: Don't re-render message widgets on insertion of new messages, making e.g. audio playing not stop	2020-11-08 19:39:07 +01:00
Sorunome	1ff986e7be	feat: Better encryption / verification	2020-11-08 12:57:52 +01:00
Christian Pauly	caab868895	fix: Add missing safearea	2020-11-07 10:18:51 +01:00
Christian Pauly	87737705ff	chore: Update sdk	2020-10-28 08:54:30 +01:00
Christian Pauly	a241310c81	Krille/remove status feature	2020-10-28 06:23:50 +00:00
Sorunome	36405f8216	fix: Multiple related store things	2020-10-25 17:21:29 +01:00
Inex Code	08e61c0db1	fix: return text field to the previous state after editing message	2020-10-23 15:45:22 +00:00
Christian Pauly	a713a2f352	fix: Minor design fix	2020-10-17 13:04:33 +02:00
Christian Pauly	e9aa285f1a	fix: Minor design fixes	2020-10-17 12:43:32 +02:00
Christian Pauly	6d41136587	feat: Implement mouse select chat list items	2020-10-17 09:28:33 +00:00
Christian Pauly	bd597d39c2	Merge branch 'swipe-to-reply' into 'main' ... feat: Swipe to reply Closes #129 See merge request ChristianPauly/fluffychat-flutter!208	2020-10-17 09:15:55 +00:00
Inex Code	f9904863a8	fix replying to wrong message ... when new message arrives during the gesture	2020-10-17 09:15:55 +00:00
Christian Pauly	51745b0aee	Merge branch 'krille/implement-linux-desktop-notifications' into 'main' ... feat: Implement linux desktop notifications See merge request ChristianPauly/fluffychat-flutter!226	2020-10-17 08:25:36 +00:00
Christian Pauly	75cd6f1f23	feat: Implement linux desktop notifications	2020-10-17 10:12:33 +02:00
Christian Pauly	c5c7ee7e07	fix: Change device displayname	2020-10-15 09:34:40 +02:00
Kateřina Churanová	060156ce12	fix: fixed mxid input method, removed code redundancy	2020-10-11 13:25:06 +02:00
Sorunome	56967a9284	fix: resize images in a separate isolate	2020-10-06 19:17:04 +02:00
Christian Pauly	bd1508c545	Merge branch 'soru/fix-device-name' into 'main' ... fix: Show device name in account information correctly Closes #170 See merge request ChristianPauly/fluffychat-flutter!207	2020-10-06 15:44:02 +00:00
Christian Pauly	bfd3888607	feat: Implement change device name	2020-10-06 07:03:50 +00:00
Sorunome	751dcb7600	fix: send images as images, not files	2020-10-05 16:41:29 +02:00
Sorunome	468c2587aa	fix: Show device name in account information correctly	2020-10-04 21:17:49 +02:00
Christian Pauly	aee854e5d5	fix: Minor fixes	2020-10-04 20:30:06 +02:00
Christian Pauly	7ec349b980	fix: TextField	2020-10-04 17:39:49 +02:00
Christian Pauly	5e673c6d3d	fix: Inputbar focus	2020-10-04 17:24:05 +02:00
Christian Pauly	662e2f10a0	fix: Desktop file picker	2020-10-04 17:01:54 +02:00
Christian Pauly	5409fe864b	fix: Desktop images	2020-10-04 16:11:18 +02:00
Christian Pauly	6ffbf16cff	fix: Minor design bugs	2020-10-04 08:05:27 +00:00
Christian Pauly	f84ac1d121	fix: Minor user status bugs	2020-10-04 09:41:20 +02:00
Sorunome	cafd639c24	feat: Enhance emote experience	2020-10-03 17:44:59 +02:00
Christian Pauly	090795fa77	feat: Implement new status feature	2020-10-03 17:09:45 +02:00
Christian Pauly	d9c2d4f754	feat: More beautiful status	2020-10-03 11:40:47 +00:00
Christian Pauly	e569be7c07	chore: Add privacy informations to app	2020-10-03 13:28:14 +02:00
Marcel	b6d2ddaf7d	feat!: Use new localisation setup from flutter 1.22 ... BREAKING CHANGE: This introduces that it might require up to 2 compiles for locals to work. Also only arb files shall be checked into git. Took 19 minutes	2020-10-03 11:11:07 +00:00
Christian Pauly	493b7000c6	feat: Enhance roomlist context menu	2020-10-02 15:50:59 +02:00
Christian Pauly	fe649e5a62	fix: Invite left members	2020-10-02 09:57:32 +00:00
Christian Pauly	a845209085	feat: Enable macOS build	2020-09-26 21:22:49 +02:00
Sorunome	74b15dd19c	fix: fix up translations to use keys and fix arb files	2020-09-23 11:59:14 +02:00
Christian Pauly	1db9bdd975	fix: Last bits for the release	2020-09-21 19:21:24 +02:00
Christian Pauly	165c64ce36	Implement missing account settings	2020-09-21 17:50:01 +02:00
Christian Pauly	eca25de50b	fix: Search bar	2020-09-20 18:27:19 +00:00
Christian Pauly	6bf25b709f	feat: Implement send reactions	2020-09-20 20:13:42 +02:00
Sorunome	8cd8f90501	fix: Scroll down button not showing	2020-09-20 14:45:15 +02:00
Christian Pauly	c8a63c6d9d	feat: Improve design	2020-09-20 12:30:42 +00:00
Sorunome	168b8b076f	fix: Don't double-confirm sending audio messages	2020-09-20 12:02:08 +00:00
Sorunome	8547422f80	feat: Add scroll-to-event	2020-09-20 11:37:48 +02:00
Christian Pauly	b2fa88c19d	feat: Implement ignore list	2020-09-19 15:55:25 +02:00
Christian Pauly	dcf4c4cd00	feat: Add license page	2020-09-18 18:20:13 +00:00
Sorunome	d89f882a5d	Merge remote-tracking branch 'origin/krille/enable-sentry' into master	2020-09-09 14:11:43 +02:00
Sorunome	bbca0c2bee	chore: switch to cached_network_image	2020-09-09 13:54:55 +02:00
Sorunome	fadf8715c3	Merge branch 'soru/send-files' into 'master' ... feat: Send file dialog Closes #84, #112, and #140 See merge request ChristianPauly/fluffychat-flutter!150	2020-09-09 11:53:45 +00:00
Christian Pauly	705ced844b	feat: Implement sentry	2020-09-09 13:52:44 +02:00
Sorunome	80114dff80	feat: Send image / video / file dialog	2020-09-09 13:40:58 +02:00
Sorunome	20d3ea91dc	chore: Add more debugging logs to debug key decrypt issues	2020-09-07 15:42:24 +02:00
Sorunome	23218294f0	feat: Blurhashes and better thumbnails	2020-09-07 11:39:35 +02:00
Christian Pauly	1b60dcc6a4	Merge branch 'soru/allow-request-empty-timeline' into 'master' ... fix: Allow requesting past messages if all events in the current timeline are filtered See merge request ChristianPauly/fluffychat-flutter!153	2020-09-07 09:35:58 +00:00
Sorunome	04cbf0c332	feat: open links better	2020-09-07 11:03:03 +02:00
Sorunome	0f9ff4abda	fix: Allow requesting past messages if all events in the current timeline are filtered	2020-09-06 09:00:19 +02:00
Christian Pauly	98316f1b4e	fix: Send read receipt only on focus	2020-08-22 16:09:15 +02:00
Christian Pauly	8763bbf15d	Fix: Status header design	2020-08-22 15:16:07 +02:00
Sorunome	da9eafa3c0	Update SDK	2020-08-16 13:02:53 +02:00
Sorunome	81a6530ed8	swith to event aggregations and render message edits and reactions	2020-08-12 09:30:31 +00:00
Sorunome	d75672a757	Filter the onSync stream to only include updates that we want to deal with to re-render	2020-07-27 11:13:25 +00:00
Sorunome	300aea2561	Only show the no google services toast once	2020-07-21 08:56:26 +00:00
Sorunome	063e5118cd	Fix web verification	2020-07-18 14:05:33 +00:00
Christian Pauly	2ce6ac6b95	Dont request history on chat open	2020-07-04 12:17:31 +02:00
Christian Pauly	62e1e49870	Add connection status header	2020-07-04 10:22:51 +02:00
Sorunome	ddc328e4df	Update sdk for performance increases	2020-07-02 09:30:59 +00:00
Katerina	7de6b8c700	Cosmetic improvements of homeserver and user inputs ... Keyboard type for homeserver TextInput changed to url and trailing '/' with potential whitespaces is stripped. Keyboard type for username changed to e-mail for convenience. Should resolve: #34 and #64	2020-07-02 09:10:03 +00:00
Christian Pauly	8def2fb81f	Minor fixes	2020-06-27 13:24:19 +02:00
Christian Pauly	e5cfacf4c1	Minor design fixes	2020-06-27 13:09:21 +02:00
Sorunome	4550686829	Add Cross-Signing	2020-06-25 14:29:06 +00:00