filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,271 Commits 7 Branches 127 Tags
Commit Graph

26271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SpiritCroc
5f249464cd Automatic upstream merge postprocessing 
Change-Id: I94966830982c5a7e7c4a18a20c1cac9c0e012e73
 2025-02-04 19:05:01 +01:00
SpiritCroc
48302d4c12 Merge tag 'v1.6.30' into sc 
tag

Change-Id: I65447b029a4a06268bc0f2110232a427a9274c3a

Conflicts:
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
 2025-02-04 19:03:51 +01:00
SpiritCroc
a1a608df38 [TMP] Automatic upstream merge preparation 
Change-Id: I39e7e63e80ec833133756bdd34bd64e9ce19857b
 2025-02-04 19:02:52 +01:00
SpiritCroc
8c22dd70f5 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I5b65a6407b3367723a07c2b7bd2b679af4f3a828
 2025-02-04 19:02:51 +01:00
Benoit Marty
73a0ec7f3c Merge branch 'release/1.6.30' into main 2025-02-04 10:42:57 +01:00
Benoit Marty
febd9fe0cd Adding fastlane file for version 1.6.30 2025-02-04 10:42:49 +01:00
Benoit Marty
a8b9634ae1 Changelog for version 1.6.30 2025-02-04 10:42:29 +01:00
Benoit Marty
35f399aa80
Merge pull request #8989 from christianrowlands/bugfix/cmr/incoming-call-crash 
#8964 Fix app crash on incoming call when running Android 14+
 2025-02-04 10:36:06 +01:00
Christian Rowlands
2c2f8bdadc #8964 Adds a callState null check before starting the MicrophoneAccessService 2025-01-28 08:26:19 -05:00
Jorge Martin Espinosa
ed2b9a1238
Merge pull request #8993 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.38.2 
Bump io.element.android:wysiwyg from 2.37.4 to 2.38.2
 2025-01-24 11:55:34 +01:00
