Commit Graph

242 Commits

Author SHA1 Message Date
Gil Eluard b9512352a6 Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
2022-01-24 19:36:02 +01:00
Gil Eluard d23f24b9ce Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
2022-01-24 19:36:02 +01:00
ismailgulek f29dd2bb0a Implement pagination in recents data source 2022-01-04 04:30:40 +03:00
ismailgulek 1bccd1543e Implement pagination in recents data source 2022-01-04 04:30:40 +03:00
ismailgulek 2cfe8fce78 Adapt to counts api changes 2022-01-04 04:29:26 +03:00
ismailgulek e496cc07cc Adapt to counts api changes 2022-01-04 04:29:26 +03: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
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
Philippe Loriaux 216924165d Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
Philippe Loriaux eaa2450be7 Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
ismailgulek 8c2bb8a3da Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-19 14:01:32 +03:00
ismailgulek 1ec3817d43 Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-19 14:01:32 +03:00
ismailgulek 66f6e6b2b7 Refactor cell data arrays 2021-10-12 21:25:15 +03:00
ismailgulek 23f81ade18 Refactor cell data arrays 2021-10-12 21:25:15 +03:00
ismailgulek 24ab353a5b Remove old code piece 2021-10-08 16:52:09 +03:00
ismailgulek f84a9dff55 Remove old code piece 2021-10-08 16:52:09 +03:00
ismailgulek 76c5179bbd Adapt api changes 2021-10-08 14:43:19 +03:00
ismailgulek 0dff280edf Adapt api changes 2021-10-08 14:43:19 +03:00
Gil Eluard 8fc3632863 [Spaces] M10.4.1 Home space data filtering #4570
- Added settings menu for Home space
2021-10-07 15:37:20 +02:00
Gil Eluard f9ae4f8efe [Spaces] M10.4.1 Home space data filtering #4570
- Added settings menu for Home space
2021-10-07 15:37:20 +02:00
ismailgulek f5f773e7d9 Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-05 13:48:25 +03:00
ismailgulek 51f63b46ab Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-05 13:48:25 +03:00
ismailgulek 5200dbdde4 Architecture update 2021-10-04 17:28:21 +03:00
ismailgulek 82c8f5b186 Architecture update 2021-10-04 17:28:21 +03:00
ismailgulek e43ce3d15b Create suggested rooms fetcher 2021-10-02 02:10:13 +03:00
ismailgulek 4ff95116a1 Create suggested rooms fetcher 2021-10-02 02:10:13 +03:00
manuroe 6dbdb15e03 RecentsDataSource: Memory leak in [RecentsDataSource dataSource:didStateChange:] 2021-10-01 11:34:39 +01:00
manuroe ba122a93e4 RecentsDataSource: Memory leak in [RecentsDataSource dataSource:didStateChange:] 2021-10-01 11:34:39 +01:00
ismailgulek d0320f11b5 Fix merge conflict 2021-09-30 12:43:49 +03:00
ismailgulek 56703c272a Fix merge conflict 2021-09-30 12:43:49 +03:00
ismailgulek cc46decec2 Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-30 12:35:46 +03:00
ismailgulek 6761404d2d Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-30 12:35:46 +03:00
Stefan Ceriu 8b80b3f4c7 vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +03:00
Stefan Ceriu 7b75dec011 vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +03:00
ismailgulek 1b15786228 Add spaces option 2021-09-29 15:10:41 +03:00
ismailgulek b31cd38e00 Add spaces option 2021-09-29 15:10:41 +03:00
ismailgulek 05d71297b5 Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-28 17:30:39 +03:00
ismailgulek f76f778e0b Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-28 17:30:39 +03:00
ismailgulek d63bb926df Refactor recents data source to use new room list data fetchers 2021-09-24 18:50:41 +03:00
ismailgulek e3e713ab1c Refactor recents data source to use new room list data fetchers 2021-09-24 18:50:41 +03:00
Gil Eluard f08a2535d7 Suggested Spaces appear as suggested rooms #4903
- Fixed
2021-09-24 14:31:35 +02:00
Gil Eluard 5c127d1303 Suggested Spaces appear as suggested rooms #4903
- Fixed
2021-09-24 14:31:35 +02:00
Gil Eluard fd5d96aff9 [Spaces] M10.6 Space preview bottom sheet #4497 2021-09-06 07:46:43 +03:00
Gil Eluard 53c3cd7fc6 [Spaces] M10.6 Space preview bottom sheet #4497 2021-09-06 07:46:43 +03:00
Gil Eluard 3d0be2ddf7 [Spaces] Show suggested in room lists #4501
- Update after code review
2021-08-16 07:57:30 +02:00
Gil Eluard a6c838df81 [Spaces] Show suggested in room lists #4501
- Update after code review
2021-08-16 07:57:30 +02:00
Gil Eluard bd08e565be 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 358cd642bb 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 cf456ad36b Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
2021-08-03 21:22:43 +02:00
Gil Eluard c49fa993f3 Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
2021-08-03 21:22:43 +02:00