felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-06 07:57:42 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,966 Commits 1 Branch 67 Tags
28f49a7619a956fd5ca726d149867749faf217ef
Commit Graph

11966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
manuroe 28f49a7619 Merge branch 'master' into develop 2021-08-11 15:21:08 +02:00
manuroe ce285ad5d9 Merge branch 'release/1.5.0/master' 2021-08-11 15:21:04 +02:00
manuroe 3670aa12fd finish version++ 2021-08-11 15:21:04 +02:00
manuroe fe821e124d Merge pull request #4694 from vector-im/release/1.5.0/release 
Release 1.5.0
 2021-08-11 15:20:26 +02:00
manuroe cf2eacdb88 version++ 2021-08-11 14:48:25 +02:00
manuroe 04da929924 Merge pull request #4692 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs 
Translations update from Weblate
 2021-08-11 12:36:39 +02:00
manuroe c2def8059c Merge pull request #4691 from RiotTranslateBot/weblate-riot-ios-riot-ios-push 
Translations update from Weblate
 2021-08-11 12:36:09 +02:00
manuroe bafe6aef93 Merge pull request #4690 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Translations update from Weblate
 2021-08-11 12:35:39 +02:00
Weblate cb04f906c1 Merge branch 'origin/develop' into Weblate. 2021-08-11 10:25:58 +00:00
Weblate 13b206c1f7 Merge branch 'origin/develop' into Weblate. 2021-08-11 10:25:53 +00:00
Weblate afb109606c Merge branch 'origin/develop' into Weblate. 2021-08-11 10:22:48 +00:00
Doug de3521b4c9 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 bdc61706f0 Merge pull request #4684 from HonkXL/develop 
fixed typo "adress" - fixes issue #4480
 2021-08-11 12:21:32 +02:00
manuroe 39758b1fc3 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 47d2934de8 changelog 2021-08-11 11:47:39 +02:00
manuroe 24e9d04d03 Make Towncrier compatible with the release script 2021-08-11 11:45:01 +02:00
Doug c796bba42f 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 b27c04d931 Create 4480.bugfix 2021-08-10 11:52:16 +02:00
Doug bb237cc554 Rename pr_4681.misc to 4677.misc 2021-08-10 10:27:12 +01:00
Linerly 1361e816ab 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 cfe9e674c1 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 17c23531fe 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 11a9c395f0 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 6737d59694 Add changelog entry. 2021-08-10 10:19:36 +01:00
Doug fb78e290e6 Merge branch 'develop' into doug/4609_support_functional_members 
# Conflicts:
#	CHANGES.md
 2021-08-10 10:18:15 +01:00
Doug 4293ad4022 Add changelog entry. 2021-08-10 09:44:42 +01:00
Doug 18635b0277 Merge branch 'develop' into doug/4677_fix_contacts_warnings 2021-08-10 09:41:57 +01:00
Doug 6a7b99efd7 Revert "Updated CHANGES.rst" 
This reverts commit e40978da44.
 2021-08-10 09:41:35 +01:00
Thomas Weiland 9321a77ab6 fixed typo "adress" issue #4480 2021-08-10 10:20:35 +02:00
LinAGKar da3c848233 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 f6fc2c04c3 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 34294b7010 Merge pull request #4683 from vector-im/manu/4393_towncrier 
Enable Towncrier
 2021-08-09 18:38:01 +02:00
manuroe 69f026928c Merge remote-tracking branch 'origin/develop' into manu/4393_towncrier 2021-08-09 18:09:58 +02:00
manuroe 3119564200 Merge remote-tracking branch 'origin/develop' into manu/4393_towncrier 2021-08-09 18:06:09 +02:00
ismailgulek 5124e02333 Merge pull request #4645 from vector-im/element_4362 
Stable ids for MSC 2858
 2021-08-09 18:48:34 +03:00
manuroe 273826b169 PULL_REQUEST_TEMPLATE: Use a true hyperlink for changelog 2021-08-09 17:35:30 +02:00
manuroe 1808a2c446 Xcodegen: Use CHANGES.md 2021-08-09 17:22:54 +02:00
manuroe 996a09a41c Towncrier: Create changelog files for current changes 2021-08-09 17:21:18 +02:00
ismailgulek 8ff0c44c38 Merge remote-tracking branch 'origin/element_4362' into element_4362 2021-08-09 18:09:54 +03:00
ismailgulek 4b79959fd1 Merge branch 'develop' into element_4362 2021-08-09 18:09:45 +03:00
ismailgulek ba83da8f64 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 588a10b9e7 Add missing Weakify/Strongify. 2021-08-09 15:59:46 +01:00
Doug e40978da44 Updated CHANGES.rst 2021-08-09 15:49:11 +01:00
Doug 9821276763 Fix warnings: Block implicitly retains 'self' 2021-08-09 15:45:59 +01:00
manuroe a0fc4a98f5 Convert CHANGES to MarkDown 2021-08-09 16:24:14 +02:00
manuroe b27203d1f9 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 a79a410494 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 e2cf4e28d7 Merge branch 'develop' into doug/4609_support_functional_members 
# Conflicts:
#	CHANGES.rst
 2021-08-09 10:20:08 +01:00
Doug cc4092c08a Add explanation. 2021-08-09 10:19:00 +01:00
SBiOSoftWhare 67085a2883 Merge develop into steve/add_setup_project_script 2021-08-09 10:48:20 +02:00