felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-27 19:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity
33,069 Commits 1 Branch 67 Tags
cc9ba7674ef0d069328480bc55f0299b4fd95682
Commit Graph

1315 Commits

Author SHA1 Message Date
SBiOSoftWhare 5e11c6c6c8 RoomViewController: Handle file without thumbnail cell identifiers. 2022-01-31 10:48:35 +01:00
ismailgulek d2e5e29ad9 Merge branch 'develop' into ismail/5096_thread_notifications 2022-01-27 03:20:25 +03:00
ismailgulek a13d5704dc Merge branch 'develop' into ismail/5096_thread_notifications 2022-01-27 03:20:25 +03:00
ismailgulek b3362c05d4 Make remove poll action destructive as well 2022-01-26 16:03:17 +03:00
ismailgulek cf8ff7dc2e Make remove poll action destructive as well 2022-01-26 16:03:17 +03:00
ismailgulek d79af0e26d Fix Doug's remarks 2022-01-26 15:58:37 +03:00
ismailgulek ae57c7e1fb Fix Doug's remarks 2022-01-26 15:58:37 +03:00
ismailgulek d71b9ed645 Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-26 14:27:25 +03:00
ismailgulek 9c5b83a1b3 Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-26 14:27:25 +03:00
ismailgulek a24e208cb1 Fix review remarks 2022-01-25 23:59:19 +03:00
ismailgulek f7694e27cb Fix review remarks 2022-01-25 23:59:19 +03:00
SBiOSoftWhare c09fcded0a RoomVC: Handle new voice location cell identifiers. 2022-01-25 16:43:21 +01:00
SBiOSoftWhare 7e6616985a RoomVC: Handle new voice location cell identifiers. 2022-01-25 16:43:21 +01:00
SBiOSoftWhare a755321fee RoomVC: Handle new voice message cell identifiers. 2022-01-25 14:53:53 +01:00
SBiOSoftWhare b0354ee7a5 RoomVC: Handle new voice message cell identifiers. 2022-01-25 14:53:53 +01:00
ismailgulek 6ac01ae245 Merge branch 'develop' into ismail/5068_start_thread 2022-01-25 14:30:52 +03:00
ismailgulek 4dc28af682 Merge branch 'develop' into ismail/5068_start_thread 2022-01-25 14:30:52 +03:00
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
SBiOSoftWhare 535af1caf3 Merge pull request #5383 from vector-im/steve/5208_text_msg_layout 
Message bubbles: Text message layout
 2022-01-21 16:06:57 +01:00
SBiOSoftWhare 04267efeee Merge pull request #5383 from vector-im/steve/5208_text_msg_layout 
Message bubbles: Text message layout
 2022-01-21 16:06:57 +01:00
ismailgulek 5c653b5346 Implement going back to live room data sources for threads, fix bugs around it 2022-01-21 01:56:51 +03:00
ismailgulek f5512d1be4 Implement going back to live room data sources for threads, fix bugs around it 2022-01-21 01:56:51 +03:00
ismailgulek d22a8d5862 Scroll to highlighted event better 2022-01-21 00:59:01 +03:00
ismailgulek ef05746fe8 Scroll to highlighted event better 2022-01-21 00:59:01 +03:00
SBiOSoftWhare 8f3c47a321 Refactor RoomTimelineCellProviderProtocol to RoomTimelineCellProvider. 2022-01-20 17:09:34 +01:00
SBiOSoftWhare 11639b87f6 Refactor RoomTimelineCellProviderProtocol to RoomTimelineCellProvider. 2022-01-20 17:09:34 +01:00
David Langley d3699e730e Merge pull request #5400 from vector-im/langleyd/5399_fix_crash_uploading_video_ipad 
Fix crash uploading video ipad
 2022-01-19 09:19:25 +00:00
David Langley de2e4bf152 Merge pull request #5400 from vector-im/langleyd/5399_fix_crash_uploading_video_ipad 
Fix crash uploading video ipad
 2022-01-19 09:19:25 +00:00
David Langley 6c9f11f6c5 Specify source of alertView popup for selecting video/image size on upload 2022-01-18 21:35:53 +00:00
David Langley fea1c9f1bd Specify source of alertView popup for selecting video/image size on upload 2022-01-18 21:35:53 +00:00
ismailgulek 8cee4153e5 Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-19 00:12:40 +03:00
ismailgulek 81405b4dd6 Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-19 00:12:40 +03:00
ismailgulek 83948f113f Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-19 00:09:26 +03:00
ismailgulek f3334ad5ae Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-19 00:09:26 +03:00
ismailgulek 701d38c798 Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
ismailgulek 3e2c4b32b0 Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
Stefan Ceriu f3422613cd vector-im/element-ios/issues/5114 - De-labs-ed polls, disabled editing and undisclosed polls until platform parity. 2022-01-18 20:05:10 +02:00
Stefan Ceriu 9ddf80f54b vector-im/element-ios/issues/5114 - De-labs-ed polls, disabled editing and undisclosed polls until platform parity. 2022-01-18 20:05:10 +02:00
Stefan Ceriu 0980804213 vector-im/element-ios/issues/5114 - Allow editing poll start events. 2022-01-18 20:05:10 +02:00
Stefan Ceriu b18f37d270 vector-im/element-ios/issues/5114 - Allow editing poll start events. 2022-01-18 20:05:10 +02:00
ismailgulek f3247d6396 Disable sending polls in threads 2022-01-18 16:32:23 +03:00
ismailgulek 31821e205f Disable sending polls in threads 2022-01-18 16:32:23 +03:00
ismailgulek 7af7bd12e7 Dismiss keyboard when additional menu shown 2022-01-18 02:27:44 +03:00
ismailgulek 218f5759d0 Dismiss keyboard when additional menu shown 2022-01-18 02:27:44 +03:00
ismailgulek fb643ed8c0 Various design fixes 2022-01-17 16:32:32 +03:00
ismailgulek 8e8692881c Various design fixes 2022-01-17 16:32:32 +03:00
ismailgulek 812b58592e Fix build after merges 2022-01-17 13:35:14 +03:00
ismailgulek 3e35db691c Fix build after merges 2022-01-17 13:35:14 +03:00
ismailgulek 23eeedb9ac Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications 2022-01-17 11:39:25 +03:00