Commit Graph

276 Commits

Author SHA1 Message Date
ismailgulek a288a1795e Merge branch 'develop' into element_3436 2020-07-21 19:38:24 +03:00
ismailgulek 1aa9e3bddd Make force setting hardcoded 2020-07-21 16:12:36 +03:00
ismailgulek e7777e4612 Define needed strings 2020-07-21 16:10:43 +03:00
ismailgulek 874f789698 Add generated files 2020-07-17 19:03:56 +03:00
manuroe f8c345ff31 version++ 2020-07-17 16:40:50 +02:00
ismailgulek 2dc056ac5b Merge branch 'develop' into riot_3137 2020-07-16 13:11:05 +03:00
ismailgulek 9065caaa9b Remove unused strings 2020-07-16 13:06:52 +03:00
ismailgulek fa33320ea5 Merge branch 'develop' into riot_3137 2020-07-16 10:37:30 +03:00
SBiOSoftWhare 2d17667f1d Merge pull request #3404 from vector-im/rebranding
Rebranding
2020-07-15 18:30:21 +02:00
SBiOSoftWhare 87a0a3c458 RoomVC: Update plus icon. 2020-07-11 02:08:34 +02:00
SBiOSoftWhare d62e9aa135 LaunchLoading: Fix animation theming and repeat count. 2020-07-10 22:27:22 +02:00
Steve Barré bf65e9083d Merge branch 'add_major_update_modal' into 'rebranding'
Add major update modal

See merge request new-vector/element/element-ios!29
2020-07-10 19:35:18 +00:00
SBiOSoftWhare cc7dde6ecb Create MajorUpdateViewController to display major updates informations. 2020-07-10 21:27:47 +02:00
SBiOSoftWhare ca9d6f3f3c Add old logo image. 2020-07-10 21:23:33 +02:00
Neil Alexander 86cb17876c Load animation, colour corrections, fixed launch screen
Squashed commit of the following:

commit e11d0e589469db9ead0d96449f9e31677edb2031
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:59:30 2020 +0100

    Fix colour in launch screen

commit aa59e85d309433a05992e446bdd789b59b87089d
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:57:01 2020 +0100

    Display -> display

commit 6da06421bedfe7aff6a0ff1dff4360685e708cf2
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:55:20 2020 +0100

    P3 colours

commit b1fc009ab9002eb75403c287ce75bdbf08e222cd
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:52:22 2020 +0100

    Update Riot.xcodeproj

commit ac1d994c6eb3f863f5310364ee4582476d59b76e
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:44:41 2020 +0100

    Revert changes to Images.swift and Storyboards.swift

commit 27c88f9b3ba7c22efd19f6e8aa17c2af17f3289b
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:25:08 2020 +0100

    Add animation source files

commit d19ccd50009280b45f3165e1a2a03a2bd241ccf7
Merge: d6b651a8 2ed92204
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:18:04 2020 +0100

    Fix launch screen and update loading screen

    Merge commit '2ed92204' into rebranding

commit 2ed922045cd6381202b8d7bb80136f8b24a95141
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:13:56 2020 +0100

    Fix launch screen, smooth transition to loading animation
