86e638428b
Revert "Revert "Resolve required manual intervention in german strings""
...
This reverts commit 77df970e1b
2020-11-29 12:57:03 +01:00
4afb6aa469
Automatic SchildiChat string correction
...
Change-Id: I4a542ccc442ce0ec5a2bde5daf8c612342b8410d
2020-11-29 12:52:26 +01:00
0469beab1c
Automatic upstream merge postprocessing
...
Change-Id: Ib47b978128f8c6c0b243410591a1f9566ba08c6b
2020-11-29 12:52:25 +01:00
e0ca1f2751
Automatic color correction
...
Change-Id: Ia5d7d0bcba99005bb81a16a02edcc18b2480db1c
2020-11-29 12:52:25 +01:00
6f0a1acaf7
post_merge.sh: Add some automatic accent color correction
...
Change-Id: Ie0cf3b2d89fa8b24ac7544cba2f1540be041674b
2020-11-29 12:52:07 +01:00
0b4f56d7a0
Merge remote-tracking branch 'upstream/master' into sc
...
Change-Id: Icb4d672fc9d301803b300d6ac25b348780f11e6c
Conflicts:
gradle/wrapper/gradle-wrapper.properties
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
vector/src/main/res/layout/fragment_known_users.xml
vector/src/main/res/layout/fragment_user_list.xml
2020-11-29 12:51:43 +01:00
b283ba3b0a
[TMP] Automatic upstream merge preparation
...
Change-Id: I4824f735104a794acc944d39d52b61463a6fe17f
2020-11-29 12:32:30 +01:00
857ebde8ba
Revert "Automatic SchildiChat string correction"
...
This reverts commit 5a4907362a
2020-11-29 12:32:30 +01:00
77df970e1b
Revert "Resolve required manual intervention in german strings"
...
This reverts commit 2590f8f690
2020-11-29 12:32:30 +01:00
7ca37b8b46
Bug report template: add note to link upstream issues
...
Change-Id: Icf58edbe6e26726febf9b5c47e42901e332102ad
2020-11-28 12:20:43 +01:00
dffdcfe1e4
Merge branch 'release/1.0.11'
2020-11-27 20:40:03 +01:00
7b969ebd74
Ensure the Activity is destroyed, it seems that the intent flags are not enough now. - finish all
2020-11-27 16:00:30 +01:00
163f4cfaf2
Ensure the Activity is destroyed, it seems that the intent flags are not enough now.
2020-11-27 15:15:56 +01:00
9a8f45fc6f
Prepare version 1.0.11
2020-11-27 13:59:23 +01:00
e3ca89a81b
Fix issue when there is no display name
2020-11-27 13:54:21 +01:00
8696650f20
Cleanup
2020-11-27 13:53:19 +01:00
942f050579
Merge pull request #2450 from vector-im/feature/bca/home_empty_screens
...
Home empty screen design update
2020-11-27 13:51:04 +01:00
32d42794dd
Merge branch 'develop' into feature/bca/home_empty_screens
2020-11-27 12:02:30 +01:00
14c71d6c07
Fix issue with too big icons
2020-11-27 12:01:19 +01:00
cce4d7d4d9
Use style instead of duplicating the whole layout file
2020-11-27 11:09:13 +01:00
708cdad38b
Update changelog
2020-11-27 10:24:07 +01:00
bc889cbcf4
Merge pull request #2444 from vector-im/feature/bca/deeplink_mxto
...
Fix issues with matrix.to deep linking
2020-11-27 10:22:51 +01:00
7c9b943733
Try other asset strategy as lint not happy
2020-11-27 09:58:14 +01:00
e3b88d1162
Merge pull request #2461 from RiotTranslateBot/weblate-element-android-element-app
...
Translations update from Weblate
2020-11-27 09:45:22 +01:00
d80927a8f9
Merge branch 'origin/develop' into Weblate.
2020-11-27 07:37:32 +00:00
835a36986d
Refactoring following review
2020-11-26 17:39:00 +01:00
4c599d3d40
Merge pull request #2451 from vector-im/feature/bca/fix_update_profile_no_rooms
...
Fix / update profile when no rooms
2020-11-26 15:09:40 +01:00
67057bfac4
Merge pull request #2417 from vector-im/feature/bca/quick_invite_dm_tab
...
Feature/bca/quick invite dm tab
2020-11-26 14:58:14 +01:00
fbc3f47eeb
Fix / update profile when no rooms
2020-11-26 14:34:45 +01:00
79caa4e510
update change log
2020-11-26 13:31:00 +01:00
fa191136cc
Home empty screen design update
2020-11-26 13:27:10 +01:00
15d93c8aeb
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 43.3% (837 of 1933 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
2020-11-26 11:50:02 +00:00
4f5632b916
code review
2020-11-26 09:09:27 +01:00
8e6e6736a3
Code review
2020-11-26 09:09:27 +01:00
804afc9a1d
Fix issues with matrix.to deep linking
2020-11-26 09:09:27 +01:00
bcd86977d2
Fix test + lint
2020-11-25 17:17:48 +01:00
a8b5a5227f
Code review update
2020-11-25 15:47:27 +01:00
d2398a7abb
Translated using Weblate (Hungarian)
...
Currently translated at 83.1% (158 of 190 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/hu/
2020-11-25 08:50:03 +00:00
0e908ad882
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 43.1% (834 of 1933 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
2020-11-25 08:50:02 +00:00
8c5a8b9a2f
Customize github templates
...
Change-Id: Ifcfcbdfefe24aa24c9e1c32ca7674feee1c4db80
2020-11-25 09:29:16 +01:00
c0a83d1916
Merge pull request #2429 from vector-im/feature/bca/e2e_logs
...
Better e2e log reporting
2020-11-24 17:04:11 +01:00
920856512e
Merge pull request #2433 from EdGeraghty/patch-1
...
Disable native dialler integration on jitsi widget
2020-11-24 16:45:12 +01:00
ac89fb97f8
Increment version
...
Change-Id: Ic11038b22a85eb4ee863bb865439ae3c9751da1b
2020-11-24 16:13:49 +01:00
62b703ca88
Added translation using Weblate (Norwegian Bokmål)
2020-11-24 07:08:01 +00:00
4fb7ff6cf5
Also hide encryption in room settings in simplified mode
...
Change-Id: I180d841cf3c62000d34b0642bfbf40eb1dd7037e
2020-11-23 13:35:11 +01:00
78766d7fc5
SC dark theme: fix touch guard transparency behind fab
...
Change-Id: Id8ab5e57236cd3383bebd3597b4ac2a3577a4f41
2020-11-23 13:35:08 +01:00
a7315ee56f
FAB label background is finally dark in dark theme, so fix text color
...
Change-Id: Ifa43b19eca293fc15aab25f067d0516686e75a29
2020-11-23 13:35:05 +01:00
b125b47366
Update CHANGES.md
...
Signed-off-by: Ed Geraghty <ed@geraghty.london>
2020-11-23 00:01:05 +00:00
bc6debea89
Disable native dialler integration on jitsi widget
...
Native dialler integration breaks the jitsi widget for those of us with non-vanilla telephony frameworks.
Disabling this integration (as is default on the Jitsi Meet Android app) allows us to also join conference calls, with no adverse effect on those for whom it already works.
Signed-off-by: Ed Geraghty <ed@geraghty.london>
2020-11-22 23:13:01 +00:00
d850c7ac42
Simplified mode setting
...
- Hide public room functionality (rationale: people chatting with strangers on the internet can be considered advanced users)
- Clicking on + / Rooms goes directly to "Create new room" instead of the intermediate step which allows joining public rooms
- The "New room" screen would hide the setting to make the room public and publish it in the room directory
- Hide room address settings in the room settings
- Hide encryption settings (rationale: encryption is hard to explain to users without background knowledge)
Closes https://github.com/SpiritCroc/SchildiChat-android/issues/23
Change-Id: If1a7f16880ca2f4333270ec29cc1d27f70a9132d
2020-11-22 17:42:08 +01:00
SpiritCroc
Benoit Marty
Benoit Marty
Valere
Weblate
Daniel Løvbrøtte Olsen
notramo
Ed Geraghty