Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
11995 commits 46 branches 261 tags 144 MiB
Commit graph

11995 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gil Eluard
f4fb4be6fb [Spaces] M10.8 Browsing users in a space #4682 
- Update after code review
 2021-09-14 16:59:32 +02:00
Gil Eluard
c2e4d915af [Spaces] M10.8 Browsing users in a space #4682 
- Update after code review
 2021-09-14 15:29:16 +02:00
Gil Eluard
4da3741140 [Spaces] M10.8 Browsing users in a space #4682 
- Update after code review
 2021-09-14 11:45:33 +02:00
Gil Eluard
db7bbc47fa Merge branch 'spaces' into gil/4682_browsing_users_in_a_space 2021-09-13 16:09:53 +02:00
Gil Eluard
2f319d8b8c
Merge pull request #4719 from vector-im/gil/4571_explore_rooms 
[Spaces] M10.7 Explore rooms #4571
 2021-09-13 16:05:54 +02:00
Gil Eluard
652d71b2e2 [Spaces] M10.8 Browsing users in a space #4682 
- Update after design review
 2021-09-13 16:03:56 +02:00
Gil Eluard
7b539ecde3 Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space 
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
 2021-09-13 10:23:21 +02:00
Gil Eluard
50ffa5b5a7 [Spaces] M10.7 Explore rooms #4571 
- Update after code review
 2021-09-13 10:06:36 +02:00
Gil Eluard
be960960db [Spaces] M10.8 Browsing users in a space #4682 
- Update after design review
 2021-09-02 11:24:07 +03:00
Gil Eluard
e46f5faec3 [Spaces] M10.8 Browsing users in a space #4682 
- Update after design review
 2021-09-02 10:17:09 +03:00
Gil Eluard
4e3e803943 [Spaces] M10.8 Browsing users in a space #4682 
- Renamed coordinators
 2021-09-02 09:34:25 +03:00
Gil Eluard
20fd906a13 Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space 
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
 2021-09-02 07:51:55 +03:00
Gil Eluard
99caa08860 [Spaces] M10.7 Explore rooms #4571 
- Update after review
 2021-09-01 18:12:08 +03:00
Gil Eluard
2e690e5f6d [Spaces] M10.8 Browsing users in a space #4682 
- Present space members screen from people tab if space has been selected
 2021-08-22 09:23:58 +03:00
Gil Eluard
91d9169da6 [Spaces] M10.8 Browsing users in a space #4682 
- Added navigation to member detail page
 2021-08-22 08:48:54 +03:00
Gil Eluard
02c3d5f711 Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space 2021-08-16 21:09:47 +02:00
Gil Eluard
36bfd3c312 [Spaces] M10.7 Explore rooms #4571 
- Update after design review
 2021-08-16 20:18:59 +02:00
Gil Eluard
3b1c0119b7 [Spaces] M10.7 Explore rooms #4571 
- Update after design review
 2021-08-16 15:44:44 +02:00
Gil Eluard
f62504b8fa Merge branch 'spaces' into gil/4571_explore_rooms 2021-08-16 14:00:16 +02:00
Gil Eluard
e111a23e97
Merge pull request #4658 from vector-im/gil/4501_show_suggested_in_room_lists 
[Spaces] M10.5 Show suggested in room lists #4501
 2021-08-16 12:10:57 +02:00
Gil Eluard
0b7693da85 [Spaces] Show suggested in room lists #4501 
- Update after code review
 2021-08-16 10:33:10 +02:00
Gil Eluard
cae5f679e9 [Spaces] Show suggested in room lists #4501 
- Update after code review
 2021-08-16 07:57:30 +02:00
Gil Eluard
a968bab33c [Spaces] M10.7 Explore rooms #4571 
- UI updates after design changes
 2021-08-15 22:18:16 +02:00
Gil Eluard
82f4d57657 Merge branch 'spaces' into gil/4571_explore_rooms 
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
 2021-08-12 17:17:24 +02:00
