Commit Graph

622 Commits

Author SHA1 Message Date
Stefan Ceriu ac6561a3d3 vector-im/element-ios/issues/5114 - Polls in the timeline. 2021-12-09 09:37:02 +02:00
Stefan Ceriu 17f2f71634 vector-im/element-ios/issues/5114 - Polls in the timeline. 2021-12-09 09:37:02 +02:00
SBiOSoftWhare e8d4af46d2 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
SBiOSoftWhare 56a51da9f9 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
ismailgulek bcec32f8da Merge branch 'develop' into ismail/5068_start_thread 2021-11-19 00:23:24 +03:00
ismailgulek 98802857b8 Merge branch 'develop' into ismail/5068_start_thread 2021-11-19 00:23:24 +03:00
Doug 6dd471045f Merge branch 'master' into develop
# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m
2021-11-17 17:36:44 +00:00
Doug f1b341d8e7 Merge branch 'master' into develop
# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m
2021-11-17 17:36:44 +00:00
ismailgulek 8c1dbd8311 Merge branch 'develop' into ismail/5068_start_thread 2021-11-11 21:43:16 +03:00
ismailgulek e041b9003e Merge branch 'develop' into ismail/5068_start_thread 2021-11-11 21:43:16 +03:00
ismailgulek 49cadec685 Add labs setting for threads 2021-11-09 15:18:18 +03:00
ismailgulek 50da7afa70 Add labs setting for threads 2021-11-09 15:18:18 +03:00
Phl-Pro 31a99e2e09 Merge branch 'develop' into phlpro/4722_objc_headers 2021-11-05 14:41:36 +01:00
Phl-Pro df8ff2b587 Merge branch 'develop' into phlpro/4722_objc_headers 2021-11-05 14:41:36 +01:00
SBiOSoftWhare c534fa1187 Merge pull request #5091 from vector-im/steve/5090_update_settings_about_section
Settings: Update about section footer text
2021-11-04 12:02:10 +01:00
SBiOSoftWhare 5eb8eb306f Merge pull request #5091 from vector-im/steve/5090_update_settings_about_section
Settings: Update about section footer text
2021-11-04 12:02:10 +01:00
SBiOSoftWhare 9a9f79a67d SettingsVC: Update about section footer text. 2021-11-04 11:48:06 +01:00
SBiOSoftWhare 3107b1af3f SettingsVC: Update about section footer text. 2021-11-04 11:48:06 +01:00
Doug 36fa788312 Keep strong refs to weak views before display. 2021-11-01 17:38:56 +00:00
Doug 6c2b07b01a Keep strong refs to weak views before display. 2021-11-01 17:38:56 +00:00
SBiOSoftWhare b6614109a0 SettingsViewController: Prevent retain cycles. 2021-10-29 10:49:29 +02:00
SBiOSoftWhare f48fb23071 SettingsViewController: Prevent retain cycles. 2021-10-29 10:49:29 +02: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
Doug c2a69f8ec0 Address Steve's comments. 2021-10-20 19:29:23 +01:00
Doug a2eea97690 Address Steve's comments. 2021-10-20 19:29:23 +01:00
Doug ac7696cc29 Add SectionFooterView.xib to fix fonts on iOS 12-14.
Update SecurityViewController too.
2021-10-20 17:40:39 +01:00
Doug 987c39b93c Add SectionFooterView.xib to fix fonts on iOS 12-14.
Update SecurityViewController too.
2021-10-20 17:40:39 +01:00
Doug 892179b030 Fix bug accepting identity server terms from the Setting Discovery section. 2021-10-20 17:40:39 +01:00
Doug 86869d5fdc Fix bug accepting identity server terms from the Setting Discovery section. 2021-10-20 17:40:39 +01:00
Doug 53de9aef28 Use footers for app and discovery information.
Remove Invite Friends button from settings.
Reorganise Advanced and Other settings.
Rename Other to About.
2021-10-20 17:40:39 +01:00
Doug 8f60350666 Use footers for app and discovery information.
Remove Invite Friends button from settings.
Reorganise Advanced and Other settings.
Rename Other to About.
2021-10-20 17:40:39 +01:00
Doug 7bbe49febf Update fonts, add attributed strings and add tap gestures back.
Footers use subheadline. Headers use footnote.
2021-10-20 17:40:39 +01:00
Doug 687398ce78 Update fonts, add attributed strings and add tap gestures back.
Footers use subheadline. Headers use footnote.
2021-10-20 17:40:39 +01:00
Doug d46642bd84 Use actual footer titles rather than cells that mimic them. 2021-10-20 17:40:39 +01:00
Doug 7c31b5e219 Use actual footer titles rather than cells that mimic them. 2021-10-20 17:40:39 +01:00
Doug 35df7541ed Use footnote text style for description cells to match UITableView's footer style. Match the footer colour to the header colour. Add -[SettingsViewController descriptionCellForTableView:] and use for appropriate cells. 2021-10-20 17:40:39 +01:00
Doug b9338b4298 Use footnote text style for description cells to match UITableView's footer style. Match the footer colour to the header colour. Add -[SettingsViewController descriptionCellForTableView:] and use for appropriate cells. 2021-10-20 17:40:39 +01:00
Doug 1e1e00c7b8 Use headerTextPrimaryColor in headers and don't override system font size. 2021-10-20 17:40:39 +01:00
Doug e3c434cda6 Use headerTextPrimaryColor in headers and don't override system font size. 2021-10-20 17:40:39 +01:00
Doug 8c9c69586f Merge remote-tracking branch 'origin/develop' into doug/4484_contacts_access
# Conflicts:
#	Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorBridgePresenter.swift
2021-10-08 11:45:43 +01:00
Doug 473511f8c6 Merge remote-tracking branch 'origin/develop' into doug/4484_contacts_access
# Conflicts:
#	Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorBridgePresenter.swift
2021-10-08 11:45:43 +01:00
Stefan Ceriu 9ee68cb7d8 vector-im/element-ios/issues/4899 - Fixed various localization issues. 2021-10-08 11:33:13 +03:00
Stefan Ceriu 34e1177bf6 vector-im/element-ios/issues/4899 - Fixed various localization issues. 2021-10-08 11:33:13 +03:00
Doug 83a0754916 Small tweaks plus changelog entry.
Use the new generated localisation strings. Add comments.

Address feedback from PR review.
2021-10-01 16:16:26 +01:00
Doug 634424d288 Small tweaks plus changelog entry.
Use the new generated localisation strings. Add comments.

Address feedback from PR review.
2021-10-01 16:16:26 +01:00
manuroe 0500f703b2 i18n: Standardise casing of identity server and integration manager. 2021-10-01 11:51:30 +01:00
manuroe cea2c9af60 i18n: Standardise casing of identity server and integration manager. 2021-10-01 11:51:30 +01:00
Doug 1c4b09b813 Merge branch 'develop' into doug/4484_contacts_access
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Settings/SettingsViewController.m
2021-09-30 11:14:02 +01:00
Doug 997ee54f20 Merge branch 'develop' into doug/4484_contacts_access
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Settings/SettingsViewController.m
2021-09-30 11:14:02 +01:00