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

365 commits

Author SHA1 Message Date
ismailgulek
78a8ec571b Merge branch 'develop' into wording_for_dm 2020-09-25 11:59:51 +03:00
ismailgulek
84c01e239c Merge branch 'develop' into convert_to_coordinators 
# Conflicts:
#	CHANGES.rst
 2020-09-24 14:13:53 +03:00
ismailgulek
46b720a4c8 Update encryption strings 2020-09-24 13:27:53 +03:00
ismailgulek
a665d2119e Update leave strings 2020-09-24 13:00:50 +03:00
ismailgulek
fba7604e37 Remove redundant string 2020-09-24 12:41:25 +03:00
SBiOSoftWhare
5ac652536b Merge branch 'develop' into convert_to_coordinators 
# Conflicts:
#	CHANGES.rst
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
 2020-09-24 11:37:24 +02:00
ismailgulek
e5f511117b Change loc key 2020-09-23 11:06:53 +03:00
ismailgulek
1b82694c69 Add new strings 2020-09-21 14:04:02 +03:00
ismailgulek
c15db17de3 Change Fiels to Uploads 2020-09-18 18:54:52 +03:00
ismailgulek
5464cb2f3a Create room info module 2020-09-18 14:37:12 +03:00
ismailgulek
751582fb22 Add strings 2020-09-17 18:29:51 +03:00
ismailgulek
38b75abb35 Change localization key 2020-09-17 16:22:32 +03:00
ismailgulek
a17b9e60a5 Add error string 2020-09-17 14:01:07 +03:00
ismailgulek
b764b2f2bb Implement new module 2020-09-14 19:44:07 +03:00
ismailgulek
eafe99601f Localize more 2020-09-14 14:47:40 +03:00
ismailgulek
ba7b27bdc4 Localize view 2020-09-11 16:32:01 +03:00
ismailgulek
25170094c0 Add capture avatar icon 2020-09-11 13:37:49 +03:00
ismailgulek
47d067e23e Merge branch 'develop' into element_3628 
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
 2020-09-10 18:18:29 +03:00
ismailgulek
4013bfde1e
Merge pull request #3644 from vector-im/element_3627 
Contextualize Floating Button Actions
 2020-09-10 18:14:47 +03:00
ismailgulek
514e4ea3bd Complete refactoring 2020-09-10 14:56:46 +03:00
ismailgulek
0c5eb7a547 Add checkmark icon 2020-09-09 19:30:13 +03:00
ismailgulek
10028f8ba4 Create new screen 2020-09-09 16:15:09 +03:00
ismailgulek
b2dae15307 Update searchbar placeholder 2020-09-09 15:05:06 +03:00
ismailgulek
9f820598a4 Introduce SearchableDirectoryViewController 2020-09-09 14:39:56 +03:00
ismailgulek
6e5e6b9852 New strings 2020-09-09 14:38:24 +03:00
ismailgulek
cd8dbe6472 New user icon 2020-09-09 14:38:08 +03:00
ismailgulek
fa83acc562 Update generated 2020-09-08 14:06:37 +03:00
ismailgulek
011a0ffbfe Add new icon 2020-09-08 13:56:47 +03:00
ismailgulek
111b261cf9 Add new icons 2020-09-08 13:08:45 +03:00
SBiOSoftWhare
79de270da1 Update pbxproj. 2020-09-07 10:06:34 +02:00
ismailgulek
73e3a7a733 Prepare for new sprint 2020-08-26 15:37:29 +03:00
manuroe
a151bf4a91 Code Quality: Make sonar happier 
by removing some code smells
 2020-08-25 18:54:47 +02:00
ismailgulek
b4ff819000 Add string value for loading 2020-08-21 16:29:19 +03:00
ismailgulek
ddf71022fe Compose pusher app ids in BuildSettings 2020-08-06 10:51:39 +03:00
ismailgulek
3824896ef5 Remove redundant keys manually 2020-08-05 18:58:24 +03:00
ismailgulek
71131a208d Add Info.plist variables 2020-08-05 17:10:32 +03:00
manuroe
341cc494f7 InfoPlist: Generated class from Info.plist 2020-07-30 10:42:05 +02:00
ismailgulek
66febe73ba
Implement biometrics module 2020-07-24 17:53:23 +03:00
ismailgulek
763ae1af23
Strings & images 2020-07-24 17:35:49 +03:00
ismailgulek
725444964f Merge branch 'develop' into element_3436 2020-07-21 19:38:24 +03:00
ismailgulek
07e96fc7cc
Make force setting hardcoded 2020-07-21 16:12:36 +03:00
ismailgulek
146aaebd1a
Define needed strings 2020-07-21 16:10:43 +03:00
ismailgulek
b3177d1a89
Add generated files 2020-07-17 19:03:56 +03:00
manuroe
5f56eb31c5 version++ 2020-07-17 16:40:50 +02:00
ismailgulek
e9eac9db06
Merge branch 'develop' into riot_3137 2020-07-16 13:11:05 +03:00
ismailgulek
bd068e3586
Remove unused strings 2020-07-16 13:06:52 +03:00
ismailgulek
7ff531873e Merge branch 'develop' into riot_3137 2020-07-16 10:37:30 +03:00
SBiOSoftWhare
68d403c3fe
Merge pull request #3404 from vector-im/rebranding 
Rebranding
 2020-07-15 18:30:21 +02:00
