Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-10-02 01:02:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
9089 commits 46 branches 261 tags 144 MiB
Commit graph

9089 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ismail Gulek
35aba15053 Revert undecided urls 2020-07-03 17:10:08 +03:00
Ismail Gulek
b6d7d681ff Merge branch 'rebranding' into 8-update-strings-localizations 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
 2020-07-03 17:08:21 +03:00
Ismail Gulek
9c824c07fc Merge branch '14-update-legal-pages-urls-copyright-tac-t-c' into 'rebranding' 
Resolve "Update legal pages URLs (copyright, TAC, T&C)"

See merge request new-vector/element/element-ios!9
 2020-07-03 14:05:06 +00:00
Ismail Gulek
c1d88113bc Remove urls only from English 2020-07-03 17:00:50 +03:00
Ismail Gulek
0b566b725c Revert "Remove url strings" 
This reverts commit e475db360a.
 2020-07-03 16:59:26 +03:00
Ismail Gulek
8b74434806 Update app version to 1.0.0 2020-07-03 16:44:50 +03:00
Ismail Gulek
603c259db5 Merge branch 'rebranding' into 14-update-legal-pages-urls-copyright-tac-t-c 2020-07-03 16:41:23 +03:00
Ismail Gulek
34cc43edbb Read urls from defaults 2020-07-03 16:38:14 +03:00
Ismail Gulek
e475db360a Remove url strings 2020-07-03 16:38:01 +03:00
Ismail Gulek
74b8740189 Include copyright, privacy, termsConditions urls to plist 2020-07-03 16:36:12 +03:00
Ismail Gulek
ee29961b9d Merge branch 'rebranding' into 11-update-universal-links 2020-07-03 15:16:13 +03:00
Ismail Gulek
caae830fec Merge branch 'rebranding' into 8-update-strings-localizations 2020-07-03 15:16:01 +03:00
Ismail Gulek
5bc785dd19 Merge branch 'rebranding' into 15-code-refactoring-constants 2020-07-03 15:15:23 +03:00
Ismail Gulek
66896741e5 Replace beta with staging 2020-07-03 15:12:18 +03:00
ismailgulek
f799dddc42
Update CHANGES.rst 2020-07-03 14:25:00 +03:00
ismailgulek
e358ee3fa0
Show confirmation alert if given and visible urls different, when tapped a link in a message cell, fixes #3137 2020-07-03 14:23:44 +03:00
ismailgulek
5085c29a32
Add strings for confirmation alert 2020-07-03 14:22:45 +03:00
ismailgulek
1501fb22f2
Introduce FormattedBodyParser 2020-07-03 14:22:08 +03:00
Weblate
844ed66d1a Merge branch 'origin/develop' into Weblate. 2020-07-03 10:23:08 +00:00
Szimszon
d44b41b486 Translated using Weblate (Hungarian) 
Currently translated at 99.2% (1032 of 1040 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/hu/
 2020-07-03 10:23:07 +00:00
ismailgulek
4ade3ab814
Merge pull request #3383 from vector-im/riot_3282 
Use `you` instead of display name on notice events
 2020-07-03 13:22:56 +03:00
ismailgulek
72d666bac2
Update CHANGES.rst 2020-07-02 20:12:52 +03:00
ismailgulek
7d701048f4
Use new keys when detected current user 2020-07-02 20:11:46 +03:00
ismailgulek
a5e1f6222c
Add new localization keys 2020-07-02 20:11:27 +03:00
SBiOSoftWhare
6c3be2f5a2 RoomTitleView: Update theme colors. 2020-07-02 19:06:14 +02:00
SBiOSoftWhare
fb11aa4301 RoomMemberDetailsViewController: Update theme colors. 2020-07-02 19:04:06 +02:00
SBiOSoftWhare
64d1dc0080 Rebranding: Update theme colors. 2020-07-02 19:03:15 +02:00
Steve Barré
b30b0ec7b3 Merge branch 'images_update' into 'rebranding' 
Rebranding: Update tab bar and nav bar icons.

See merge request new-vector/element/element-ios!7
 2020-07-02 13:39:48 +00:00
Weblate
b04d1ffa27 Merge branch 'origin/develop' into Weblate. 2020-07-02 13:37:08 +00:00
ismailgulek
997bb8844c
Merge pull request #3382 from vector-im/riot_3226 
Fix Ban Reason Truncation
 2020-07-02 16:37:02 +03:00
ismailgulek
3e00990fe2
Update CHANGES.rst 2020-07-02 16:14:03 +03:00
ismailgulek
b2dd2bf8cb
Fix leading constraint, fixes #3226 2020-07-02 16:12:44 +03:00
SBiOSoftWhare
5170286b54 Rebranding: Update tab bar and nav bar icons. 2020-07-02 15:08:16 +02:00
Ismail Gulek
5f62fca3e0 Merge branch '6-update-app-version-to-1-0-0' into 'rebranding' 
Update app version to 1.0.0

See merge request new-vector/element/element-ios!6
 2020-07-02 11:07:10 +00:00
Kévin C
1fbf3d777d Translated using Weblate (French) 
Currently translated at 100.0% (1040 of 1040 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
 2020-07-02 08:26:46 +00:00
Ismail Gulek
75566cc87b Merge branch 'revert-395040f4' into 'develop' 
Revert "Merge branch '6-update-app-version-to-1-0-0' into 'develop'"

See merge request new-vector/element/element-ios!5
 2020-07-01 14:01:54 +00:00
Ismail Gulek
1155414778 Revert "Merge branch '6-update-app-version-to-1-0-0' into 'develop'" 
This reverts merge request !4
 2020-07-01 14:00:57 +00:00
Ismail Gulek
395040f4fb Merge branch '6-update-app-version-to-1-0-0' into 'develop' 
Update app version to 1.0.0

Closes #6

See merge request new-vector/element/element-ios!4
 2020-07-01 13:57:29 +00:00
Ismail Gulek
314a683e2a Update app version to 1.0.0 2020-07-01 16:26:34 +03:00
Ismail Gulek
186dbaea5c Update placeholders in KeyVerificationManuallyVerifyViewController 2020-07-01 16:20:32 +03:00
Ismail Gulek
91735e31f4 Update urls in Vector.strings 2020-07-01 15:49:58 +03:00
Ismail Gulek
d6ba32c83e Update InfoPlist.strings 2020-07-01 15:45:09 +03:00
Ismail Gulek
9ad599f4d3 Update app urls 2020-07-01 14:17:42 +03:00
Ismail Gulek
339d098c18 Add associated domains 2020-07-01 13:57:15 +03:00
Weblate
185c048983 Merge branch 'origin/develop' into Weblate. 2020-07-01 07:03:11 +00:00
ismailgulek
71ec71b5f8
Remove xcode11 from Podfile 2020-07-01 10:02:59 +03:00
ismailgulek
387cfb7787
Merge branch 'develop' into xcode11 
# Conflicts:
#	CHANGES.rst
#	Gemfile.lock
#	Riot.xcodeproj/project.pbxproj
#	Riot/SupportingFiles/Info.plist
#	RiotShareExtension/SupportingFiles/Info.plist
#	SiriIntents/Info.plist
 2020-07-01 09:59:29 +03:00
Weblate
79a65d15df Merge branch 'origin/develop' into Weblate. 2020-06-30 22:47:10 +00:00
SBiOSoftWhare
6cc9d9fd92 Merge tag 'v0.11.6' into develop 
no message
 2020-07-01 00:47:02 +02:00
SBiOSoftWhare
fe1eb3a936 Merge branch 'release/v0.11.6' 2020-07-01 00:47:02 +02:00