mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-29 20:38:37 +03:00
Code Issues Projects Releases Packages Wiki Activity
5425 commits 7 branches 124 tags 230 MiB
Commit graph

5425 commits

This branch
This branch
All branches
Author SHA1 Message Date
ganfra
7e45fe4509 Pin: add comment on UnlockActivity interface 2020-07-31 11:33:25 +02:00
SpiritCroc
9f7bf14a22 Merge tag 'v1.0.3' into sc 
1.0.3

Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/values/strings.xml
	vector/src/main/res/values/styles_login.xml
 2020-07-31 11:22:57 +02:00
Valere
531623178a Version ++ 2020-07-31 00:52:22 +02:00
Valere
7fddfa45e8 Merge branch 'release/1.0.3' 2020-07-31 00:02:02 +02:00
Valere
2b2fd3a356 Merge branch 'release/1.0.3' into develop 2020-07-31 00:02:02 +02:00
Valere
258acaf814 Prepare release 1.0.3 2020-07-31 00:01:33 +02:00
ganfra
a883d3ecdd Merge branch 'develop' into feature/pin_code 2020-07-30 18:49:13 +02:00
Valere
2f6cdc6529
Merge pull request #1847 from vector-im/feature/crash_store_mvrx 
Fix IllegalArgumentException reported from store on HomeActivity aunch
 2020-07-30 18:07:11 +02:00
Valere
1f226ca6c7
Merge pull request #1845 from vector-im/feature/admin_e2e_config 
Feature/admin e2e config
 2020-07-30 18:06:27 +02:00
ganfra
9475cb3b39 Update CHANGES 2020-07-30 17:25:49 +02:00
ganfra
eb0d350097 Merge branch 'develop' into feature/pin_code 2020-07-30 17:24:48 +02:00
Valere
c90f5ed370 Fix IllegalArgumentException reported from store on HomeActivity aunch 2020-07-30 17:03:11 +02:00
Valere
ccb466edbe Update change log 2020-07-30 16:57:25 +02:00
Valere
1204f6d9ce UX feedback, reduce severity of message 2020-07-30 15:25:10 +02:00
ganfra
efa1263c35 Pin: set back the grace period to 2 minutes 2020-07-30 15:22:41 +02:00
ganfra
06bd353d44 Pin: polish a bit and clean code 2020-07-30 14:58:46 +02:00
Valere
562cfce9e2 Support HS admin option to disable E2EE for DMs 
Fixes #1794
 2020-07-30 12:08:30 +02:00
ganfra
bb066b7c65 Add PinLocker to handle lock state 2020-07-29 20:19:01 +02:00
ganfra
37521d2d4f Pin: add settings to enable/disable 2020-07-29 16:11:57 +02:00
Valere
b732ea6c69 Version ++ 2020-07-29 11:39:23 +02:00
ganfra
5426e43cbb Create PinCodeStore and migrate code to fragment 2020-07-29 11:38:04 +02:00
Valere
a048f79b37 Merge branch 'release/1.0.2' 2020-07-29 10:46:54 +02:00
Valere
3214f7d3d5 Merge branch 'release/1.0.2' into develop 2020-07-29 10:46:54 +02:00
Valere
06ef665f66 prepare release 1.0.2 2020-07-29 10:33:55 +02:00
Valere
e1a07f1da6
Merge pull request #1838 from vector-im/feature/session_store_migration 
Feature/session store migration
 2020-07-29 10:31:14 +02:00
Valere
5c32c7388a cleaning 2020-07-29 09:51:50 +02:00
Valere
c04f22d3bf quick fix plural 2020-07-29 09:51:20 +02:00
Valere
cbf43ea7b3 Session store migration 2020-07-29 09:50:12 +02:00
Valere
9197275343 version++ 2020-07-29 09:00:29 +02:00
ganfra
ecdef52829 Continue PIN code library integration (fork required) 2020-07-28 20:22:59 +02:00
Valere
cc4298209b Merge branch 'release/1.0.1' 2020-07-28 18:03:37 +02:00
Valere
f26ce64914 Merge branch 'release/1.0.1' into develop 2020-07-28 18:03:36 +02:00
Valere
e3f5b7cab3 Prepare release 1.0.1 2020-07-28 18:02:51 +02:00
ganfra
cd38aa42aa Merge branch 'develop' into feature/pin_code 2020-07-28 17:49:36 +02:00
Valere
dde9cdd8ac
Merge pull request #1821 from vector-im/feature/notification_off_alert 
Check if migration disabled notif
 2020-07-28 17:04:15 +02:00
Valere
0d0308d584
Merge pull request #1802 from vector-im/feature/fix_reply_tag 
Feature/fix reply tag
 2020-07-28 16:58:10 +02:00
Valere
a47ff99be7
Merge branch 'develop' into feature/fix_reply_tag 2020-07-28 16:58:00 +02:00
Valere
e619217687 Code quality 2020-07-28 16:56:55 +02:00
Valere
6f5b3371fe Check if migration disabled notif 2020-07-28 16:56:55 +02:00
Valere
f7b9fc3bb1
Merge pull request #1826 from vector-im/feature/banned_list 
Added banned user screen
 2020-07-28 16:53:58 +02:00
ganfra
700a2e9ce3
Merge pull request #1832 from vector-im/feature/fix_timeline_loading 
Fix timeline non loading when there are lots of filtered events
 2020-07-28 16:30:57 +02:00
ganfra
5176a3e2aa
Merge branch 'develop' into feature/fix_timeline_loading 2020-07-28 16:30:34 +02:00
Valere
4631cd0e80
Merge pull request #1831 from vector-im/feature/quick_call_update 
Allow call in all 2 participants rooms
 2020-07-28 16:24:22 +02:00
Valere
60c6512418 Fix / item flickering 2020-07-28 16:23:21 +02:00
Valere
12bc821ef3 code review 2020-07-28 16:23:21 +02:00
Valere
c82e910c38 Added banned user screen 2020-07-28 16:23:21 +02:00
ganfra
7ae0620b20 Update CHANGES 2020-07-28 15:09:45 +02:00
Valere
de32cdb703
Merge pull request #1828 from vector-im/feature/improve_edit_role_button 
Improve UI of edit role button
 2020-07-28 14:46:54 +02:00
Valere
12e2a8ffc8 Allow call in all 2 participants rooms 2020-07-28 14:43:50 +02:00
SpiritCroc
adaed3fd64 Increment version 2020-07-28 13:55:09 +02:00