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

6850 commits

This branch
This branch
All branches
Author SHA1 Message Date
manuroe
a5bfec5389 Widgets: Fix bad i18n key 2019-11-22 14:49:35 +01:00
manuroe
8e7e26e7db
Merge pull request #2846 from vector-im/riot_2842 
Widgets: Check user permission before opening a widget (data part)
 2019-11-22 12:36:35 +01:00
manuroe
df7a692db5 Swift: NSURL -> URL 2019-11-22 12:20:57 +01:00
manuroe
304c224c07 Jitsi: Display room name, user name and user avatar in the conference screen 2019-11-22 12:04:28 +01:00
manuroe
10d5cd81d6 Widgets: Check user permission before opening a widget (data part) 
#2833
 2019-11-22 11:18:08 +01:00
manuroe
d0921a78af
Merge pull request #2844 from vector-im/riot_2843 
Settings: Add an option for disabling use of the integration manager
 2019-11-22 11:14:27 +01:00
manuroe
4f5afc7ef9 Widgets: Fix Steve's remarks 2019-11-21 17:19:39 +01:00
manuroe
30749b6ab5 CHANGES! 2019-11-21 16:58:13 +01:00
manuroe
3d4772c612 Widgets: Change copy a bit in contextual menu 2019-11-21 16:54:25 +01:00
manuroe
3296a7561f Widgets: Display an error if the IM is disabled 
#2843
 2019-11-21 16:36:08 +01:00
manuroe
98354f24aa Settings: Have a toggle for using an integration manager 
#2843
 2019-11-21 15:43:04 +01:00
manuroe
d19df2993e
Merge pull request #2840 from vector-im/riot_2832 
Widgets: Check user permission before opening a widget (Data side)
 2019-11-20 18:41:41 +01:00
manuroe
e5754a2b4d Widgets permission: Fix Steve's remarks 2019-11-20 18:41:18 +01:00
manuroe
50896e6d96 Widgets: Add "Remove for everyone" to the contextual menu 2019-11-20 17:38:12 +01:00
manuroe
5de5b3dec6 Widgets: Add a contextual menu to refresh, open outside and revoke the permission 
#2834
 2019-11-20 14:23:01 +01:00
manuroe
eca3ad7278 Widgets permission: Some cleaning 2019-11-20 11:13:47 +01:00
manuroe
d01ecca63c Widgets permission: No check required for the integration manager widget 2019-11-20 10:56:14 +01:00
manuroe
5ab4aa63b3 Widgets permission: No check required when the user is the creator 2019-11-20 10:55:06 +01:00
manuroe
1eece82936 Widgets: Check user permission before opening a widget (Data side) 
#2832
 2019-11-20 10:25:56 +01:00
manuroe
da4edefdaf SerializationService: Add deserialisation of Any with a dirty implementation of JSON dictionary parsing 2019-11-20 10:17:20 +01:00
manuroe
81a0aa5009 Merge tag 'v0.10.2' into develop 
Finish IntegrationsManagerTerms

# Conflicts:
#	CHANGES.rst
 2019-11-15 17:36:59 +01:00
manuroe
60ca076126 Finish IntegrationsManagerTerms 2019-11-15 17:35:38 +01:00
manuroe
d52f1e3fbe version++ 2019-11-15 17:31:24 +01:00
manuroe
46d8947255 Integrations: Fix terms consent display HTTP requests 2019-11-15 17:30:21 +01:00
manuroe
9a58cbccde Integrations: Fix terms consent display when they are required 
(cherry picked from commit 394aedbf5f)
 2019-11-15 16:39:27 +01:00
manuroe
8b0107ccb9 i18n: Add Welsh (cy) 2019-11-12 10:32:01 +01:00
Riot Translate Bot
3e5d1bba0c Update from Weblate (#2830) 
* Added translation using Weblate (Welsh)

* Translated using Weblate (Welsh)

Currently translated at 100.0% (28 of 28 strings)

Translation: Riot iOS/Riot iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/cy/
 2019-11-12 10:07:34 +01:00
manuroe
6cfd4b8f1d
Merge pull request #2829 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs 
Update from Weblate
 2019-11-12 10:07:06 +01:00
manuroe
a94ef6a0e4
Merge pull request #2828 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Update from Weblate
 2019-11-12 10:06:45 +01:00
Besnik Bleta
311a56b98f Translated using Weblate (Albanian) 
Currently translated at 97.2% (804 of 827 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/
 2019-11-11 18:44:50 +00:00
Elwyn Malethan
c67668634b Translated using Weblate (Welsh) 
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/cy/
 2019-11-10 14:44:57 +00:00
Elwyn Malethan
bda20c8d1a Translated using Weblate (Welsh) 
Currently translated at 100.0% (5 of 5 strings)

Translation: Riot iOS/Riot iOS (Dialogs)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-dialogs/cy/
 2019-11-10 14:44:42 +00:00
Elwyn Malethan
fee82227d9 Added translation using Weblate (Welsh) 2019-11-09 14:01:30 +00:00
Weblate
730e56251e Merge branch 'origin/develop' into Weblate. 2019-11-08 10:54:22 +00:00
Weblate
b03971b080 Merge branch 'origin/develop' into Weblate. 2019-11-08 10:54:22 +00:00
SBiOSoftWhare
9ce5d15b60 version++ 2019-11-08 11:54:11 +01:00
Weblate
a68504ccda Merge branch 'origin/develop' into Weblate. 2019-11-08 10:45:22 +00:00
Weblate
2a9a6ed9b0 Merge branch 'origin/develop' into Weblate. 2019-11-08 10:45:22 +00:00
SBiOSoftWhare
af258c71d9
Merge pull request #2825 from vector-im/update_matomo 
Update MatomoTracker pod to 7.2.0
 2019-11-08 11:45:17 +01:00
SBiOSoftWhare
efc6f30719 Update MatomoTracker pod to 7.2.0. 2019-11-08 11:24:03 +01:00
SBiOSoftWhare
4600607fac Project: For each target use "$(inherited)" value for ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES build setting. 2019-11-08 11:21:13 +01:00
Weblate
09d1daf38a Merge branch 'origin/develop' into Weblate. 2019-11-08 09:34:50 +00:00
Weblate
a37ca88690 Merge branch 'origin/develop' into Weblate. 2019-11-08 09:34:50 +00:00
manuroe
f6086a229d
Merge pull request #2823 from vector-im/riot_2815 
Integrations: Use the integrations manager provided by the homeserver admin
 2019-11-08 10:34:43 +01:00
manuroe
b858b21788
Merge branch 'develop' into riot_2815 2019-11-08 10:34:13 +01:00
Slavi Pantaleev
15dd0d07a9 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/bg/
 2019-11-08 08:44:39 +00:00
manuroe
237d533492 Integrations: Use the integrations manager provided by the homeserver admin via .well-known 
#2815
 2019-11-07 18:46:50 +01:00
manuroe
394aedbf5f Integrations: Fix terms consent display when they are required 2019-11-07 18:25:11 +01:00
Weblate
496e9ed4ff Merge branch 'origin/develop' into Weblate. 2019-11-07 10:29:37 +00:00
SBiOSoftWhare
2b506d68f3 Merge branch 'release/v0.10.1' 2019-11-07 11:29:28 +01:00