11860 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Gil Eluard	7aff77f24d	[Spaces] Show suggested in room lists #4501 ... - Preview suggested rooms	2021-08-03 13:45:22 +02:00
Gil Eluard	3797455c29	Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists	2021-08-02 14:40:17 +02:00
Gil Eluard	85454b1495	Merge branch 'gil/4509_show_spaces_in_left_panel' into gil/4494_space_menu	2021-08-02 14:39:58 +02:00
Gil Eluard	6cbb494f25	[Spaces] Show spaces in left panel #4509 ... - update after review	2021-08-02 09:57:30 +02:00
Gil Eluard	78c87ab016	Merge branch 'spaces' into gil/4509_show_spaces_in_left_panel	2021-07-30 15:21:33 +02:00
SBiOSoftWhare	e9a4c260ed	Merge pull request #4522 from vector-im/element_4509 ... Spaces: Add space list in left panel and prepare space switching navigation	2021-07-30 11:55:58 +02:00
Gil Eluard	d0b7bc7efc	Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists	2021-07-30 07:03:00 +02:00
Gil Eluard	d4d86c9477	Merge branch 'gil/4509_show_spaces_in_left_panel' into gil/4494_space_menu	2021-07-30 07:02:40 +02:00
Gil Eluard	49e19c48f0	[Spaces] Show spaces in left panel #4509 ... - moved space filtering to MatrixKit	2021-07-30 06:56:37 +02:00
Gil Eluard	dd9a05a1bb	[Spaces] Show suggested in room lists #4501 ... - Show suggested rooms section in home screen (no actions) - Show suggested rooms section in rooms screen (no actions)	2021-07-29 23:24:34 +02:00
Gil Eluard	07fbf1aebb	Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists ... # Conflicts: # Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m	2021-07-27 20:14:53 +02:00
Gil Eluard	eb71953a07	Merge branch 'gil/4509_show_spaces_in_left_panel' into gil/4494_space_menu	2021-07-27 19:53:54 +02:00
Gil Eluard	8d6bdb7e8c	[Spaces] Show spaces in left panel #4509 ... - filter rooms using `MXSpaceService` new API	2021-07-27 19:53:41 +02:00
Gil Eluard	a80249f4f2	[Spaces] Show spaces in left panel #4509 ... - filter rooms using `MXSpaceService` new API - Added logs	2021-07-27 19:50:36 +02:00
Gil Eluard	4adc7238a4	Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists	2021-07-26 12:03:49 +02:00
Gil Eluard	a6c459fdd3	Merge branch 'gil/4509_show_spaces_in_left_panel' into gil/4494_space_menu	2021-07-26 12:03:31 +02:00
Gil Eluard	a4336c3ca1	Merge branch 'element_4509' into gil/4509_show_spaces_in_left_panel	2021-07-26 12:03:04 +02:00
Gil Eluard	7e2178cd63	Fixed build issue after merge	2021-07-26 12:02:38 +02:00
Gil Eluard	43ec74b5ca	Merge branch 'spaces' into element_4509	2021-07-26 10:42:49 +02:00
Doug	24678bb7eb	Merge pull request #4595 from vector-im/doug/4593_fix_identity_server_entry ... Fix identity server entry	2021-07-23 15:15:23 +01:00
Doug	f23d6dc6e1	Update CHANGES.rst.	2021-07-23 14:29:18 +01:00
Doug	20459f1f3e	Trim whitespace from the identity server text entry and don't allow an empty string.	2021-07-23 14:27:25 +01:00
Doug	fbb228a1ae	Configure identity server keyboard for safer URL entry.	2021-07-23 14:08:51 +01:00
Doug	0318868e7b	Merge pull request #4530 from vector-im/doug/4519_decrypt_notifications_by_default ... Show encrypted message notification content by default.	2021-07-23 11:13:40 +01:00
Gil Eluard	6efe3d211a	Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists	2021-07-23 11:30:43 +02:00
Doug	045c316a59	Update CHANGES.rst.	2021-07-23 10:19:42 +01:00
Doug	6229055e3a	Merge branch 'develop' into doug/4519_decrypt_notifications_by_default_fix ... # Conflicts: # CHANGES.rst # Config/BuildSettings.swift	2021-07-23 10:15:44 +01:00
Gil Eluard	fbabdfa6f2	[Spaces] Space menu #4494 ... - Implemented Leave feature - UI & code tweaks	2021-07-23 11:00:16 +02:00
Doug	5cd671c71c	Merge pull request #4550 from vector-im/doug/update_addressable_gem ... Update addressable gem.	2021-07-23 08:12:29 +01:00
Gil Eluard	51fba28ed5	[Spaces] Show suggested in room lists #4501 ... - Request space suggested rooms in `RecentsDataSource`	2021-07-22 22:35:15 +02:00
Doug	300f53973c	Merge branch 'develop' into doug/update_addressable_gem	2021-07-22 16:50:34 +01:00
manuroe	e0c145271b	Merge pull request #4554 from ShadowJonathan/bug-templates ... Clean up github issues templates	2021-07-22 16:15:31 +02:00
manuroe	bd56208d0b	Merge branch 'develop' into bug-templates	2021-07-22 16:14:56 +02:00
Doug	615c72b0cf	Merge pull request #4581 from pixlwave/develop ... Separate CI jobs into individual actions.	2021-07-22 15:10:31 +01:00
Doug	273f4456a7	Update CHANGES.rst ... Co-authored-by: manuroe <manuroe@users.noreply.github.com>	2021-07-22 15:03:10 +01:00
Doug	8315dac07f	Merge pull request #4536 from vector-im/doug/4521_remove_directory_from_rooms_tab ... Remove directory section from rooms tab	2021-07-22 15:02:22 +01:00
Doug	b92f800f37	Update CHANGES.rst	2021-07-22 14:54:02 +01:00
Doug	7159cf592d	Merge branch 'develop' into doug/update_addressable_gem	2021-07-22 14:51:44 +01:00
Doug	4ad5036d14	Update CHANGES.rst	2021-07-22 14:44:34 +01:00
Doug	234d596c7f	Merge branch 'vector-im:develop' into develop	2021-07-22 14:43:38 +01:00
Doug	d7b77f2fd1	Merge branch 'develop' into doug/4521_remove_directory_from_rooms_tab	2021-07-22 14:37:25 +01:00
manuroe	b3cca1645f	Merge pull request #4433 from vector-im/element_4090 ... Voice messages	2021-07-22 15:13:34 +02:00
manuroe	adcab16e19	Update Podfile.lock	2021-07-22 14:47:37 +02:00
manuroe	671f2118cc	Merge branch 'develop' into element_4090	2021-07-22 14:16:35 +02:00
manuroe	6a13b55f53	Merge pull request #4584 from vector-im/element_4583 ... Fixes #4583 - Mention user does not work	2021-07-22 12:43:00 +02:00
SBiOSoftWhare	24fd98ea01	Prepare for new sprint	2021-07-22 12:36:33 +02:00
SBiOSoftWhare	82979b2a69	Merge branch 'master' into develop	2021-07-22 12:36:30 +02:00
SBiOSoftWhare	b7d4f16055	Merge branch 'release/1.4.7/master'	2021-07-22 12:36:29 +02:00
SBiOSoftWhare	54e7b54749	finish version++	2021-07-22 12:36:29 +02:00
SBiOSoftWhare	45dfecd621	Merge branch 'release/1.4.7/master'	2021-07-22 12:34:13 +02:00