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

12564 commits

This branch
This branch
All branches
Author SHA1 Message Date
manuroe
756b14d403 Prepare for new sprint 2021-09-24 16:14:48 +02:00
manuroe
31a1d1859f Merge branch 'master' into develop 2021-09-24 16:14:46 +02:00
manuroe
13978f03b1 Merge branch 'release/1.6.0/master' 2021-09-24 16:14:41 +02:00
manuroe
0d14f77f3c finish version++ 2021-09-24 16:14:41 +02:00
manuroe
540254f03c
Merge pull request #4905 from vector-im/release/1.6.0/release 
Release 1.6.0
 2021-09-24 16:00:19 +02:00
manuroe
58cdb1492c version++ 2021-09-24 15:26:45 +02:00
manuroe
748cd081d7 changelog.d: Upgrade MatrixKit version ([v0.16.2](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.16.2)). 2021-09-24 15:26:44 +02:00
Gil Eluard
fc52c2b275
Merge pull request #4904 from vector-im/gil/4903-_suggested_spaces_appear_as_suggested_rooms 
Suggested Spaces appear as suggested rooms
 2021-09-24 15:23:48 +02:00
Gil Eluard
089d72882b Suggested Spaces appear as suggested rooms #4903 
- Fixed
 2021-09-24 14:31:35 +02:00
manuroe
0d2ffb580b
Merge pull request #4901 from RiotTranslateBot/weblate-riot-ios-riot-ios-push 
Translations update from Weblate
 2021-09-24 13:08:31 +02:00
manuroe
bdb5561e2c
Merge pull request #4900 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Translations update from Weblate
 2021-09-24 13:08:09 +02:00
Weblate
cd16a881ba Merge branch 'origin/develop' into Weblate. 2021-09-24 10:59:02 +00:00
Weblate
323993b6f3 Merge branch 'origin/develop' into Weblate. 2021-09-24 10:57:24 +00:00
Gil Eluard
dc8bcbf567
Merge pull request #4897 from vector-im/spaces 
Spaces first RC
 2021-09-24 11:48:39 +02:00
Gil Eluard
9449dbcbb3 Added changelog files 2021-09-24 11:19:22 +02:00
Gil Eluard
ef872ec53e
Merge pull request #4895 from vector-im/gil/4498_Handle_space_link 
[Spaces] M10.6.1 Handle space link #4498
 2021-09-23 22:12:17 +02:00
Gil Eluard
36541a4dab Try to fix CI build issues 2021-09-23 21:33:23 +02:00
Gil Eluard
578dce8590 Try to fix CI build issues 2021-09-23 21:06:29 +02:00
Gil Eluard
2ad094b836 [Spaces] M10.6.1 Handle space link #4498 
- Change (+) button behaviour in home screen according to current space
 2021-09-23 17:35:49 +02:00
Gil Eluard
ca7bf18f76 [Spaces] M10.6.1 Handle space link #4498 
- Update after code review
 2021-09-23 17:15:32 +02:00
Gil Eluard
5b50ce2e39 reverted HomeViewControllerWithBannerWrapperViewController 2021-09-23 15:38:43 +02:00
Gil Eluard
cc8ac58fd5 Merge branch 'spaces' into gil/4498_Handle_space_link 2021-09-23 15:26:29 +02:00
Gil Eluard
cf51612864 Merge branch 'develop' into spaces 2021-09-23 15:26:06 +02:00
Gil Eluard
758ccf509c
Merge pull request #4867 from vector-im/gil/pre_release_fixes 
[Spaces] pre release fixes
 2021-09-23 15:22:08 +02:00
Gil Eluard
24956e6774 Merge branch 'gil/pre_release_fixes' into gil/4498_Handle_space_link 2021-09-23 15:00:06 +02:00
Gil Eluard
134379bcc5 [spaces] several fixes for pre release 
- update after review
 2021-09-23 14:50:00 +02:00
David Langley
53563c996f
Merge pull request #4892 from vector-im/langleyd/4772_voice_message_drafts 
Voice message draft persistence
 2021-09-23 11:21:26 +00:00