2020-07-10 17:59:57 +01:00
SBiOSoftWhare f0b1d4f29b Tab bar root view controllers now use the same floating button. 2020-07-10 15:23:50 +02:00
SBiOSoftWhare 92b3acb7ea RoomTitleView: Update details icon color. 2020-07-10 14:35:16 +02:00
SBiOSoftWhare 541e49dad2 Update integrations icon. 2020-07-10 14:20:16 +02:00
SBiOSoftWhare 6cdcfb3b10 CallVC: Update call icons. 2020-07-09 21:26:57 +02:00
SBiOSoftWhare 185d5e13d7 RoomVC: Update input tool bar icons. 2020-07-09 19:28:51 +02:00
SBiOSoftWhare 41b2eb7e4f Update legals URL 2020-07-09 14:44:31 +02:00
SBiOSoftWhare b05708cd5f Remove old Riot image. 2020-07-09 00:00:27 +02:00
SBiOSoftWhare 8f902670a6 Remove old Riot images. Move horizontal logo to shared images. 2020-07-08 23:40:15 +02:00
SBiOSoftWhare 31a7d3718d AuthenticationVC: Update logo. 2020-07-08 19:08:27 +02:00
SBiOSoftWhare ad6362ec07 Update launch screen. 2020-07-08 18:53:05 +02:00
SBiOSoftWhare de37fe1001 Merge branch 'rebranding' into 15-code-refactoring-constants
# Conflicts:
#	Riot/Assets/Riot-Defaults.plist
2020-07-08 17:45:27 +02:00
SBiOSoftWhare 6957e11471 Update app icon. 2020-07-07 20:21:29 +02:00
SBiOSoftWhare 15745dab06 Room actions: Remove old icons. 2020-07-07 02:28:21 +02:00
Ismail Gulek c906928ef0 Remove urls only from English 2020-07-03 17:00:50 +03:00
Ismail Gulek d250f275a1 Revert "Remove url strings"
This reverts commit c619c7cd74d7644c95afa653a9a9338b68368158.
2020-07-03 16:59:26 +03:00
Ismail Gulek e903a3bb2f Merge branch 'rebranding' into 14-update-legal-pages-urls-copyright-tac-t-c 2020-07-03 16:41:23 +03:00
Ismail Gulek 521c561231 Remove url strings 2020-07-03 16:38:01 +03:00
Ismail Gulek 24516890fb Include copyright, privacy, termsConditions urls to plist 2020-07-03 16:36:12 +03:00
Ismail Gulek a7fd4abcf0 Merge branch 'rebranding' into 15-code-refactoring-constants 2020-07-03 15:15:23 +03:00
Ismail Gulek 6699d011b9 Replace beta with staging 2020-07-03 15:12:18 +03:00
ismailgulek 8dd42925dc Add strings for confirmation alert 2020-07-03 14:22:45 +03:00
ismailgulek 4094af5a7d Add new localization keys 2020-07-02 20:11:27 +03:00
SBiOSoftWhare 45923d25b0 Rebranding: Update tab bar and nav bar icons. 2020-07-02 15:08:16 +02:00
ismailgulek bd1bb3b952 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
SBiOSoftWhare 0f4662e831 Merge pull request #3375 from vector-im/copy_update
SecurityVC: Update MY SESSIONS copy
2020-06-30 21:50:52 +02:00
SBiOSoftWhare e26f0ef78e Merge pull request #3377 from vector-im/riot_3299
Setup cross-signing for existing users
2020-06-30 21:47:36 +02:00
SBiOSoftWhare d6773b9380 Refactor cross signing banner. 2020-06-30 21:46:10 +02:00
manuroe 73ea84d33b SecurityVC: Update MY SESSIONS copy 2020-06-30 18:12:50 +02:00
manuroe e40b528193 Sign out: Make sure there is a secure backup 2020-06-30 18:00:56 +02:00
SBiOSoftWhare 7268bb8528 Cross-signing: Create key verification setup banner. 2020-06-30 17:33:42 +02:00
manuroe 8a45ae14aa SecurityVC: Setup cross-signing on secure backup setup 2020-06-30 17:03:33 +02:00
manuroe 7dd0fb2c60 SecurityVC: 3 actions for secure backup: setup, synchronise, delete 2020-06-30 16:23:29 +02:00
manuroe 1703ec8ab4 SecurityVC: Secure backup replaces messages backup 2020-06-30 15:54:58 +02:00
manuroe 4e419d870c Secure backup setup: Manage the case when the user has already a key backup
but we do not have the private key
2020-06-30 14:15:18 +02:00
ismailgulek b1acd2ad24 Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
2020-06-26 17:33:09 +03:00