Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-10-01 16:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
6728 commits 46 branches 261 tags 144 MiB
Commit graph

6728 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
bf4b917692 Merge branch 'origin/develop' into Weblate. 2019-10-24 15:24:20 +00:00
manuroe
b76f18b16a
Merge pull request #2801 from vector-im/riot_2744 
Settings: Add User-Interactive Auth for adding email and msidsn to user's account
 2019-10-24 17:24:15 +02:00
manuroe
aac9ac03d7 Settings: Use a generic wording when authentication flow is not supported 2019-10-24 15:40:07 +02:00
manuroe
26cc34a62e Settings: Add User-Interactive Auth for adding email and msidsn to user's account 
vector-im/riot-ios#2744
 2019-10-24 11:17:59 +02:00
Weblate
d1c65ccbda Merge branch 'origin/develop' into Weblate. 2019-10-24 08:55:17 +00:00
SBiOSoftWhare
c656a56eba
Merge pull request #2799 from vector-im/riot_2504 
BF: selecting 'start verification' from a keyshare request wedges you in an entirely blank verification screen
 2019-10-24 10:55:12 +02:00
SBiOSoftWhare
378bdcd327 Update changes 2019-10-23 17:36:31 +02:00
SBiOSoftWhare
413b9563c0 Device verification: Improve navigation flow and view states handling. 2019-10-23 17:27:43 +02:00
SBiOSoftWhare
0a21d7a2af Update setRootModule method signature in NavigationRouterType protocol. 2019-10-23 17:27:43 +02:00
Weblate
8be1eaaf47 Merge branch 'origin/develop' into Weblate. 2019-10-23 15:25:45 +00:00
SBiOSoftWhare
5179622c7e
Merge pull request #2797 from vector-im/riot_2630 
BF: Emoji Picker: Background color is not white
 2019-10-23 17:25:40 +02:00
SBiOSoftWhare
d981d7b6ed Update changes 2019-10-22 18:56:39 +02:00
SBiOSoftWhare
82527c2a3f Emoji picker: Fix reverse header and background colors (Fix #2630). 2019-10-22 18:54:59 +02:00
Weblate
10a81f524b Merge branch 'origin/develop' into Weblate. 2019-10-22 10:18:28 +00:00
SBiOSoftWhare
7a82c137ed
Merge pull request #2795 from vector-im/fix_DTCoreText_pod 
CocoaPods: Fix DTCoreText app extension issue
 2019-10-22 12:18:24 +02:00
Weblate
ed633247f2 Merge branch 'origin/develop' into Weblate. 2019-10-22 10:18:06 +00:00
SBiOSoftWhare
b4890085bb
Merge pull request #2794 from vector-im/fix_tap_attachment_sent_failed_crash 
RoomVC: Fix crash occurring when tap on an unsent media with retrieved event equal to nil
 2019-10-22 12:18:02 +02:00
Weblate
bbca0e4111 Merge branch 'origin/develop' into Weblate. 2019-10-22 10:13:08 +00:00
SBiOSoftWhare
75226a3cd5 Gemfile: Update CocoaPods version to 1.8.x and perform a bundle update. 2019-10-22 12:12:57 +02:00
SBiOSoftWhare
7fb865ba00 CocoaPods: Fix DTCoreText app extension issue. 2019-10-22 12:04:41 +02:00
SBiOSoftWhare
876840f5ae Update changes 2019-10-22 11:51:07 +02:00
SBiOSoftWhare
57f2278d45 RoomViewController: Fix crash occurring when tap on an unsent media with retrieved event equal to nil. 2019-10-22 11:50:25 +02:00
Weblate
6a97d2e0be Merge branch 'origin/develop' into Weblate. 2019-10-22 09:22:47 +00:00
SBiOSoftWhare
d133f70440
Merge pull request #2792 from vector-im/fix_pasteboard_crash 
Pasteboard: Fix a crash when passing a nil object to UIPasteboard
 2019-10-22 11:22:43 +02:00
SBiOSoftWhare
733298ede8 RoomViewController: Add logs when copy text failed. 2019-10-22 10:55:28 +02:00
SBiOSoftWhare
745e48aee3 Update changes 2019-10-21 17:42:19 +02:00
SBiOSoftWhare
588168b342 RoomSettingsViewController: Fix a crash when setting a nil string on UIPasteboard. 2019-10-21 17:37:36 +02:00
SBiOSoftWhare
a5671878bb RoomViewController: Fix a crash when setting a nil string on UIPasteboard. 2019-10-21 17:36:58 +02:00
Weblate
59127cb16b Merge branch 'origin/develop' into Weblate. 2019-10-18 13:41:39 +00:00
SBiOSoftWhare
12c45adabf
Merge pull request #2789 from vector-im/riot_2788 
BF: Room cell: The states of direct chat and favorite buttons are reversed in the menu
 2019-10-18 15:41:33 +02:00
SBiOSoftWhare
a1c5d219bc Fix code formatting in RecentsViewController. 2019-10-18 15:38:01 +02:00
SBiOSoftWhare
23e96496a0 Update changes 2019-10-18 15:14:55 +02:00
SBiOSoftWhare
4b4f590323 Room cell: Fix states of direct chat and favorite buttons in the menu (Fix #2788). 2019-10-18 15:12:13 +02:00
Weblate
462cf2c265 Merge branch 'origin/develop' into Weblate. 2019-10-11 13:57:03 +00:00
manuroe
7552b426e6 Finish v0.10.0 2019-10-11 15:56:55 +02:00
manuroe
25aa432a79 Finish v0.10.0 2019-10-11 15:56:55 +02:00
manuroe
878750f163 version++ 2019-10-11 15:51:16 +02:00
Weblate
9bbcf7167c Merge branch 'origin/develop' into Weblate. 2019-10-11 12:31:41 +00:00
Riot Translate Bot
02ae76caed Update from Weblate (#2779) 2019-10-11 14:31:37 +02:00
Weblate
77d8291c47 Merge branch 'origin/develop' into Weblate. 2019-10-11 12:31:26 +00:00
Riot Translate Bot
db7500cbd7 Update from Weblate (#2778) 2019-10-11 14:31:22 +02:00
Weblate
1f65bd2185 Merge branch 'origin/develop' into Weblate. 2019-10-11 11:50:28 +00:00
manuroe
a2991a4473
Merge pull request #2765 from vector-im/limit_full_contacts_lookup 
ContactsDataSource: Do not use [MXKContactManager updateMatrixIDsForA…
 2019-10-11 13:50:24 +02:00
Weblate
3410c835b1 Merge branch 'origin/develop' into Weblate. 2019-10-11 08:08:41 +00:00
manuroe
50d2cc7736
Merge pull request #2767 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs 
Update from Weblate
 2019-10-11 10:08:37 +02:00
Weblate
5849699254 Merge branch 'origin/develop' into Weblate. 2019-10-11 08:08:21 +00:00
manuroe
ecb44bb4d7
Merge pull request #2768 from RiotTranslateBot/weblate-riot-ios-riot-ios-push 
Update from Weblate
 2019-10-11 10:08:17 +02:00
Weblate
3d82360970 Merge branch 'origin/develop' into Weblate. 2019-10-11 08:08:08 +00:00
manuroe
0df43dd6a7
Merge pull request #2766 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Update from Weblate
 2019-10-11 10:08:04 +02:00
송태섭
233629f24b Translated using Weblate (Korean) 
Currently translated at 100.0% (822 of 822 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ko/
 2019-10-11 08:06:08 +00:00