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

10612 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gil Eluard
4c0e7e94be Crash in [RoomViewController setScrollToBottomHidden:] 2021-04-28 16:00:19 +02:00
Gil Eluard
e34e89c66a
Merge pull request #4262 from vector-im/element_4261 
Widget navigation button still visible with settings set to integrati…
 2021-04-28 10:45:31 +02:00
Gil Eluard
4f22adc923 Merge branch 'develop' into element_4261 
# Conflicts:
#	CHANGES.rst
 2021-04-28 10:07:56 +02:00
Gil Eluard
f6cc39dfae
Merge pull request #4260 from vector-im/element_4259 
clear cache support for RiotSettings
 2021-04-28 10:06:01 +02: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
7a6f5c6afb Merge branch 'develop' into element_4261 2021-04-26 20:08:47 +02:00
ismailgulek
4c9f999584
Merge pull request #4266 from vector-im/fix_code_signing 
Fix Code Signing
 2021-04-26 17:11:15 +03:00
ismailgulek
0860474fd5
Update provisioning profiles 2021-04-26 16:58:20 +03:00
ismailgulek
043e3b11fd
Update cert name 2021-04-26 16:58:08 +03: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
0be5d10eb3 Merge branch 'master' into develop 2021-04-22 12:00:44 +02:00
manuroe
b6ff5f7d01 Merge branch 'release/1.3.5/master' 2021-04-22 12:00:35 +02:00
manuroe
248795c229 finish version++ 2021-04-22 12:00:35 +02:00
manuroe
ce00ad8f1d
Merge pull request #4256 from vector-im/release/1.3.5/release 
Release 1.3.5
 2021-04-22 11:59:42 +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
ismailgulek
b4f4d9a002
Hide scroll to bottom when room is left 2021-04-21 12:50:37 +03:00
ismailgulek
b800cbbefd
Pop view controller if pushed before 2021-04-21 12:50:21 +03:00
Gil Eluard
21bcfe4b23
Merge pull request #4219 from vector-im/element_4218 
Make room settings screen configurable dynamically
 2021-04-21 09:40:18 +02: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
8fab443897
Merge pull request #4212 from vector-im/element_4211 
Make joining public rooms configurable
 2021-04-21 09:03:17 +02:00
manuroe
8ce5f1cb02 GH Actions: Increase test expectation timeout. Machines are slow 2021-04-21 08:28:45 +02:00
Gil Eluard
ae3b6950fa Merge branch 'develop' into element_4211 
# Conflicts:
#	CHANGES.rst
 2021-04-21 08:23:33 +02:00
Gil Eluard
6123b3eeee
Merge pull request #4246 from vector-im/element_4245 
Show / Hide integrations and actions in rooms
 2021-04-21 08:21:41 +02:00
Gil Eluard
30e7373d6d Podfile.lock reverted 2021-04-21 08:16:17 +02:00
Gil Eluard
0e678dacd4 Podfile.lock 2021-04-21 08:15:13 +02:00
manuroe
d1c2f528bd GH Actions: Use a separate job for tests to save time 2021-04-21 07:38:42 +02:00
manuroe
59f1dd2542 GH Actions: Add cached for bundler and pods 2021-04-20 18:01:45 +02:00
manuroe
e573f167d9 GH Actions: Make tests work probably better 2021-04-20 17:34:59 +02:00
manuroe
0d3b4150e7 GH Actions: Run tests in another way 2021-04-20 16:55:38 +02:00
manuroe
dbcd2c90ec GH Actions: Run projects tests 2021-04-20 16:13:01 +02:00
manuroe
5286164d23 Fastlane: Add a lane for tests 2021-04-20 16:10:37 +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
e4b5358f25 Show / Hide integrations and actions in rooms 
- Initial Build Settings
 2021-04-20 14:57:31 +02:00
Gil Eluard
16da1f5648 Show / Hide integrations and actions in rooms 2021-04-20 14:54:53 +02:00
manuroe
a9dcfce626 Merge branch 'develop' into gh-actions 2021-04-20 14:30:29 +02:00
SBiOSoftWhare
db92fb4f25
Merge pull request #4244 from vector-im/fix_public_search 
PublicRoomsDirectoryDataSource: Fix search when NSFW filter is off
 2021-04-20 14:20:59 +02:00
SBiOSoftWhare
873aa9fd8d
Merge branch 'develop' into fix_public_search 2021-04-20 14:20:41 +02:00
manuroe
2cfe9441e5
Merge pull request #4238 from vector-im/MadLittleMods/gitter.im-room-directory 
Add gitter.im to default list of room directories
 2021-04-20 14:04:11 +02:00
manuroe
15f983017e
Merge branch 'develop' into MadLittleMods/gitter.im-room-directory 2021-04-20 14:04:03 +02:00
Gil Eluard
cafed69c36
Merge pull request #4243 from vector-im/element_4242 
Show/Hide public directory in Unified Search
 2021-04-20 12:40:29 +02:00
SBiOSoftWhare
dff2a7ea15 Update changes 2021-04-20 12:01:55 +02:00