Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 15:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
14839 commits 46 branches 261 tags 144 MiB
Commit graph

259 commits

Author SHA1 Message Date
David Langley
cff98cdd1d Revert "fix merge" 
This reverts commit 0251a01bb0.
 2022-03-21 10:39:50 +00:00
David Langley
0251a01bb0 fix merge 2022-03-17 09:16:11 +00:00
Andy Uhnak
9a4c3e485b Merge branch 'master' into develop 2022-03-14 16:26:07 +00:00
Andy Uhnak
a719fc5fdf finish version++ 2022-03-14 16:26:01 +00:00
Gil Eluard
c76e0bc4b4
Merge pull request #5748 from vector-im/gil/SP1_space_creation 
Creating & managing Spaces
 2022-03-10 10:18:48 +01:00
Andy Uhnak
0bfc548538 finish version++ 2022-03-08 18:20:16 +00:00
Gil Eluard
aadf1b7d67 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
ismailgulek
0d381b5c69
Update AnalyticsEvents repo 2022-03-01 14:50:09 +03:00
Gil Eluard
89a16a72c2 Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
Doug
14e04d8c46 finish version++ 2022-02-25 11:40:06 +00:00
Doug
334c125128 finish version++ 2022-02-22 14:16:29 +00:00
Gil Eluard
8bd67bdc52 Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces 
# Conflicts:
#	Podfile.lock
 2022-02-21 17:57:58 +01:00
Doug
382e503495 Update analytics event pod. 2022-02-18 11:21:46 +00:00
Stefan Ceriu
4a055a2637 finish version++ 2022-02-16 12:45:01 +02:00
Doug
52e375fced finish version++ 2022-02-09 18:41:39 +00:00
Gil Eluard
96cf359703 Merge branch gil/5230_SP2-Adding_Rooms_to_Spaces into gil/5231_SP3-1_Update_room_settings_for_Spaces 2022-02-05 21:43:29 +01:00
Doug
bf6c43c795 finish version++ 2022-01-25 14:26:28 +00:00
Stefan Ceriu
821d6066cd vector-im/element-ios/issues/5298 - Removed cocoapods-keys and moved the MapTiler key to the buildSettings. 2022-01-19 16:11:35 +02:00
Doug
e8686dc50f finish version++ 2022-01-11 14:27:20 +00:00
Doug
bee737f97d Retain AnalyticsService. Fix coordinator retain cycle. 2021-12-16 17:02:58 +00:00
Doug
a5abff7eee Address most PR comments. 
Update Podfile.lock
 2021-12-16 17:01:23 +00:00
Doug
a2aa01f06c Move string formatting to Tools. 
Revert contacts tracking from MatrixKit.
Final tweaks before PR.
 2021-12-16 17:01:22 +00:00
Doug
932eca82cc Support link/html in analytics prompt strings. 
Show the new prompt to everyone, even if they previously opted out.
Add docs to Analytics.
 2021-12-16 17:01:22 +00:00
Doug
7bdc146b82 Use matrix-analytics-events generated stubs (locally for now). 
Track screens, removing any that aren't part of the schema.
 2021-12-16 16:59:45 +00:00
Doug
46d264477d Remove cocoapods-keys. Use UUID for analytics. 
Make configuration optional.
 2021-12-16 16:59:45 +00:00
Doug
50dea9843b Update to PostHog 1.4.4 2021-12-16 16:59:45 +00:00
Doug
2b80c0437a Don't read analytics opt in status from account data. 
Update PostHog to 1.4.3.

Add tests for prompt type.
 2021-12-16 16:59:45 +00:00
Doug
df4d13d881 finish version++ 2021-12-14 15:02:12 +00:00
manuroe
b75eb9cfa5 Podfile: Use the right SDK version after the security release 
https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.14
 2021-12-14 08:58:42 +01:00
manuroe
9ea5d3f32a version++ (Made manually) 2021-12-09 11:21:19 +01:00
SBiOSoftWhare
d468851979 finish version++ 2021-12-07 22:45:24 +01:00
Doug
e324767d7d Merge branch 'master' into develop 
# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m
 2021-11-17 17:36:44 +00:00
Doug
53ed1da478 finish version++ 2021-11-17 16:49:01 +00:00
Stefan Ceriu
30ff8a65fb vector-im/element-ios/issues/5114 - Poll creation screen 
- added input toolbar poll creation action.
- reordered input toolbar actions as per designs.
- added multiline text field and extracted common components.
 2021-11-11 11:24:28 +02:00
SBiOSoftWhare
23aae31460 finish version++ 2021-10-21 20:33:26 +02:00
manuroe
ceccbb0ed2 finish version++ 2021-10-14 09:12:24 +02:00
manuroe
7b97511665 finish version++ 2021-10-12 13:41:45 +02:00
manuroe
6c9ad945d4 finish version++ 2021-10-08 17:51:15 +02:00
Doug
bf48056999 Pods: Update ffmpeg-kit-ios-audio, FLEX, FlowCommoniOS, Reusable and SwiftLint. 2021-10-01 14:32:59 +01:00
manuroe
8efcbdf93b finish version++ 2021-09-30 23:51:12 +01:00
manuroe
a32cc2243f Upgrade MatrixKit version (v0.16.3) 2021-09-29 12:47:31 +02:00
manuroe
0d14f77f3c finish version++ 2021-09-24 16:14:41 +02:00
Doug
d956fb9b59 Update Podfile.lock for OLMKit 3.2.5 2021-09-16 17:24:04 +01:00
manuroe
77fc814221 Merge remote-tracking branch 'origin/master' into develop 2021-09-16 15:01:40 +02:00
manuroe
b3c4f6b45b finish version++ 2021-09-16 14:59:17 +02:00
Stefan Ceriu
d4c7a2b0d1 Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00
manuroe
ae46e206f0 finish version++ 2021-09-09 11:13:31 +02:00
Stefan Ceriu
4a0f68694c #4693 - Mark iOS 11 as dropped in the verions check coordinator (last supported release). 2021-09-06 18:24:26 +03:00
Stefan Ceriu
f2dd0e256b Revert "#4693 - Drop iOS 11 support." 
This reverts commit a2b359f219.
 2021-09-06 18:24:26 +03:00
Stefan Ceriu
a786cbb90a #4693 - Drop iOS 11 support. 2021-09-01 15:55:41 +03:00