David Langley
eb92cc9cf8 use roomId for audioPlayerId, remove dead code, make functions private. 2021-09-23 10:55:35 +01:00
Gil Eluard
c207c8d28a
Update Riot/Modules/Spaces/SpaceList/SpaceListViewCell.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2021-09-23 11:47:26 +02:00
Gil Eluard
4619d907ea Merge branch 'gil/pre_release_fixes' into gil/4498_Handle_space_link 2021-09-23 11:35:45 +02:00
David Langley
0df653e244
Merge pull request #4878 from vector-im/langleyd/4774_voice_message_scrubbing 
Langleyd/4774 voice message scrubbing
 2021-09-23 09:35:38 +00:00
Gil Eluard
bf64d9ca49 [spaces] several fixes for pre release 
- update after review
 2021-09-23 11:32:56 +02:00
David Langley
c1fd40c5bb Remove space 2021-09-23 09:39:09 +01:00
David Langley
007f72d51e Use RoomId for room by room drafts. 2021-09-23 08:48:15 +01:00
Gil Eluard
9b8f8d1a20 fixed FAB button in Home screen 2021-09-22 22:57:21 +02:00
Gil Eluard
3a2548a5ae [spaces] several fixes for pre release 
- [Space view has communities tab at the bottom of the screen](https://github.com/vector-im/element-ios/issues/4846)
 2021-09-22 18:49:22 +02:00
ismailgulek
3b6f517089
Merge pull request #4877 from vector-im/ismail/4874_fix_scroll_crash 
RecentsViewController: Fix scroll crash
 2021-09-22 18:43:34 +03:00
David Langley
442708524e Simplify scrubbing logic. 2021-09-22 16:26:20 +01:00
Gil Eluard
4d1dd1eb0a Merge branch 'gil/pre_release_fixes' into gil/4498_Handle_space_link 2021-09-22 16:58:28 +02:00
Gil Eluard
e6b72a778a [spaces] several fixes for pre release 
- [When switching spaces, user and room tabs are not populated](https://github.com/vector-im/element-ios/issues/4889)
- [Explore rooms list in space has odd ordering](https://github.com/vector-im/element-ios/issues/4890)
- Fixed Coming Soon error for Explore rooms
 2021-09-22 16:57:31 +02:00
Stefan Ceriu
332611f6a4
Merge pull request #4882 from vector-im/stefan/4881-configurable-app-name-localization-strings 
Fixes #4881 - Using the bundle display name as the app name in locali…
 2021-09-22 17:17:44 +03:00
Stefan Ceriu
6111382a63 Merge branch 'develop' into stefan/4881-configurable-app-name-localization-strings 
# Conflicts:
#	Riot/Generated/Strings.swift
 2021-09-22 17:17:05 +03:00
Stefan Ceriu
388d828c2b Fixes #4881 - Replaced InfoPlist.cfBundleDisplayName with AppInfo.current.displayName and removed the now unused InfoPlist generated class. 2021-09-22 16:59:47 +03:00
Gil Eluard
4782ba89ed Merge branch 'spaces' into gil/pre_release_fixes 2021-09-22 15:39:55 +02:00
Gil Eluard
f6ea4da656 Merge branch 'develop' into spaces 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
 2021-09-22 15:39:06 +02:00
David Langley
616e47de08
Merge pull request #4791 from vector-im/langleyd/4781_swiftui_template_examples 
SwiftUI Simple Template Example
 2021-09-22 12:59:46 +00:00
Gil Eluard
14f0533a5a [Spaces] M10.6.1 Handle space link #4498 
- Fixed universal links
- Added support for space links
 2021-09-22 14:58:19 +02:00
David Langley
3bb50d2a35 Build on xcode 12 2021-09-22 13:53:26 +01:00
David Langley
87e84d2f6c Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/4774_voice_message_scrubbing 2021-09-22 13:17:32 +01:00
Stefan Ceriu
0848f66cdb Fixes #4881 - Using the bundle display name as the app name in localizable .strings files. Exposing generated .strings and info.plist members to Objective-C. 2021-09-22 14:10:16 +03:00