Jorge Martín
176f8e8618 Fix proguard rules 2025-01-24 10:25:12 +01:00
Jorge Martín
c5643acaee Fix deprecations in UserLiveLocationViewStateMapper 2025-01-24 09:51:01 +01:00
dependabot[bot]
6ac7666a86
Bump io.element.android:wysiwyg from 2.37.4 to 2.38.2 
Bumps [io.element.android:wysiwyg](https://github.com/element-hq/matrix-rich-text-editor) from 2.37.4 to 2.38.2.
- [Changelog](https://github.com/element-hq/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/element-hq/matrix-rich-text-editor/commits/2.38.2)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-01-23 23:06:08 +00:00
Christian Rowlands
af906ce67b #8964 Start the MicrophoneAccessService during onPause if the call has been answered 2025-01-20 10:54:08 -05:00
SpiritCroc
ea3ddca83c Disable sunset for now 
Probably won't work like this either way since we still use the old
login flow? Anyway needs some more consideration/testing later

Change-Id: I0e1180c2165b7389883b8e7ca24c0978dc8701ce
sc_last_v1.6.28 		2025-01-19 15:15:50 +01:00
SpiritCroc
0cb4cec552 Automatic SchildiChat string correction 
Change-Id: Ic5bff3d9c2ddec62d9f07f2f6fb08db410bbdd1d
 2025-01-19 14:51:21 +01:00
SpiritCroc
02a96fa444 Fix strings mentioning "SchildiChat X" instead of Next 
Change-Id: Ib5bbad504da340ae9bad0144f23cb949c70b9c0e
 2025-01-19 14:50:47 +01:00
SpiritCroc
f48b1a7372 Automatic SchildiChat string correction 
Change-Id: I6cbf6352dc3b01f2a674bd629a8afc87d7684f0f
 2025-01-19 14:43:01 +01:00
SpiritCroc
8f9e0629b7 Automatic upstream merge postprocessing 
Change-Id: I8cdc1a64e2765fc2edc003611e10028149a68b52
 2025-01-19 14:43:00 +01:00
SpiritCroc
49c9094968 Merge tag 'v1.6.28' into sc 
Tag

Change-Id: I9b63a0f5516889a752b601bebfced802284c6b0b
 2025-01-19 14:42:55 +01:00
SpiritCroc
b640b8ee69 [TMP] Automatic upstream merge preparation 
Change-Id: I2a0a2176adb2ebe3a3505076a8db1fbfb1ceb92b
 2025-01-19 14:41:44 +01:00
SpiritCroc
a40053488c Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I613ad95dfa1bc36d6b89e839dc946cec257a8255
 2025-01-19 14:41:44 +01:00
Benoit Marty
cdb8e9dda7 Release script: ignore error when installing on real device. 2025-01-17 16:24:24 +01:00
Benoit Marty
1620981cf4
Merge pull request #8990 from element-hq/feature/bma/licenseUpdate 
Dual licensing: AGPL + Element Commercial
 2025-01-14 11:16:13 +01:00
Benoit Marty
5893c7066b Apply dual licenses: update ide copyright template. 2025-01-14 10:34:03 +01:00
Benoit Marty
d4e3d451ba Apply dual licenses: AGPL + Element Commercial to file headers. 
2 replace all actions have been performed:
- "SPDX-License-Identifier: AGPL-3.0-only" to "SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial"
- "Please see LICENSE in the repository root for full details." to "Please see LICENSE files in the repository root for full details."
 2025-01-14 10:27:57 +01:00
Benoit Marty
1fd27a54a3 Update README with dual licensing 2025-01-14 10:22:49 +01:00
Benoit Marty
de0c245ae9 New LICENSE-COMMERCIAL file 2025-01-14 10:20:10 +01:00
Christian Rowlands
36a74f4912 #8964 Fix app crash on incoming call when running Android 14+ 2025-01-13 11:58:10 -05:00
Benoit Marty
6fc948dfd0 version++ 2025-01-13 16:10:56 +01:00
Benoit Marty
fa8c4ebc8d Merge tag 'v1.6.28' into develop 
Tag
 2025-01-13 16:09:55 +01:00
Benoit Marty
069aa9d2db Merge branch 'release/1.6.28' into main 2025-01-13 16:09:41 +01:00
Benoit Marty
6718ed8875 Adding fastlane file for version 1.6.28 2025-01-13 16:09:33 +01:00
Benoit Marty
5c3f221373 Changelog for version 1.6.28 2025-01-13 16:08:45 +01:00
Benoit Marty
18c9473642
Merge pull request #8986 from element-hq/feature/bma/syncStrings 
Sync strings
 2025-01-13 15:41:42 +01:00
Benoit Marty
624a07bcc9
Merge pull request #8877 from element-hq/guillaumev/sonarcloud-rename 
Update sonarcloud project key
 2025-01-13 15:26:37 +01:00
Benoit Marty
f26a0b6615 Fix lint issues with translations. (Also updated on Weblate) 2025-01-13 15:00:10 +01:00
Benoit Marty
d97f69b551
Merge pull request #8908 from toshanmugaraj/FileAtachmentCrash 
Fix file attachment crash
 2025-01-13 14:50:04 +01:00
Benoit Marty
002f36606a Fix issue with Weblate sync. 2025-01-13 14:31:11 +01:00
Benoit Marty
93d6f32679
Merge pull request #8967 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2025-01-13 14:23:33 +01:00
Benoit Marty
e42075a338
Merge pull request #8983 from element-hq/feature/bma/sunsetApplication 
Sunset application - first step
 2025-01-13 14:17:09 +01:00
daniel
6278f59b57 Translated using Weblate (German) 
Currently translated at 100.0% (2647 of 2647 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2025-01-12 18:41:44 +00:00
Benoit Marty
0e4c39b26e Fix quality issue. 2025-01-10 14:15:12 +01:00
Benoit Marty
ded1fddca3 Add null content description. 2025-01-10 14:10:14 +01:00
Benoit Marty
5dfbc3fce1 Update learn more target url. 2025-01-10 12:13:45 +01:00
Benoit Marty
b9b403d075 Open account creation screen (with error) when crating an account on default server which only support MAS) 2025-01-10 12:12:58 +01:00
Benoit Marty
d2c77a36ec MAS require Element X 2025-01-08 15:17:56 +01:00
LinAGKar
fefdb785a2 Translated using Weblate (Swedish) 
Currently translated at 100.0% (113 of 113 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
 2025-01-08 10:56:51 +00:00
Someone
73c1dc1ca1 Translated using Weblate (Vietnamese) 
Currently translated at 89.1% (2360 of 2647 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
 2024-12-30 12:33:05 +00:00
Priit Jõerüüt
05a7194740 Translated using Weblate (Estonian) 
Currently translated at 100.0% (113 of 113 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
 2024-12-24 15:14:15 +00:00