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

6304 commits

This branch
This branch
All branches
Author SHA1 Message Date
manuroe
6ff7530d8a Device Verification: Name for 🔒 is "Lock" 
#2526
 2019-06-24 15:46:16 +02:00
Weblate
712a176acb Merge branch 'origin/develop' into Weblate. 2019-06-24 13:01:05 +00:00
Osoitz
330f7a03bd Translated using Weblate (Basque) 
Currently translated at 100.0% (711 of 711 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/eu/
 2019-06-24 13:01:05 +00:00
manuroe
f7554aaa88
Merge pull request #2524 from vector-im/riot_2518 
Make sure there are no ugly edge cases running Riot without an integrations manager
 2019-06-24 15:01:00 +02:00
manuroe
918adc5b7a Integrations: Manage the error of provided integrations server not responding 2019-06-21 15:06:41 +02:00
manuroe
948105b03d Integrations: Manage the error of no configured integrations server 2019-06-21 12:12:32 +02:00
manuroe
afd37fa9fb Integrations: Make code support use of an integration manager other than modular/scalar. 
The default value is still modular/scalar.
 2019-06-21 11:26:34 +02:00
Weblate
b23af5c994 Merge branch 'origin/develop' into Weblate. 2019-06-21 08:02:38 +00:00
SBiOSoftWhare
1c10049f99
Merge pull request #2519 from vector-im/fix_e2e_padlock 
e2e room message: Fix padlock position on last message with sender name
 2019-06-21 10:02:35 +02:00
SBiOSoftWhare
98361afa6f e2e room message: Fix padlock position on last message with sender name. 2019-06-20 12:07:04 +02:00
Weblate
31bd8a94f3 Merge branch 'origin/develop' into Weblate. 2019-06-20 08:05:34 +00:00
SBiOSoftWhare
2eee21a200
Merge pull request #2517 from vector-im/cocoapods_1.7.2 
Use CocoaPods 1.7.2
 2019-06-20 10:05:30 +02:00
SBiOSoftWhare
9b1d2bc77e Use CocoaPods 1.7.2 2019-06-19 16:48:16 +02:00
Weblate
c16757f4a6 Merge branch 'origin/develop' into Weblate. 2019-06-19 14:47:29 +00:00
manuroe
37f967472b
Merge pull request #2437 from dcordero/Bundler 
Update build instructions to make use of Bundler
 2019-06-19 16:47:24 +02:00
Weblate
0293897d03 Merge branch 'origin/develop' into Weblate. 2019-06-19 14:28:29 +00:00
SBiOSoftWhare
76a880c60c
Merge pull request #2514 from vector-im/swift_5 
Migrate to Swift 5.0
 2019-06-19 16:28:25 +02:00
SBiOSoftWhare
a27cae781c Update SwiftLint pod. 2019-06-19 16:16:30 +02:00
SBiOSoftWhare
74758f671a Use CocoaPods 1.7.1 and update Podfile.lock 2019-06-19 16:03:40 +02:00
SBiOSoftWhare
affaa9dfbd Update changes 2019-06-19 15:48:40 +02:00
SBiOSoftWhare
fd8aff46e8 Update Reusable pod 2019-06-19 15:46:58 +02:00
SBiOSoftWhare
892314498d Migrate project to Swift 5 2019-06-19 15:46:58 +02:00
Weblate
1d7e84a97a Merge branch 'origin/develop' into Weblate. 2019-06-19 13:44:05 +00:00
manuroe
8f5bf902b0
Merge pull request #2473 from dcordero/create_button_size 
Adjust size of the insert button in the People tab
 2019-06-19 15:44:00 +02:00
manuroe
c71abd5edc
Update CHANGES.rst 2019-06-19 15:43:42 +02:00
manuroe
f155f99374
Merge branch 'develop' into create_button_size 2019-06-19 15:42:40 +02:00
Weblate
c811a1132b Merge branch 'origin/develop' into Weblate. 2019-06-19 13:31:57 +00:00
manuroe
8010133d6c
Merge pull request #2159 from fridtjof/matomo-v6 
Rename PiwikTracker to MatomoTracker and update to version 6.0.1
 2019-06-19 15:31:53 +02:00
manuroe
3f55981cc3
Merge branch 'develop' into matomo-v6 2019-06-19 15:31:43 +02:00
Weblate
dea9c59930 Merge branch 'origin/develop' into Weblate. 2019-06-19 12:29:48 +00:00
SBiOSoftWhare
e53903214f
Merge pull request #2513 from vector-im/fix_RoomDataSource_additional_content_height 
RoomDataSource: Fix bubble cell data additional content height update
 2019-06-19 14:29:44 +02:00
SBiOSoftWhare
4e6c1c36af RoomDataSource: Fix bubble cell data additional content height update. 2019-06-19 14:22:38 +02:00
Weblate
f743f90973 Merge branch 'origin/develop' into Weblate. 2019-06-19 09:45:48 +00:00
SBiOSoftWhare
014bb35f52
Merge pull request #2505 from vector-im/fix_riot_attachmentview_reactions 
Fix reactions positioning for cells with attachment
 2019-06-19 11:45:44 +02:00
SBiOSoftWhare
2b28f25883 Merge develop into fix_riot_attachmentview_reactions 2019-06-19 11:44:42 +02:00
Weblate
cdc58de84d Merge branch 'origin/develop' into Weblate. 2019-06-19 09:25:05 +00:00
manuroe
e0dc912a0b
Merge pull request #2506 from vector-im/aggregation_and_readreceipts 
Read receipts: They are now counted at the MatrixKit level.
 2019-06-19 11:25:00 +02:00
Szimszon
95b55aca3f Translated using Weblate (Hungarian) 
Currently translated at 100.0% (711 of 711 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/hu/
 2019-06-18 18:29:07 +00:00
Michael Albert
f2149b57c3 Translated using Weblate (German) 
Currently translated at 96.2% (684 of 711 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/de/
 2019-06-18 18:29:06 +00:00
SBiOSoftWhare
8e50ff08c1 Fix bubble cell height for cells with attachment view and reactions. 2019-06-18 18:36:22 +02:00
SBiOSoftWhare
3295b649c9 RoomBubbleCellData: Add additionalContentHeight property to cache additional views height like reactions view and read receipts container. 2019-06-18 18:30:39 +02:00
SBiOSoftWhare
f33a0e9b7a MXKRoomBubbleTableViewCell: Add convenient method to compute bubble cell height for cell with attachment view. 2019-06-18 18:29:12 +02:00
SBiOSoftWhare
0809c8af55 RoomBubbleCellData: Fix bubble component position when display last message timestamp. 2019-06-18 17:42:00 +02:00
SBiOSoftWhare
c8bbf9fd00 MXKRoomBubbleTableViewCell: Improve timestamp label positioning. 2019-06-18 17:41:09 +02:00
manuroe
872976f798 Read receipts: Manage live update in the kit too 2019-06-18 14:06:23 +02:00
manuroe
ba6d5939a3 Read receipts: They are now counted at the MatrixKit level 2019-06-18 12:28:59 +02:00
SBiOSoftWhare
8aea88139e
Merge pull request #2471 from vector-im/fix_show_context_menu_interaction_when_animate 
RoomVC: Prevent user interaction in timeline while presenting context menu
 2019-06-18 11:49:44 +02:00
manuroe
854dc1633d
Merge pull request #2501 from RiotTranslateBot/weblate-riot-ios-riot-ios-push 
Update from Weblate
 2019-06-17 10:23:07 +02:00
Weblate
68a9c56725 Merge branch 'origin/develop' into Weblate. 2019-06-17 08:21:53 +00:00
manuroe
4e9ccaa875
Merge pull request #2500 from RiotTranslateBot/weblate-riot-ios-riot-ios-push 
Update from Weblate
 2019-06-17 10:21:50 +02:00