Commit Graph

1156 Commits

Author SHA1 Message Date
Gil Eluard 2a09ca3947 Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Modules/Room/RoomCoordinator.swift
2021-12-13 15:09:40 +01:00
Gil Eluard a067a06071 Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Modules/Room/RoomCoordinator.swift
2021-12-13 15:09:40 +01:00
Gil Eluard 61790052a9 Merge branch 'develop' into gil/143_create_public_space 2021-12-13 09:03:36 +01:00
Gil Eluard aeec9c7cb5 Merge branch 'develop' into gil/143_create_public_space 2021-12-13 09:03:36 +01:00
SBiOSoftWhare 1924c9c75e Add CopyableLabel enables to copy past text content. 2021-12-10 09:25:06 +01:00
SBiOSoftWhare 23254bb5a1 Add CopyableLabel enables to copy past text content. 2021-12-10 09:25:06 +01:00
ismailgulek 746bd4a96c Merge branch 'ismail/5095_thread_search_results' into ismail/5096_thread_notifications 2021-12-10 11:14:55 +03:00
ismailgulek f72cd70885 Merge branch 'ismail/5095_thread_search_results' into ismail/5096_thread_notifications 2021-12-10 11:14:55 +03:00
ismailgulek ffd7efbe2a Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links 2021-12-10 11:08:01 +03:00
ismailgulek 1bc9db85c3 Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links 2021-12-10 11:08:01 +03:00
Gil Eluard 0f3b37e9af Invite to Space in room landing #5225
- add share invite link to contacts screen
- Fixed regression
2021-12-09 16:12:44 +01:00
Gil Eluard 13382ac9bd Invite to Space in room landing #5225
- add share invite link to contacts screen
- Fixed regression
2021-12-09 16:12:44 +01:00
ismailgulek 8093844aea Merge branch 'develop' into ismail/5068_start_thread 2021-12-09 15:25:14 +03:00
ismailgulek 3a6e7a19e2 Merge branch 'develop' into ismail/5068_start_thread 2021-12-09 15:25:14 +03:00
Stefan Ceriu f5410b2060 vector-im/element-ios/issues/5190 - Fix crash when trying to scroll the people's tab to the top. 2021-12-09 09:39:40 +02:00
Stefan Ceriu d555b0190b vector-im/element-ios/issues/5190 - Fix crash when trying to scroll the people's tab to the top. 2021-12-09 09:39:40 +02:00
Gil Eluard 1adcfd48fc Merge branch 'develop' into gil/143_create_public_space 2021-12-08 23:24:38 +01:00
Gil Eluard 939baf9321 Merge branch 'develop' into gil/143_create_public_space 2021-12-08 23:24:38 +01:00
ismailgulek 3e6637f5a8 Update logic for thread list bar button item 2021-12-02 14:45:23 +03:00
ismailgulek 107bb8f13c Update logic for thread list bar button item 2021-12-02 14:45:23 +03:00
Gil Eluard 1473636c46 [iOS] Create public space #143
- Update after design review
2021-12-01 23:56:59 +01:00
Gil Eluard 4890ce2108 [iOS] Create public space #143
- Update after design review
2021-12-01 23:56:59 +01:00
ismailgulek d5b5a2d785 Create BadgedBarButtonItem class and use it for thread list item 2021-12-01 17:24:47 +03:00
ismailgulek 719ef848b6 Create BadgedBarButtonItem class and use it for thread list item 2021-12-01 17:24:47 +03:00
SBiOSoftWhare 090e17c3f9 Merge develop into steve/5020_matrixkit_merge 2021-11-30 16:16:52 +01:00
SBiOSoftWhare d4e8d9400f Merge develop into steve/5020_matrixkit_merge 2021-11-30 16:16:52 +01:00
SBiOSoftWhare 56a51da9f9 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
SBiOSoftWhare e8d4af46d2 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
ismailgulek 87f14a3898 Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links 2021-11-30 01:54:56 +03:00
ismailgulek abd5044023 Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links 2021-11-30 01:54:56 +03:00
ismailgulek 41422f9fbc Merge branch 'develop' into ismail/5068_start_thread 2021-11-30 01:33:51 +03:00
ismailgulek 5dfb0fbbfe Merge branch 'develop' into ismail/5068_start_thread 2021-11-30 01:33:51 +03:00
ismailgulek 441febbdab Replace threadId with ThreadParameters 2021-11-29 18:11:04 +03:00
ismailgulek d6ffe933d2 Replace threadId with ThreadParameters 2021-11-29 18:11:04 +03:00
SBiOSoftWhare c383b00055 Improve generated Swift header imports. 2021-11-25 23:11:53 +01:00
SBiOSoftWhare 2709236dd5 Improve generated Swift header imports. 2021-11-25 23:11:53 +01:00
ismailgulek 37e65f56c9 Add threadId parameter to room navigation parameters 2021-11-25 16:28:42 +03:00
ismailgulek 4e2bafbf84 Add threadId parameter to room navigation parameters 2021-11-25 16:28:42 +03:00
David Langley 63b37a877a Fix hidden rooms from showing. 2021-11-24 11:38:32 +00:00
David Langley 03a94d4c5b Fix hidden rooms from showing. 2021-11-24 11:38:32 +00:00
Gil Eluard fda0568d88 [iOS] Create public space #143
- Initial space creation flow
2021-11-23 09:35:32 +01:00
Gil Eluard 272d778779 [iOS] Create public space #143
- Initial space creation flow
2021-11-23 09:35:32 +01:00
ismailgulek 98802857b8 Merge branch 'develop' into ismail/5068_start_thread 2021-11-19 00:23:24 +03:00
ismailgulek bcec32f8da Merge branch 'develop' into ismail/5068_start_thread 2021-11-19 00:23:24 +03:00
Doug f1b341d8e7 Merge branch 'master' into develop
# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m
2021-11-17 17:36:44 +00:00
Doug 6dd471045f Merge branch 'master' into develop
# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m
2021-11-17 17:36:44 +00:00
ismailgulek e041b9003e Merge branch 'develop' into ismail/5068_start_thread 2021-11-11 21:43:16 +03:00
ismailgulek 8c1dbd8311 Merge branch 'develop' into ismail/5068_start_thread 2021-11-11 21:43:16 +03:00
ismailgulek 143368ad46 Implement new summary properties 2021-11-11 19:52:21 +03:00
ismailgulek d9ad8422c9 Implement new summary properties 2021-11-11 19:52:21 +03:00