mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-10 02:07:39 +03:00
Code Issues Projects Releases Packages Wiki Activity
5760 commits 7 branches 124 tags 230 MiB
Commit graph

5760 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
a1f90abcd2 Rename package im.vector.riotx to im.vector.app (IDE) 2020-08-03 18:46:29 +02:00
Benoit Marty
67fc2feacb Rename package im.vector.riotx.multipicker to im.vector.lib.multipicker 2020-08-03 18:35:02 +02:00
Benoit Marty
d28c091f0a Rename package im.vector.riotx.attachmentviewer to im.vector.lib.attachmentviewer 2020-08-03 18:35:02 +02:00
Benoit Marty
b4af59728c
Merge pull request #1867 from vector-im/feature/cleanup_after_ooo 
Small cleanup, also to be aware of all the changes that occurred during my holidays.
 2020-08-03 17:47:26 +02:00
Benoit Marty
025d5f7b4c Code readability 2020-08-03 17:33:24 +02:00
Benoit Marty
d531e88666 Key is private 2020-08-03 17:33:24 +02:00
Benoit Marty
ac845ad8c9 Hide Flair settings, this is not implemented yet. 2020-08-03 17:33:24 +02:00
Benoit Marty
ace7ff464b Banned users: use the counter as the title 2020-08-03 17:33:24 +02:00
Benoit Marty
562c6fbcce Naming convention 2020-08-03 17:33:24 +02:00
Benoit Marty
8cc12fb8d4 Only one token per request is possible so use header instead of addHeader 2020-08-03 17:33:24 +02:00
Benoit Marty
4cbb2f7d9d Cleanup 2020-08-03 17:33:24 +02:00
Benoit Marty
18c0f53764 Format 2020-08-03 17:33:24 +02:00
Benoit Marty
64d000ec53
Update PULL_REQUEST_TEMPLATE.md 2020-08-03 17:29:07 +02:00
Benoit Marty
8e84c099fa
Merge pull request #1747 from vulet/develop 
fix: invisible toolbar(status.im theme)
 2020-08-03 16:59:30 +02:00
Benoit Marty
707b69e3e2
Merge branch 'develop' into develop 2020-08-03 16:58:52 +02:00
Valere
33f6e7e337 Version ++ 2020-08-03 14:04:31 +02:00
Valere
ee1d5faf0d Merge branch 'hotfix/fix_crash_invite_user' 2020-08-03 14:01:27 +02:00
Valere
9178fd2b5c Merge branch 'hotfix/fix_crash_invite_user' into develop 2020-08-03 14:01:27 +02:00
Valere
69e499e497 Merge hotfix 2020-08-03 14:00:32 +02:00
Valere
7308c4a15c Merge branch 'hotfix/fix_crash_before_release' 2020-08-03 12:23:55 +02:00
Valere
1370ca7082 Merge branch 'hotfix/fix_crash_before_release' into develop 2020-08-03 12:23:55 +02:00
Valere
db6045778e Update change log 2020-08-03 12:11:50 +02:00
Valere
2810923519 FIx / Crash when opening Invite User screen 2020-08-03 12:00:08 +02:00
SpiritCroc
2712ff9d84 We're on GPlay 2020-08-01 10:36:45 +02:00
SpiritCroc
21bce12f05 Update PRIVACY.md 2020-07-31 11:52:59 +02:00
SpiritCroc
f081874d50 PRIVACY.md: clear markdown from spans 2020-07-31 11:52:46 +02:00
Christian Pauly
fdca5b2f94 Update PRIVACY.md 2020-07-31 11:52:29 +02:00
SpiritCroc
687bf57d2d SchildiChat README 2020-07-31 11:51:40 +02:00
ganfra
7f326abcd0
Merge pull request #1844 from vector-im/feature/pin_code 
Feature/pin code
 2020-07-31 11:51:39 +02:00
ganfra
acf977577f Pin: clean code 2020-07-31 11:47:51 +02:00
SpiritCroc
41aece007d Ignore vector/fdroid/release 2020-07-31 11:43:39 +02:00
SpiritCroc
e10a530d69 Fix splash theme 2020-07-31 11:42:13 +02:00
ganfra
995c552f2a
Merge branch 'develop' into feature/pin_code 2020-07-31 11:41:42 +02:00
SpiritCroc
65be2c982a Revert "Fix rebranding assets on login screens." 
This reverts commit 4cc3e87d64.

Conflicts:
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_login_header.xml
 2020-07-31 11:35:48 +02:00
ganfra
99ae1655f5 Pin: fix PopupAlertManager showing on top of PinCode 2020-07-31 11:34:24 +02:00
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