Commit graph

12253 commits

Author SHA1 Message Date
manuroe
3605b69be0
Merge pull request #4690 from RiotTranslateBot/weblate-riot-ios-riot-ios
Translations update from Weblate
2021-08-11 12:35:39 +02:00
Weblate
9c10038aa7 Merge branch 'origin/develop' into Weblate. 2021-08-11 10:25:58 +00:00
Weblate
560009b90d Merge branch 'origin/develop' into Weblate. 2021-08-11 10:25:53 +00:00
Weblate
f910f4c2f6 Merge branch 'origin/develop' into Weblate. 2021-08-11 10:22:48 +00:00
Doug
c0f0a115e1
Merge pull request #4643 from vector-im/doug/4609_support_functional_members
Add support for functional members
2021-08-11 11:21:57 +01:00
manuroe
2276fc8fc9
Merge pull request #4684 from HonkXL/develop
fixed typo "adress" - fixes issue #4480
2021-08-11 12:21:32 +02:00
manuroe
058d4ea2ff
Merge pull request #4689 from vector-im/manu/4393_towncrier_release_script
Make Towncrier compatible with the release script
2021-08-11 12:07:28 +02:00
manuroe
3414460414 changelog 2021-08-11 11:47:39 +02:00
manuroe
db3a6b490a Make Towncrier compatible with the release script 2021-08-11 11:45:01 +02:00
Doug
4b3e6e3682
Merge pull request #4681 from vector-im/doug/4677_fix_contacts_warnings
Fix warnings in Contacts module
2021-08-10 11:04:24 +01:00
Thomas Weiland
01bd464191
Create 4480.bugfix 2021-08-10 11:52:16 +02:00
Doug
dfa4c90f35 Fix localisation key. 2021-08-10 10:45:33 +01:00
Doug
4a26465ee3 Add changelog entries. 2021-08-10 10:31:34 +01:00
Doug
538429eca1 Merge branch 'develop' into doug/4132_improve_notification_content 2021-08-10 10:28:40 +01:00
Doug
0acbb6481e Revert "Update CHANGES.rst."
This reverts commit ee059e2ddf.
2021-08-10 10:28:30 +01:00
Doug
8ba8750ae7
Rename pr_4681.misc to 4677.misc 2021-08-10 10:27:12 +01:00
Linerly
e774f8b5f9 Translated using Weblate (Indonesian)
Currently translated at 7.5% (94 of 1251 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/id/
2021-08-10 09:25:18 +00:00
random
8ca97d904c Translated using Weblate (Italian)
Currently translated at 100.0% (1251 of 1251 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/it/
2021-08-10 09:25:15 +00:00
artevaeckt
2a7ab5fca9 Translated using Weblate (German)
Currently translated at 99.2% (1242 of 1251 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
2021-08-10 09:25:15 +00:00
jelv
5b6dc0e4cb Translated using Weblate (Dutch)
Currently translated at 100.0% (1251 of 1251 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/nl/
2021-08-10 09:25:14 +00:00
Doug
d22b422f62 Add changelog entry. 2021-08-10 10:19:36 +01:00
Doug
92aaf3d43e Merge branch 'develop' into doug/4609_support_functional_members
# Conflicts:
#	CHANGES.md
2021-08-10 10:18:15 +01:00
Doug
f3adec06cf Add changelog entry. 2021-08-10 09:44:42 +01:00
Doug
41d156e948 Merge branch 'develop' into doug/4677_fix_contacts_warnings 2021-08-10 09:41:57 +01:00
Doug
84336e649c Revert "Updated CHANGES.rst"
This reverts commit d0bf0ca1fb.
2021-08-10 09:41:35 +01:00
Thomas Weiland
4d21e36d9c
fixed typo "adress" issue #4480 2021-08-10 10:20:35 +02:00
LinAGKar
1f86484ab9 Translated using Weblate (Swedish)
Currently translated at 100.0% (6 of 6 strings)

Translation: Element iOS/Element iOS (Dialogs)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-dialogs/sv/
2021-08-10 07:25:14 +00:00
artevaeckt
c4d1036d2b Translated using Weblate (German)
Currently translated at 100.0% (6 of 6 strings)

Translation: Element iOS/Element iOS (Dialogs)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-dialogs/de/
2021-08-10 07:25:14 +00:00
manuroe
7ad7ae9d59
Merge pull request #4683 from vector-im/manu/4393_towncrier
Enable Towncrier
2021-08-09 18:38:01 +02:00
manuroe
fb4c5da682 Merge remote-tracking branch 'origin/develop' into manu/4393_towncrier 2021-08-09 18:09:58 +02:00
manuroe
3a771dd700 Merge remote-tracking branch 'origin/develop' into manu/4393_towncrier 2021-08-09 18:06:09 +02:00
ismailgulek
07f5996c3b
Merge pull request #4645 from vector-im/element_4362
Stable ids for MSC 2858
2021-08-09 18:48:34 +03:00
manuroe
864e89b276 PULL_REQUEST_TEMPLATE: Use a true hyperlink for changelog 2021-08-09 17:35:30 +02:00
manuroe
3dd53addde Xcodegen: Use CHANGES.md 2021-08-09 17:22:54 +02:00
manuroe
637bb7d279 Towncrier: Create changelog files for current changes 2021-08-09 17:21:18 +02:00
ismailgulek
c3019b4cb4
Merge remote-tracking branch 'origin/element_4362' into element_4362 2021-08-09 18:09:54 +03:00
ismailgulek
9a62d5d231
Merge branch 'develop' into element_4362 2021-08-09 18:09:45 +03:00
ismailgulek
0585ffe8d1
Update Riot/Modules/Authentication/SSO/SSOURLConstants.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2021-08-09 18:06:08 +03:00
Doug
5303fcc894 Add missing Weakify/Strongify. 2021-08-09 15:59:46 +01:00
Doug
d0bf0ca1fb Updated CHANGES.rst 2021-08-09 15:49:11 +01:00
Doug
9b94fe9ab8 Fix warnings: Block implicitly retains 'self' 2021-08-09 15:45:59 +01:00
SBiOSoftWhare
f002b3f9e8 App variants: Update script in order to use only on command to merge variant into project folder. 2021-08-09 16:33:11 +02:00
SBiOSoftWhare
27d56cfa56 App variants: Use same folder tree to make merge easier. 2021-08-09 16:29:42 +02:00
manuroe
d8b1b1b900 Convert CHANGES to MarkDown 2021-08-09 16:24:14 +02:00
manuroe
68fa523fc1 CHANGES.md: Use towncrier to manage the change log
vector-im/element-ios#4393

More info in [CONTRIBUTING](CONTRIBUTING.md#changelog)
2021-08-09 16:06:24 +02:00
SBiOSoftWhare
2815ef74ab
Merge pull request #4596 from vector-im/steve/add_setup_project_script
Tools: Add a script to initialize quickly and easily the project
2021-08-09 11:32:46 +02:00
Doug
64758a98bb Merge branch 'develop' into doug/4609_support_functional_members
# Conflicts:
#	CHANGES.rst
2021-08-09 10:20:08 +01:00
Doug
e030126405 Add explanation. 2021-08-09 10:19:00 +01:00
SBiOSoftWhare
2d3a9122d4 Merge develop into steve/add_setup_project_script 2021-08-09 10:48:20 +02:00
SBiOSoftWhare
d9cad24e46
Update INSTALL.md
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-09 10:29:55 +02:00