SBiOSoftWhare
46b7dc8b3d RoomVC: Update plus icon. 2020-07-11 02:08:34 +02:00
SBiOSoftWhare
92cc7bdc2f LaunchLoading: Fix animation theming and repeat count. 2020-07-10 22:27:22 +02:00
Steve Barré
fd632f0e78 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
77b086350e Create MajorUpdateViewController to display major updates informations. 2020-07-10 21:27:47 +02:00
SBiOSoftWhare
d3744cbf18 Add old logo image. 2020-07-10 21:23:33 +02:00
Neil Alexander
5d46b46339
Load animation, colour corrections, fixed launch screen 
Squashed commit of the following:

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

    Fix colour in launch screen

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

    Display -> display

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

    P3 colours

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

    Update Riot.xcodeproj

commit ac1d994c6e
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 27c88f9b3b
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:25:08 2020 +0100

    Add animation source files

commit d19ccd5000
Merge: 8e5ac3f6 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 2ed922045c
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
bc6192ff40 Tab bar root view controllers now use the same floating button. 2020-07-10 15:23:50 +02:00
SBiOSoftWhare
3f407215be RoomTitleView: Update details icon color. 2020-07-10 14:35:16 +02:00
SBiOSoftWhare
84a7a49c26 Update integrations icon. 2020-07-10 14:20:16 +02:00
SBiOSoftWhare
b5a6d1bcb1 CallVC: Update call icons. 2020-07-09 21:26:57 +02:00
SBiOSoftWhare
15bedd3479 RoomVC: Update input tool bar icons. 2020-07-09 19:28:51 +02:00
SBiOSoftWhare
a7f2907962 Update legals URL 2020-07-09 14:44:31 +02:00
SBiOSoftWhare
342cd42576 Remove old Riot image. 2020-07-09 00:00:27 +02:00
SBiOSoftWhare
600da17189 Remove old Riot images. Move horizontal logo to shared images. 2020-07-08 23:40:15 +02:00
SBiOSoftWhare
21a9b9fdf1 AuthenticationVC: Update logo. 2020-07-08 19:08:27 +02:00
SBiOSoftWhare
a9e5424c83 Update launch screen. 2020-07-08 18:53:05 +02:00
SBiOSoftWhare
84ec63d897 Merge branch 'rebranding' into 15-code-refactoring-constants 
# Conflicts:
#	Riot/Assets/Riot-Defaults.plist
 2020-07-08 17:45:27 +02:00
SBiOSoftWhare
56f31312cd Update app icon. 2020-07-07 20:21:29 +02:00
SBiOSoftWhare
ebe0d1f4e3 Room actions: Remove old icons. 2020-07-07 02:28:21 +02: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
603c259db5 Merge branch 'rebranding' into 14-update-legal-pages-urls-copyright-tac-t-c 2020-07-03 16:41:23 +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
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
5085c29a32
Add strings for confirmation alert 2020-07-03 14:22:45 +03:00
ismailgulek
a5e1f6222c
Add new localization keys 2020-07-02 20:11:27 +03:00
SBiOSoftWhare
5170286b54 Rebranding: Update tab bar and nav bar icons. 2020-07-02 15:08:16 +02: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
SBiOSoftWhare
9692354fdb
Merge pull request #3375 from vector-im/copy_update 
SecurityVC: Update MY SESSIONS copy
 2020-06-30 21:50:52 +02:00
SBiOSoftWhare
e5a36a76a3
Merge pull request #3377 from vector-im/riot_3299 
Setup cross-signing for existing users
 2020-06-30 21:47:36 +02:00
SBiOSoftWhare
4bac9f1e9c Refactor cross signing banner. 2020-06-30 21:46:10 +02:00
manuroe
a9e677e538 SecurityVC: Update MY SESSIONS copy 2020-06-30 18:12:50 +02:00
manuroe
19db088bc2 Sign out: Make sure there is a secure backup 2020-06-30 18:00:56 +02:00
SBiOSoftWhare
0f04837ce4 Cross-signing: Create key verification setup banner. 2020-06-30 17:33:42 +02:00
manuroe
16a292fd6e SecurityVC: Setup cross-signing on secure backup setup 2020-06-30 17:03:33 +02:00
manuroe
ec82325360 SecurityVC: 3 actions for secure backup: setup, synchronise, delete 2020-06-30 16:23:29 +02:00
manuroe
72d3d944e5 SecurityVC: Secure backup replaces messages backup 2020-06-30 15:54:58 +02:00
manuroe
1dde6cc383 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
ed9750e53f
Merge branch 'develop' into xcode11 
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
 2020-06-26 17:33:09 +03:00
SBiOSoftWhare
6858bd85a5 Merge branch 'develop' into riot_3293 
# Conflicts:
#	CHANGES.rst
#	Riot/Generated/Strings.swift
 2020-06-26 14:30:21 +02:00
SBiOSoftWhare
77b726189b Refactoring secure backup references. 2020-06-26 14:13:37 +02:00
SBiOSoftWhare
e5bdd8cdef Refactoring secure backup references. 2020-06-26 14:01:33 +02:00
manuroe
c162cb6a78 Add AuthenticatedSessionViewControllerFactory to set up a authenticated flow for a given CS API request 2020-06-26 07:38:38 +02:00
SBiOSoftWhare
c625ea42af Fix refactoring. 2020-06-25 17:52:36 +02:00
SBiOSoftWhare
d7dbd13cf8 Fix Manu's remarks. 2020-06-25 17:31:46 +02:00
SBiOSoftWhare
8c6b4c56b0 Key backup banner: Update localizable strings. 2020-06-25 09:45:29 +02:00
SBiOSoftWhare
cd8c353972 Fix Nad's remarks. 2020-06-24 18:29:52 +02:00
SBiOSoftWhare
2ee7dee519 Fix rebase issue. 2020-06-23 18:33:48 +02:00
SBiOSoftWhare
a5aa761986 Secure key backup: Add string localizations. 2020-06-23 18:31:52 +02:00
SBiOSoftWhare
aa8db7eaf6 Secrets setup: Add images. 2020-06-23 18:31:52 +02:00