filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-18 20:33:50 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,675 Commits 7 Branches 122 Tags 228 MiB
afbda4ac28
Commit Graph

3675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Valere
4589aaa11c
Merge pull request #1312 from vector-im/feature/post_smoke_test_fix 
Feature/post smoke test fix
 2020-04-30 17:37:04 +02:00
Valere
b3dbcd7936 Show untrusted first 2020-04-30 15:43:19 +02:00
Valere
cac246aa15 update copy 2020-04-30 15:43:05 +02:00
Benoit Marty
83db9b34d4
Merge pull request #1311 from vector-im/bmarty-patch-1 
Add instruction regarding the template
 2020-04-30 13:50:44 +02:00
Benoit Marty
a43df43642
Add instruction regarding the template 2020-04-30 13:10:53 +02:00
Benoit Marty
f6cbc15cf7 Several fixes on room creation collpasing events (Fixes #1309) 
- do not collapse room member events
- collapse other type of event: topic, alias, canonical alias, powel level
- Use correct user name for collapsed version (should be fixed twice due to the previous change of excluding some room member events)
- align "join" and "left" string with Riot-Web
 2020-04-30 12:52:21 +02:00
Benoit Marty
7322144dc8 Remove duplicated strings 2020-04-30 12:15:26 +02:00
Valere
8e357c6b7f
Merge pull request #1280 from vector-im/feature/e2e_timeline_decoration 
Feature/e2e timeline decoration
 2020-04-30 12:01:55 +02:00
Valere
7b20db64a5
Merge branch 'develop' into feature/e2e_timeline_decoration 2020-04-30 12:01:44 +02:00
Valere
429c634ed9
Merge pull request #1308 from vector-im/feature/fix_dm_shield_logic 
Fix / Move DM shield rules to task
 2020-04-30 12:00:18 +02:00
Valere
05230a6afa Code review 2020-04-30 11:38:32 +02:00
Valere
43eb804b23
Merge pull request #1303 from vector-im/feature/xs_old_new_session_detection 
Feature/xs old new session detection
 2020-04-30 11:23:15 +02:00
Valere
5840248ffa Fix / NPE Optional#get instead of getOrNull 2020-04-30 11:11:11 +02:00
Valere
6ea38c7eb0 Fix / Move DM shield rules to task 2020-04-30 10:55:25 +02:00
Valere
9586fa9f90 Typo in file name 2020-04-30 10:11:32 +02:00
Valere
0d0af6906e Code review 2020-04-30 10:10:56 +02:00
Valere
93070f3524 Fix / use distinct until change 2020-04-30 09:50:47 +02:00
Valere
7cf7b7e10e Fix / avoid showing legacy start toaster under verif bottomsheet 2020-04-30 09:50:38 +02:00
Valere
1de4869cde Fix / reuse cell keeps icon 2020-04-30 09:50:11 +02:00
ganfra
21d0db8382
Merge pull request #1304 from vector-im/feature/template 
Feature/template
 2020-04-29 19:21:01 +02:00
ganfra
269d6e4d08 Remove AndroidManifest template 2020-04-29 19:19:50 +02:00
Valere
3cf341c3bf code quality 2020-04-29 18:48:26 +02:00
Valere
f0a9be2ec7 Better session detection 2020-04-29 18:46:36 +02:00
Valere
8955e5461c Add retry to sendToDeviceTask 2020-04-29 18:45:51 +02:00
Valere
087ff1c041 Fix / race when receive accept in sending start in to device 2020-04-29 18:44:25 +02:00
ganfra
1a307a0c4d Template: let the ViewModel factory be agnostic of the host 2020-04-29 17:58:54 +02:00
Benoit Marty
071a43c8d4
Merge pull request #1305 from vector-im/feature/fix_delay_initial_sync 
Fix / ensure ux aware of wait
 2020-04-29 17:12:58 +02:00
Valere
7b46c49ded Fix / missing primary key for migration 2020-04-29 16:35:50 +02:00
Valere
da5672d229 Fix / ensure ux aware of wait 2020-04-29 16:18:01 +02:00
Valere
dcfd9ee7a7 Fix copy 2020-04-29 15:12:07 +02:00
ganfra
35a6f90ed6 Create configure script for template 2020-04-29 14:41:45 +02:00
ganfra
d463e5e500 Create template 2020-04-29 14:38:01 +02:00
Valere
0f00597444 Fix / Regression on non e2e device 
+ migrate to new rx objects
 2020-04-29 12:35:22 +02:00
Valere
a806f70b35 New security alert to review old sessions 2020-04-29 12:04:59 +02:00
Benoit Marty
67f07bd1bb
Merge pull request #1297 from vector-im/feature/xsigning_trust_optimization 
Feature/xsigning trust optimization
 2020-04-29 10:32:29 +02:00
Valere
39e18446ae fix typo 2020-04-29 09:34:28 +02:00
Benoit Marty
4dc0b00569 Import string from Matrix SDK 2020-04-28 23:54:35 +02:00
Benoit Marty
87979ccadd
Merge pull request #1299 from vector-im/feature/emoji_perf 
Emoji completion for 🎉
 2020-04-28 23:41:02 +02:00
Benoit Marty
7c2a5af8f2
Merge pull request #1301 from vector-im/feature/strings 
Feature/strings
 2020-04-28 23:40:39 +02:00
Benoit Marty
dc6d4c6789 Remove problematic translation 2020-04-28 21:54:14 +02:00
Benoit Marty
db3d5e2677 Remove not used anymore translations 2020-04-28 21:36:34 +02:00
Benoit Marty
6dc8bdde04 Import translation from Riot-Android 2020-04-28 21:35:39 +02:00
Valere
c02cfb2f4f
Merge pull request #1296 from vector-im/feature/untrusted_session_shields 
Update manage sessions screen
 2020-04-28 19:17:00 +02:00
Valere
947c46d7b5 Avoid negative margin 2020-04-28 19:16:29 +02:00
ganfra
8942ce964a Fix android test not compiling 2020-04-28 19:09:20 +02:00
Valere
a05c401892 Code review 2020-04-28 18:47:54 +02:00
ganfra
43055964ba Crypto store : avoid copying before mapping to other data 2020-04-28 16:26:04 +02:00
Benoit Marty
a4192a0761 Emoji completion 🎉 does not completes to 🎉 like on web (#1285) 2020-04-28 14:29:43 +02:00
Benoit Marty
9c8ff7de7f Add Android test for EmojiDataSource 2020-04-28 14:15:50 +02:00
Benoit Marty
b4247c89e4 Make fun internal 2020-04-28 14:15:50 +02:00