Commit Graph

6832 Commits

Author SHA1 Message Date
SBiOSoftWhare eb350ec12b Add convenient method to UIButton to set a background color as an image. 2019-11-28 12:42:19 +01:00
SBiOSoftWhare d5e3171849 Add convenient clamped method to FloatingPoint. 2019-11-28 12:41:18 +01:00
SBiOSoftWhare fe1dab1cf4 Room Widget Permission: Add strings. 2019-11-28 12:40:02 +01:00
SBiOSoftWhare 54045c1c60 Room Widget Permission: Add close button assets. 2019-11-28 12:39:20 +01:00
manuroe a5b1b2c15e Widgets: Fix bad i18n key 2019-11-22 14:49:35 +01:00
manuroe 7decad94d2 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 f7171cf629 Swift: NSURL -> URL 2019-11-22 12:20:57 +01:00
manuroe bb48311ed0 Jitsi: Display room name, user name and user avatar in the conference screen 2019-11-22 12:04:28 +01:00
manuroe 531cb4b54c Widgets: Check user permission before opening a widget (data part)
#2833
2019-11-22 11:18:08 +01:00
manuroe 19e28bb328 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 1dab54a820 Widgets: Fix Steve's remarks 2019-11-21 17:19:39 +01:00
manuroe 33367a2d0b CHANGES! 2019-11-21 16:58:13 +01:00
manuroe b191c16b80 Widgets: Change copy a bit in contextual menu 2019-11-21 16:54:25 +01:00
manuroe 49f841bdb2 Widgets: Display an error if the IM is disabled
#2843
2019-11-21 16:36:08 +01:00
manuroe 4e05188ac0 Settings: Have a toggle for using an integration manager
#2843
2019-11-21 15:43:04 +01:00
manuroe eb020a49f8 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 47494f8fe3 Widgets permission: Fix Steve's remarks 2019-11-20 18:41:18 +01:00
manuroe ea6437c521 Widgets: Add "Remove for everyone" to the contextual menu 2019-11-20 17:38:12 +01:00
manuroe e7fcaa197a Widgets: Add a contextual menu to refresh, open outside and revoke the permission
#2834
2019-11-20 14:23:01 +01:00
manuroe 3a0200bf77 Widgets permission: Some cleaning 2019-11-20 11:13:47 +01:00
manuroe 8751540cbc Widgets permission: No check required for the integration manager widget 2019-11-20 10:56:14 +01:00
manuroe 95eea07230 Widgets permission: No check required when the user is the creator 2019-11-20 10:55:06 +01:00
manuroe 678485affe Widgets: Check user permission before opening a widget (Data side)
#2832
2019-11-20 10:25:56 +01:00
manuroe f737e1d164 SerializationService: Add deserialisation of Any with a dirty implementation of JSON dictionary parsing 2019-11-20 10:17:20 +01:00
manuroe 1c0f409029 Merge tag 'v0.10.2' into develop
Finish IntegrationsManagerTerms

# Conflicts:
#	CHANGES.rst
2019-11-15 17:36:59 +01:00
manuroe dcd0d9595e Finish IntegrationsManagerTerms 2019-11-15 17:35:38 +01:00
manuroe b7d32baf8a version++ 2019-11-15 17:31:24 +01:00
manuroe 0b6fe60ae9 Integrations: Fix terms consent display HTTP requests 2019-11-15 17:30:21 +01:00
manuroe 8986bf00c3 Integrations: Fix terms consent display when they are required
(cherry picked from commit c966b163f632beddd25816d8d16c599416b956e1)
2019-11-15 16:39:27 +01:00
manuroe 26915954d2 i18n: Add Welsh (cy) 2019-11-12 10:32:01 +01:00
Riot Translate Bot 7e5c4fb90d 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 81329e7c77 Merge pull request #2829 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate
2019-11-12 10:07:06 +01:00
manuroe 77af325af9 Merge pull request #2828 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate
2019-11-12 10:06:45 +01:00
Besnik Bleta d81c86582d 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 c46352b44b 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 e7c9f95be8 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 6f9fded0ba Added translation using Weblate (Welsh) 2019-11-09 14:01:30 +00:00
Weblate 495082c5a9 Merge branch 'origin/develop' into Weblate. 2019-11-08 10:54:22 +00:00
Weblate e638ba4a47 Merge branch 'origin/develop' into Weblate. 2019-11-08 10:54:22 +00:00
SBiOSoftWhare 835b01a85f version++ 2019-11-08 11:54:11 +01:00
Weblate 4f728a4d01 Merge branch 'origin/develop' into Weblate. 2019-11-08 10:45:22 +00:00
Weblate 91ff13fbbe Merge branch 'origin/develop' into Weblate. 2019-11-08 10:45:22 +00:00
SBiOSoftWhare 0d16a421b7 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 b6ee095d81 Update MatomoTracker pod to 7.2.0. 2019-11-08 11:24:03 +01:00
SBiOSoftWhare e7f6aaaaea Project: For each target use "$(inherited)" value for ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES build setting. 2019-11-08 11:21:13 +01:00
Weblate 5abefccc0a Merge branch 'origin/develop' into Weblate. 2019-11-08 09:34:50 +00:00
Weblate 49003112f6 Merge branch 'origin/develop' into Weblate. 2019-11-08 09:34:50 +00:00
manuroe de9faae57a 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 7bf9b7a3c6 Merge branch 'develop' into riot_2815 2019-11-08 10:34:13 +01:00
Slavi Pantaleev 1cbeddfd75 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