86aa5365bb
MESSENGER-3352 build settings
2022-10-27 09:06:24 +00:00
f9409804b1
Merge commit 'a7b7fffd00663340f1684fa8d096dc20b4c9719e' into feature/basis_update_192
...
# Conflicts:
# Config/AppVersion.xcconfig
# Config/BuildSettings.swift
# DesignKit/Source/ColorsSwiftUI.swift
# DesignKit/Source/FontsSwiftUI.swift
# DesignKit/Source/ThemeV2.swift
# DesignKit/Variants/Colors/Dark/DarkColors.swift
# DesignKit/Variants/Colors/Light/LightColors.swift
# Podfile.lock
# Riot/Assets/de.lproj/InfoPlist.strings
# Riot/Assets/de.lproj/Vector.strings
# Riot/Assets/en.lproj/Vector.strings
# Riot/Generated/Images.swift
# Riot/Generated/Strings.swift
# Riot/Managers/PushNotification/PushNotificationService.m
# Riot/Managers/Settings/RiotSettings.swift
# Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h
# Riot/Modules/Common/Recents/RecentsViewController.m
# Riot/Modules/Communities/Home/GroupHomeViewController.m
# Riot/Modules/Room/RoomViewController.m
# Riot/Modules/SetPinCode/PinCodePreferences.swift
# Riot/Modules/Settings/SettingsViewController.m
# Riot/Modules/TabBar/MasterTabBarController.h
# Riot/Modules/TabBar/MasterTabBarController.m
# Riot/Modules/TabBar/TabBarCoordinator.swift
# fastlane/Fastfile
# project.yml
2022-09-19 14:42:25 +02:00
226e55caf7
MESSENGER-3304 string in separate files
2022-09-19 11:53:45 +02:00
c878088bdd
Fix a race in room data source initializer, by adding threadId parameter in every case
2022-08-26 14:12:13 +03:00
ecdd1e3a48
MESSENGER-3310 use local personal note avatar and remove url of old rooms
2022-07-22 16:50:46 +02:00
e071ec789a
Update Room Info screen back button text
2022-06-22 15:56:31 +02:00
137d840d11
Handle long press on back buttons
2022-06-22 15:56:31 +02:00
1ab51f37f8
Merge branch 'master' of https://github.com/vector-im/element-ios into feature/3269_merge_element_1_8_18
...
# Conflicts:
# Config/AppIdentifiers.xcconfig
# Config/AppVersion.xcconfig
# Podfile
# Podfile.lock
# Riot/Assets/de.lproj/Vector.strings
# Riot/Generated/Images.swift
# Riot/Modules/Analytics/DecryptionFailureTracker.m
# Riot/Modules/Application/LegacyAppDelegate.h
# Riot/Modules/Onboarding/OnboardingCoordinator.swift
# Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
# Riot/Modules/Room/RoomViewController.m
# Riot/SupportingFiles/Info.plist
# Riot/Utils/EventFormatter.m
# Riot/Utils/Tools.h
# Riot/Utils/Tools.m
# Riot/target.yml
# RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
# fastlane/Fastfile
# project.yml
2022-06-12 19:49:46 +02:00
5a69c01274
Merge pull request #6098 from vector-im/yostyle/disable_search_encrypted_rooms
...
Hide or disable search in the encrypted rooms
2022-05-16 23:24:06 +02:00
46930060ec
Merge pull request #6098 from vector-im/yostyle/disable_search_encrypted_rooms
...
Hide or disable search in the encrypted rooms
2022-05-16 23:24:06 +02:00
5691c5669e
Setup a dedicated listener owned by PresenceIndicatorView
2022-05-12 10:55:00 +02:00
a5fd8f7417
Setup a dedicated listener owned by PresenceIndicatorView
2022-05-12 10:55:00 +02:00
966f5299d9
merged from element 1.8.13
2022-05-05 06:57:45 +02:00
990962285a
merged element 1.8.10
2022-05-03 12:48:01 +02:00
5a4798be8e
Hide or disable search in the encrypted rooms
2022-05-02 22:30:39 +02:00
723ac16f34
Hide or disable search in the encrypted rooms
2022-05-02 22:30:39 +02:00
c0f8458371
Wrong copy for upgrade room message ( #6003 )
...
* Wrong copy for upgrade room message
- fixed
2022-04-11 15:46:08 +02:00
4f5c8fdb9a
Wrong copy for upgrade room message ( #6003 )
...
* Wrong copy for upgrade room message
- fixed
2022-04-11 15:46:08 +02:00
08faf850e5
Fix RoomTitleView default presence display & add a constraint for disambiguation on RoomInfoBasicView
2022-04-06 16:01:49 +02:00
e21a81366e
Fix RoomTitleView default presence display & add a constraint for disambiguation on RoomInfoBasicView
2022-04-06 16:01:49 +02:00
e634d181ad
Update MXPresence to NS_ENUM
2022-04-06 15:23:36 +02:00
8a9315c220
Update MXPresence to NS_ENUM
2022-04-06 15:23:36 +02:00
38363b1832
PresenceIndicatorView Swift implementation
2022-04-05 15:13:58 +02:00
10cebea479
PresenceIndicatorView Swift implementation
2022-04-05 15:13:58 +02:00
967b4429f5
Observe presence changes to update RoomInfoBasicView
2022-04-04 18:52:07 +02:00
781131d8f0
Observe presence changes to update RoomInfoBasicView
2022-04-04 18:52:07 +02:00
f776b335ef
Display presence in RoomInfoBasicView
2022-04-04 18:52:07 +02:00
a64f2f7eac
Display presence in RoomInfoBasicView
2022-04-04 18:52:07 +02:00
61d260a8e0
Feature/2581 permalinks
2022-03-31 05:51:40 +00:00
c2108a2178
MESSENGER-2762 Initial Merge
2022-03-17 15:51:23 +01:00
cdd66146d8
Merge branch 'develop' into gil/SP1_space_creation
...
# Conflicts:
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
# Riot/Modules/Room/RoomViewController.m
# Riot/Modules/Room/Settings/RoomSettingsViewController.h
# Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
2022-03-08 11:23:55 +01:00
4f43793313
Merge branch 'develop' into gil/SP1_space_creation
...
# Conflicts:
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
# Riot/Modules/Room/RoomViewController.m
# Riot/Modules/Room/Settings/RoomSettingsViewController.h
# Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
2022-03-08 11:23:55 +01:00
acf7d0de13
Instrument missing screen metrics ( #5764 )
...
* Instrument missing screen metrics
- Done
2022-03-08 10:13:46 +01:00
24de57bb58
Instrument missing screen metrics ( #5764 )
...
* Instrument missing screen metrics
- Done
2022-03-08 10:13:46 +01:00
cf015c4ef2
selection impossible when filtering in add room screen #5757 ( #5758 )
...
- Fixed
- Other minor code / UI tweaks
2022-03-07 12:25:50 +01:00
dcebd89fdf
selection impossible when filtering in add room screen #5757 ( #5758 )
...
- Fixed
- Other minor code / UI tweaks
2022-03-07 12:25:50 +01:00
59038e18c1
Merge branch 'develop' into gil/SP1_space_creation
...
# Conflicts:
# Config/BuildSettings.swift
# Riot/Generated/Strings.swift
# Riot/Modules/Home/HomeViewController.m
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
42b4144323
Merge branch 'develop' into gil/SP1_space_creation
...
# Conflicts:
# Config/BuildSettings.swift
# Riot/Generated/Strings.swift
# Riot/Modules/Home/HomeViewController.m
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
0fcebfa145
Merge branch 'gil/SP1_space_creation' of github.com:vector-im/element-ios into gil/SP1_space_creation
2022-03-04 13:06:27 +01:00
8d31cbc0f9
Merge branch 'gil/SP1_space_creation' of github.com:vector-im/element-ios into gil/SP1_space_creation
2022-03-04 13:06:27 +01:00
3347354216
SP4: space settings ( #5730 )
...
* SP4: Space Settings
- Space settings screen implemented
- No space upgrade available as per Element web
- Need more insights for the space address field
- Added settings live update
- Added local alias implementation
2022-03-04 12:53:42 +01:00
06bda465d9
SP4: space settings ( #5730 )
...
* SP4: Space Settings
- Space settings screen implemented
- No space upgrade available as per Element web
- Need more insights for the space address field
- Added settings live update
- Added local alias implementation
2022-03-04 12:53:42 +01:00
fb022ff6b0
Enable home and room user indicators
2022-03-01 15:50:24 +00:00
830feeb7c0
Enable home and room user indicators
2022-03-01 15:50:24 +00:00
03874a0f92
Removed unnecessary and cropped room info avatar shadow.
2022-03-01 16:43:46 +02:00
b657e51267
Removed unnecessary and cropped room info avatar shadow.
2022-03-01 16:43:46 +02:00
72e280652a
Merge branch 'develop' into gil/SP1_space_creation
2022-03-01 10:15:13 +01:00
0abef4312e
Merge branch 'develop' into gil/SP1_space_creation
2022-03-01 10:15:13 +01:00
c84285955b
SP3.1: Update room settings for Spaces #5231
...
- Update after review
2022-02-28 16:07:09 +01:00
bca69bb7c8
SP3.1: Update room settings for Spaces #5231
...
- Update after review
2022-02-28 16:07:09 +01:00
Arnfried Griesert
Frank Rotermund
ismailgulek
aringenbach
Yoan Pintas
Gil Eluard
Andy Uhnak
Stefan Ceriu