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
11070 commits 46 branches 261 tags 144 MiB
Commit graph

930 commits

Author SHA1 Message Date
ismailgulek
f28ecfb450
Merge branch 'develop' into element_4293 2021-05-12 10:34:03 +03:00
ismailgulek
3620be9800
Merge pull request #4316 from vector-im/pushkit_crashes 
Fixes for Pushkit Crashes
 2021-05-12 10:31:54 +03:00
ismailgulek
54903999f5
Update CHANGES.rst 2021-05-12 01:33:22 +03:00
SBiOSoftWhare
1fb3ed228a Merge branch 'develop' into spaces_beta 2021-05-11 22:16:19 +02:00
ismailgulek
cdaa89b34f
Update CHANGES.rst 2021-05-11 10:42:11 +03:00
manuroe
048a30551e Prepare for new sprint 2021-05-07 16:29:53 +02:00
manuroe
1abfee48ee version++ 2021-05-07 15:41:41 +02:00
SBiOSoftWhare
8f437e9fbe Merge branch 'spaces_beta' into spaces_feature_unavailable 
# Conflicts:
#	Riot/Modules/Application/LegacyAppDelegate.h
 2021-05-07 15:08:45 +02:00
SBiOSoftWhare
09b182bf9a Merge develop into spaces_beta 2021-05-07 12:31:59 +02:00
SBiOSoftWhare
c8f25b62c0
Merge branch 'spaces_beta' into spaces_feature_unavailable 2021-05-07 12:24:01 +02:00
ismailgulek
e0e788d78e
Update CHANGES.rst 2021-05-05 15:22:33 +03:00
ismailgulek
c999001a8f
Merge branch 'develop' into attended_call_transfers 2021-05-05 11:02:31 +03:00
ismailgulek
eb5929d96d
Merge branch 'voip_design_updates' into voip_jitsi_remover 2021-05-04 19:11:17 +03:00
ismailgulek
11f01669c7
Update CHANGES.rst 2021-05-04 18:05:23 +03:00
ismailgulek
f643cf5ad2
Update CHANGES.rst 2021-04-30 16:00:53 +03:00
Gil Eluard
97af126b83 Scroll to Bottom FAB button 2021-04-29 22:31:38 +02:00
Gil Eluard
ed3f0450b6
Merge pull request #4286 from vector-im/element_4285 
Show / Hide More and Report Content contextual menu from settings
 2021-04-29 20:36:48 +02:00
manuroe
a5051978b3
Merge pull request #4283 from vector-im/element_3158_v2 
Jitsi: use HS preferredDomain as Jitsi server to create conference v2
 2021-04-29 19:54:45 +02:00
Gil Eluard
eab687d9ec
Merge branch 'develop' into element_4285 2021-04-29 19:49:42 +02:00
Gil Eluard
ddd1a6b60e Show / hide NSFW and decrypted content options in Settings screen from build settings 2021-04-29 17:53:18 +02:00
manuroe
f1317173b2
Merge branch 'develop' into element_3158_v2 2021-04-29 17:52:19 +02:00
Gil Eluard
235df71607 Show / Hide More and Report Content contextual menu from settings 2021-04-29 17:03:34 +02:00
SBiOSoftWhare
6b437ef699 Update changes 2021-04-29 16:39:30 +02:00
Gil Eluard
9cc897b0c4 Enable / disable "Hide all messages from this user" of Room Member Screen from settings 2021-04-29 15:38:19 +02:00
SBiOSoftWhare
f0e2993d97 Update changes 2021-04-29 14:47:52 +02:00
SBiOSoftWhare
3d38ca4c5f Update changes 2021-04-29 12:36:55 +02:00
ismailgulek
46742d4a24
Merge branch 'voip_design_updates' into voip_jitsi_remover 2021-04-29 10:50:20 +03:00
manuroe
d8a05e09af
Merge pull request #4275 from vector-im/manu/4274_fix_notifications_in_debug 
Notifications: Make them work in debug mode
 2021-04-29 09:43:49 +02:00
manuroe
4ba860f76d Notifications: Make them work in debug mode 
Fix #4274.

Only the app needs MXUIKitBackgroundModeHandler.
 2021-04-29 09:21:16 +02:00
manuroe
7837c710c2 GH Actions: Make jobs use the right version of MatrixKit and MatrixSDK 2021-04-28 17:43:05 +02:00
Gil Eluard
4c0e7e94be Crash in [RoomViewController setScrollToBottomHidden:] 2021-04-28 16:00:19 +02:00
ismailgulek
cf3c4ac073
Merge branch 'voip_design_updates' into voip_jitsi_remover 2021-04-28 14:03:24 +03:00
Gil Eluard
4f22adc923 Merge branch 'develop' into element_4261 
# Conflicts:
#	CHANGES.rst
 2021-04-28 10:07:56 +02:00
ismailgulek
62ccbee487
Update CHANGES.rst 2021-04-27 11:39:45 +03:00
Gil Eluard
8d02b5668e Users must not be allowed to add or otherwise manage widgets in rooms 
- Avoid navigation to integration management using integration popup with settings set to integration disabled
 2021-04-26 20:17:43 +02:00
Gil Eluard
ea689bdbd6
Update CHANGES.rst 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2021-04-26 14:14:39 +02:00
Gil Eluard
7a31ea526e Widget navigation button still visible with settings set to integration disabled 2021-04-23 22:44:23 +02:00
Gil Eluard
2eece8153a clear cache support for RiotSettings 2021-04-23 22:26:54 +02:00
manuroe
2ec7b84ed7 Prepare for new sprint 2021-04-22 12:00:47 +02:00
manuroe
d671df4105 version++ 2021-04-22 11:23:40 +02:00
ismailgulek
3cbeba8563
Merge pull request #4250 from vector-im/fix_room_leave 
Fixes on Room Leave
 2021-04-21 14:17:37 +03:00
manuroe
2e9da81bc7
Merge pull request #4135 from vector-im/gh-actions 
Introduce GitHub Actions
 2021-04-21 13:14:17 +02:00
ismailgulek
bcd82c97b5
Update CHANGES.rst 2021-04-21 12:52:29 +03:00
manuroe
29552ce93f GH Actions: Polish 2021-04-21 09:25:18 +02:00
Gil Eluard
b1e932a356 Merge branch 'develop' into element_4218 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-21 09:08:58 +02:00
Gil Eluard
ae3b6950fa Merge branch 'develop' into element_4211 
# Conflicts:
#	CHANGES.rst
 2021-04-21 08:23:33 +02:00
Gil Eluard
a8e3b9db11 Updated CHANGES.rst 2021-04-20 15:28:46 +02:00
Gil Eluard
27f51f863b Merge branch 'develop' into element_4218 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 15:27:27 +02:00
Gil Eluard
5d63f431b0 Merge branch 'develop' into element_4211 
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 15:05:20 +02:00
Gil Eluard
16da1f5648 Show / Hide integrations and actions in rooms 2021-04-20 14:54:53 +02:00