Gil Eluard
80d28f784f Merge branch 'spaces' into gil/4501_show_suggested_in_room_lists 2021-08-12 14:35:25 +02:00
Gil Eluard
e9a0cb9a68
Merge pull request #4652 from vector-im/gil/4494_space_menu 
[Spaces] M10.9 Space menu #4494
 2021-08-12 12:21:03 +02:00
Gil Eluard
109152777c [Spaces] M10.9 Space menu #4494 
- Update after code review
- Fixed some points of design review
 2021-08-12 11:23:47 +02:00
Gil Eluard
7caa033ca5 [Spaces] M10.8 Browsing users in a space #4682 
- Added MVVM classes
- roughly integrated `RoomParticipantsViewController` to the MVVM
 2021-08-10 20:26:27 +02:00
Gil Eluard
1cb9a6b691 [Spaces] M10.7 Explore rooms #4571 
- Added suggested tag to the explore rooms cell
- Implemented join feature
 2021-08-09 17:05:36 +02:00
Gil Eluard
53b751a707 [Spaces] M10.7 Explore rooms #4571 
- Added an room detail screen
 2021-08-06 15:51:51 +02:00
Gil Eluard
3226a49e42 [Spaces] M10.7 Explore rooms #4571 
- Added the ability to navigate through subspaces within the Explore Rooms screen
 2021-08-05 17:04:10 +02:00
Gil Eluard
66b4ccbe67 [Spaces] M10.7 Explore rooms #4571 
- Implemented navigation between space context menu and Explore Room screen
- Populate Explore rooms screen with the first level of space children
 2021-08-05 14:36:38 +02:00
Gil Eluard
ef234981a5 Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists 
# Conflicts:
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
 2021-08-03 22:07:45 +02:00
Gil Eluard
36be956f0e Merge branch 'spaces' into gil/4494_space_menu 2021-08-03 21:23:02 +02:00
Gil Eluard
3e7a875c77 Merge branch 'develop' into spaces 
# Conflicts:
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
 2021-08-03 21:22:43 +02:00
Gil Eluard
5b454eb9af [Spaces] M10.9 Space menu #4494 
- Hide unimplemented actions
 2021-08-03 20:13:47 +02:00
Doug
cc50f52303
Merge pull request #4575 from vector-im/doug/2368_allow_silent_notifications 
Replace notifications toggle with a link to the settings app.
 2021-08-03 16:03:30 +01:00
Doug
4f479dcbe7
Merge branch 'develop' into doug/2368_allow_silent_notifications 2021-08-03 16:02:53 +01:00
Gil Eluard
14fe687cb9 Merge branch 'spaces' into gil/4494_space_menu 2021-08-03 16:49:59 +02:00
manuroe
37cd8000ce Prepare for new sprint 2021-08-03 15:16:36 +02:00
manuroe
1257785bfd Merge branch 'master' into develop 2021-08-03 15:16:32 +02:00
manuroe
301252041d Merge branch 'release/1.4.9/master' 2021-08-03 15:16:25 +02:00
manuroe
2f5f34b1ab finish version++ 2021-08-03 15:16:25 +02:00
manuroe
3e99675a5a
Merge pull request #4650 from vector-im/release/1.4.9/release 
Release 1.4.9
 2021-08-03 15:15:41 +02:00
manuroe
c6f9dbd0dc version++ 2021-08-03 14:44:53 +02:00
manuroe
331a7b225d
Merge pull request #4648 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs 
Translations update from Weblate
 2021-08-03 14:23:01 +02:00
manuroe
039e1ecfa2
Merge pull request #4647 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Translations update from Weblate
 2021-08-03 14:22:39 +02:00
Weblate
106740197c Merge branch 'origin/develop' into Weblate. 2021-08-03 12:13:48 +00:00
Weblate
68682a4a45 Merge branch 'origin/develop' into Weblate. 2021-08-03 12:13:42 +00:00
Stefan Ceriu
714f6e0d5e Updated CHANGES.rst 2021-08-03 15:12:11 +03:00