Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 16:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity
6085 commits 46 branches 261 tags 144 MiB
Commit graph

6085 commits

This branch
This branch
All branches
Author SHA1 Message Date
manuroe
90784d13a0
Merge pull request #2438 from dcordero/verification_id_labels_fix 
Verification id labels fix
 2019-05-23 17:57:49 +02:00
Weblate
1fe8346c75 Merge branch 'origin/develop' into Weblate. 2019-05-23 15:57:20 +00:00
Weblate
bf03c15126 Merge branch 'origin/develop' into Weblate. 2019-05-23 15:57:20 +00:00
Weblate
58331502bb Merge branch 'origin/develop' into Weblate. 2019-05-23 15:57:20 +00:00
SBiOSoftWhare
7e11f923c0
Merge pull request #2468 from vector-im/riot_2466 
Context menu polish
 2019-05-23 17:57:17 +02:00
SBiOSoftWhare
2252561088 Update changes 2019-05-23 17:50:59 +02:00
SBiOSoftWhare
31feca6f17 Room contextual menu: Update button titles color and disabled opacity. 2019-05-23 17:48:52 +02:00
Weblate
3e075f258c Merge branch 'origin/develop' into Weblate. 2019-05-23 15:44:18 +00:00
Kévin C
b3d9785de5 Translated using Weblate (French) 
Currently translated at 100.0% (710 of 710 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
 2019-05-23 15:44:18 +00:00
Weblate
334df2d023 Merge branch 'origin/develop' into Weblate. 2019-05-23 15:44:14 +00:00
Weblate
c5c19a19b8 Merge branch 'origin/develop' into Weblate. 2019-05-23 15:44:14 +00:00
Victor Grousset
a2352c7817 Translated using Weblate (Esperanto) 
Currently translated at 2.4% (17 of 710 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/eo/
 2019-05-23 15:44:14 +00:00
SBiOSoftWhare
5eb5a8eb70
Merge pull request #2467 from vector-im/riot_2417 
BF: Registration with an email is broken
 2019-05-23 17:44:10 +02:00
SBiOSoftWhare
cc188209a7 Update changes 2019-05-23 16:49:13 +02:00
SBiOSoftWhare
f14cbf759e Registration: Fix infinite loop when register with email and validate from mobile. 2019-05-23 16:46:00 +02:00
Weblate
540589ae57 Merge branch 'origin/develop' into Weblate. 2019-05-22 21:09:43 +00:00
Weblate
0c064d78df Merge branch 'origin/develop' into Weblate. 2019-05-22 21:09:43 +00:00
Weblate
f8a9a0bbfd Merge branch 'origin/develop' into Weblate. 2019-05-22 21:09:43 +00:00
SBiOSoftWhare
28ec193011
Merge pull request #2465 from vector-im/riot_2447 
Reactions Menu: Fix position
 2019-05-22 23:09:39 +02:00
David Cordero
627291529b Merge branch 'develop' into verification_id_labels_fix 2019-05-22 19:10:35 +02:00
SBiOSoftWhare
4edf817a5d Update changes 2019-05-22 18:49:35 +02:00
SBiOSoftWhare
366d27ebab Contextual menu: Improve reactions menu position. 2019-05-22 18:48:50 +02:00
SBiOSoftWhare
4cb166072a MXKRoomBubbleTableViewCell: Add convenient method to calculate a bubble component frame in table view. 2019-05-22 18:46:22 +02:00
Weblate
2426c2eb67 Merge branch 'origin/develop' into Weblate. 2019-05-22 15:41:22 +00:00
Weblate
892ccbde5a Merge branch 'origin/develop' into Weblate. 2019-05-22 15:41:22 +00:00
Weblate
d2b7a3efd2 Merge branch 'origin/develop' into Weblate. 2019-05-22 15:41:22 +00:00
SBiOSoftWhare
09991e53c7
Merge pull request #2464 from vector-im/riot_2446 
BF: Menu actions: Display message time
 2019-05-22 17:41:18 +02:00
Weblate
a7caa73d88 Merge branch 'origin/develop' into Weblate. 2019-05-22 15:31:34 +00:00
Weblate
67e219128e Merge branch 'origin/develop' into Weblate. 2019-05-22 15:31:34 +00:00
Weblate
7c94eca302 Merge branch 'origin/develop' into Weblate. 2019-05-22 15:31:34 +00:00
SBiOSoftWhare
f1bb0ba8a0
Merge pull request #2463 from vector-im/riot_2446 
Menu actions: Display message time
 2019-05-22 17:31:30 +02:00
SBiOSoftWhare
4e1e95fd2c
Update Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m 
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
 2019-05-22 17:28:08 +02:00
SBiOSoftWhare
a62548c545
Update Riot/Modules/Room/CellData/RoomBubbleCellData.h 
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
 2019-05-22 17:27:29 +02:00
SBiOSoftWhare
0fb13febee RoomVC: Display message time when contextual menu is shown. 2019-05-22 16:54:51 +02:00
Weblate
a1b0d087f3 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:47:56 +00:00
Weblate
36adee293e Merge branch 'origin/develop' into Weblate. 2019-05-22 14:47:56 +00:00
Weblate
8f186afb56 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:47:56 +00:00
manuroe
48beed140a
Merge pull request #2425 from vector-im/giomfo/third_party_licenses 
Update third-party licences
 2019-05-22 16:47:53 +02:00
Weblate
88ac8ae258 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:46:20 +00:00
Weblate
34bf4bd25e Merge branch 'origin/develop' into Weblate. 2019-05-22 14:46:20 +00:00
Weblate
8bd458bda5 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:46:20 +00:00
manuroe
50cc260010
Merge pull request #2432 from RiotTranslateBot/weblate-riot-ios-riot-ios-push 
Update from Weblate
 2019-05-22 16:46:16 +02:00
Weblate
f58fcd969c Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:45 +00:00
Weblate
95a1fbeaa2 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:45 +00:00
Weblate
97e2931bb4 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:44 +00:00
manuroe
3d671feb07
Merge pull request #2431 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs 
Update from Weblate
 2019-05-22 16:45:40 +02:00
Weblate
e3bc624135 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:15 +00:00
Weblate
a2ce59961a Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:15 +00:00
Weblate
b62f59fff4 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:15 +00:00
manuroe
e594155fe5
Merge pull request #2426 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Update from Weblate
 2019-05-22 16:45:11 +02:00