Commit Graph

15987 Commits

Author SHA1 Message Date
Doug bf9bab8928 Merge branch 'develop' into doug/4609_support_functional_members
# Conflicts:
#	CHANGES.md
2021-08-10 10:18:15 +01:00
Doug 98fa4eca00 Add changelog entry. 2021-08-10 09:44:42 +01:00
Doug c6170e6efa Merge branch 'develop' into doug/4677_fix_contacts_warnings 2021-08-10 09:41:57 +01:00
Doug d5a8dfe26d Revert "Updated CHANGES.rst"
This reverts commit d0bf0ca1fba38722d12565928a759543578dd85c.
2021-08-10 09:41:35 +01:00
Thomas Weiland f5b06198cd fixed typo "adress" issue #4480 2021-08-10 10:20:35 +02:00
LinAGKar e988041db7 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 5f478990e2 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 903c8f3a01 Merge pull request #4683 from vector-im/manu/4393_towncrier
Enable Towncrier
2021-08-09 18:38:01 +02:00
manuroe 6b673056c5 Merge remote-tracking branch 'origin/develop' into manu/4393_towncrier 2021-08-09 18:09:58 +02:00
manuroe 4ea6873ac8 Merge remote-tracking branch 'origin/develop' into manu/4393_towncrier 2021-08-09 18:06:09 +02:00
ismailgulek cabfe64214 Merge pull request #4645 from vector-im/element_4362
Stable ids for MSC 2858
2021-08-09 18:48:34 +03:00
manuroe 93c7a2afbb PULL_REQUEST_TEMPLATE: Use a true hyperlink for changelog 2021-08-09 17:35:30 +02:00
manuroe e443c04ce6 Xcodegen: Use CHANGES.md 2021-08-09 17:22:54 +02:00
manuroe 47993a3529 Towncrier: Create changelog files for current changes 2021-08-09 17:21:18 +02:00
ismailgulek c76aa7f595 Merge remote-tracking branch 'origin/element_4362' into element_4362 2021-08-09 18:09:54 +03:00
ismailgulek 0d63496ec6 Merge branch 'develop' into element_4362 2021-08-09 18:09:45 +03:00
ismailgulek 6aae1c0408 Update Riot/Modules/Authentication/SSO/SSOURLConstants.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2021-08-09 18:06:08 +03:00
Gil Eluard 16d951072b [Spaces] M10.7 Explore rooms #4571
- Added suggested tag to the explore rooms cell
- Implemented join feature
2021-08-09 17:05:36 +02:00
Doug 1ae2559e25 Add missing Weakify/Strongify. 2021-08-09 15:59:46 +01:00
Doug 6bd8b55fe7 Updated CHANGES.rst 2021-08-09 15:49:11 +01:00
Doug 5ec7f4cd61 Fix warnings: Block implicitly retains 'self' 2021-08-09 15:45:59 +01:00
SBiOSoftWhare acbcd24ab2 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 0fbdf24c4c App variants: Use same folder tree to make merge easier. 2021-08-09 16:29:42 +02:00
manuroe a6a77226b3 Convert CHANGES to MarkDown 2021-08-09 16:24:14 +02:00
Doug 652a0e29fb Hide local contacts in Unified Search. 2021-08-09 15:08:05 +01:00
manuroe 0a7af23bd7 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
Doug 0f87da3d53 Replace hasLocalContacts with showLocalContacts.
Update the value of showLocalContacts in ContactsTableViewController.
2021-08-09 12:58:18 +01:00
Doug aa2f8d4d96 Fix image name. 2021-08-09 12:22:56 +01:00
SBiOSoftWhare bcb3fa99a5 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 34d8cf24fe Merge branch 'develop' into doug/4609_support_functional_members
# Conflicts:
#	CHANGES.rst
2021-08-09 10:20:08 +01:00
Doug 670624055e Add explanation. 2021-08-09 10:19:00 +01:00
SBiOSoftWhare 50ee54803d Merge develop into steve/add_setup_project_script 2021-08-09 10:48:20 +02:00
SBiOSoftWhare 2f88cfb35d Update INSTALL.md
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-08-09 10:29:55 +02:00
Priit Jõerüüt 92558ea006 Translated using Weblate (Estonian)
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/et/
2021-08-07 09:25:24 +00:00
lvre 0b69ae95a5 Translated using Weblate (Portuguese (Brazil))
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/pt_BR/
2021-08-07 09:25:22 +00:00
Besnik Bleta 56b6c261c5 Translated using Weblate (Albanian)
Currently translated at 99.6% (1247 of 1251 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sq/
2021-08-07 09:25:22 +00:00
Szimszon 497d7587a8 Translated using Weblate (Hungarian)
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/hu/
2021-08-07 09:25:20 +00:00
Nikita Epifanov 382063f643 Translated using Weblate (Russian)
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/ru/
2021-08-07 09:25:20 +00:00
sr093906 544fc04bbf Translated using Weblate (Chinese (Simplified))
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/zh_Hans/
2021-08-07 09:25:15 +00:00
jelv edb9b333b5 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-07 09:25:14 +00:00
Doug 12606a4267 Merge pull request #4674 from vector-im/doug/update_building_instructions
Add reference to AppIdentifiers.xcconfig in INSTALL.md
2021-08-06 16:08:47 +01:00
ismailgulek 19152a5e35 Merge pull request #4673 from vector-im/ismail/4642_additions
Additional fixes for Call Tiles
2021-08-06 17:25:16 +03:00
Doug 8f0ada6ce8 Update CHANGES.rst 2021-08-06 15:20:12 +01:00
Doug 3fc18d50b2 Update INSTALL.md
Add references to AppIdentifiers.xcconfig.
2021-08-06 15:18:11 +01:00
Gil Eluard be867d0598 [Spaces] M10.7 Explore rooms #4571
- Added an room detail screen
2021-08-06 15:51:51 +02:00
ismailgulek 90fff2696f Merge branch 'develop' into ismail/4642_additions 2021-08-06 16:22:38 +03:00
ismailgulek 4fd5f8780a Update CHANGES.rst 2021-08-06 16:21:24 +03:00
ismailgulek f85d8c6db2 Use new strings for ended calls 2021-08-06 16:20:10 +03:00
ismailgulek 96c1615055 New strings 2021-08-06 16:19:53 +03:00
Doug d91c3cefa1 Merge pull request #4672 from vector-im/doug/4520_remove_dm_avatar_border
Remove the green border from DM avatars.
2021-08-06 14:00:47 +01:00