Commit graph

23547 commits

Author SHA1 Message Date
Benoit Marty
d49f6bfbb6 Equivalent code. 2024-02-02 13:56:44 +01:00
Jorge Martin Espinosa
d75ca516fc
Merge pull request from element-hq/fix/jme/update-login-splash-screen
Make 'sign in' flow more important in the initial screen
2024-02-02 09:58:16 +01:00
Benoit Marty
1277f6fdd9
Merge pull request from element-hq/feature/bma/usedDecryptedEvent
[Crypto] Improve Event.getClearContent() and fix assignement issue.
2024-02-02 09:47:22 +01:00
Benoit Marty
3611052386 Add changelog. 2024-02-02 09:46:44 +01:00
Benoit Marty
96648bbd0e
Merge pull request from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.27.0
Bump io.element.android:wysiwyg from 2.25.0 to 2.27.0
2024-02-02 09:39:44 +01:00
dependabot[bot]
393c40e652
Bump io.element.android:wysiwyg from 2.25.0 to 2.27.0
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.25.0 to 2.27.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/2.25.0...2.27.0)

---
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>
2024-02-01 23:41:07 +00:00
Benoit Marty
7dc8c436cf Fix test. getClearContent() return the decrypted content for encrypted Event, and it is null in this case 2024-02-01 18:43:59 +01:00
Benoit Marty
ec96f4e0ae Fix assignment issue. sessionId was used instead of roomId.
This may fix issue of Event not decrypted if the key is coming late for the last Event displayed in the Room list.
2024-02-01 18:11:44 +01:00
Benoit Marty
e04bfe8981 Remove dead code 2024-02-01 18:02:04 +01:00
Benoit Marty
a1140fd8fa Improve getClearContent() method: it should not fallback to the encrypted content when the content is not decrypted. 2024-02-01 17:28:29 +01:00
Benoit Marty
cc355a8e14
Merge pull request from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.25.0
Bump io.element.android:wysiwyg from 2.24.0 to 2.25.0
2024-01-31 08:42:23 +01:00
Jorge Martín
4cd7c60032 Make 'sign in' flow more important in the initial screen 2024-01-30 12:20:56 +01:00
Benoit Marty
d418525748
Merge pull request from element-hq/feature/bma/fixRelease
Fix release script which download artifact
2024-01-17 17:55:40 +01:00
Benoit Marty
a5df7649a3
Merge pull request from davidegirardi/patch-1
Point to Element security@ address and policy
2024-01-17 09:55:26 +01:00
davidegirardi
34c75bd6c2
Point to Element security@ address and policy 2024-01-17 09:27:39 +01:00
Benoit Marty
122018dd7b fix typo 2024-01-15 10:56:15 +01:00
dependabot[bot]
0f3d22bc85
Bump io.element.android:wysiwyg from 2.24.0 to 2.25.0
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.24.0 to 2.25.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/2.24.0...2.25.0)

---
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>
2024-01-12 23:41:59 +00:00
Benoit Marty
42696eb31d Fix parsing after artifact url change on GitHub 2024-01-09 14:04:55 +01:00
Benoit Marty
ee16ef06e9 version++ 2024-01-09 12:20:07 +01:00
Benoit Marty
a080826242 Merge tag 'v1.6.10' into develop
tag
2024-01-09 12:16:39 +01:00
Benoit Marty
493093c2a7 Merge branch 'release/1.6.10' into main 2024-01-09 12:16:21 +01:00
Benoit Marty
ac79b2ee63 Adding fastlane file for version 1.6.10 2024-01-09 12:16:15 +01:00
Benoit Marty
5c6e1d5378 Changelog for version 1.6.10 2024-01-09 12:15:28 +01:00
Benoit Marty
4c8ffbd169
Merge pull request from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.24.0
Bump io.element.android:wysiwyg from 2.22.0 to 2.24.0
2024-01-08 09:02:03 +01:00
dependabot[bot]
924913165e
Bump io.element.android:wysiwyg from 2.22.0 to 2.24.0
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.22.0 to 2.24.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/2.22.0...2.24.0)

---
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>
2024-01-05 23:19:07 +00:00
ganfra
e596196f99
Merge pull request from element-hq/feature/fga/fix_event_edition_reply
Fix a bunch of issues related to edition and reply 
2024-01-02 14:02:52 +01:00
manuroe
7a2520b03c
Merge pull request from element-hq/manu/issue_triaging_cleanup
GH actions: remove triaging process and old GH projects
2024-01-02 12:11:22 +01:00
manuroe
60d4221016 GH actions: remove triaging process and old GH projects 2024-01-02 11:00:54 +01:00
ganfra
2ada4c8491 Fix quality 2024-01-02 08:17:26 +01:00
ganfra
320aae1430 Also fix pills with rich text editor 2024-01-02 08:17:26 +01:00
ganfra
b72039e735 Fix a bunch of issues related to edition and reply 2024-01-02 08:17:26 +01:00
Jorge Martin Espinosa
c46b3148e4
Try fixing exodus CI job ()
* Ignore tracker count retrieved by exodus job so the report can be created

* Ignore Sentry, since it's a known and optional tracker
2024-01-02 08:16:27 +01:00
Benoit Marty
dff9b82185 Revert change on those files, that should fix Weblate conflict
I am receiving 1 mail per hour about that
2023-12-22 09:48:03 +01:00
Benoit Marty
25d1945cdc
Merge pull request from element-hq/sync-analytics-plan
Sync analytics plan
2023-12-21 14:19:59 +01:00
Benoit Marty
03966f1c13 Fix KDoc (I know I should not edit this, but its fine) 2023-12-21 09:38:03 +01:00
Benoit Marty
e818f86896
Merge pull request from yostyle/yostyle/fix_crypto_migration
Move crypto migration
2023-12-21 09:33:17 +01:00
Benoit Marty
d610f75f1b Fix compilation issue.
This extension is only used for Test
2023-12-21 09:30:46 +01:00
Benoit Marty
7242ad48c2 No need to use also here. 2023-12-21 09:29:31 +01:00
Benoit Marty
abccc7dd9f
Merge pull request from element-hq/feature/bma/elementHq
Element hq
2023-12-21 09:14:58 +01:00
Benoit Marty
6feee61f17
Merge pull request from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.22.0
Bump io.element.android:wysiwyg from 2.14.1 to 2.22.0
2023-12-20 15:05:11 +01:00
Benoit Marty
644587a98c Fix crash... 2023-12-20 10:16:29 +01:00
Benoit Marty
fac8dd333a RTE: fix API break... 2023-12-20 10:16:29 +01:00
Yoan Pintas
f3c6535011
Merge branch 'element-hq:develop' into yostyle/fix_crypto_migration 2023-12-18 08:35:32 +00:00
Benoit Marty
431a1a6fb2
Merge pull request from Amir-yazdanmanesh/develop
Change jitsi-meet constants URL
2023-12-15 18:10:40 +01:00
yostyle
18ccc25575 fix lint 2023-12-15 12:25:29 +01:00
Yoan Pintas
7f8e73ee4d
Merge branch 'element-hq:develop' into yostyle/fix_crypto_migration 2023-12-15 10:36:32 +00:00
dependabot[bot]
d145c3108d
Bump io.element.android:wysiwyg from 2.14.1 to 2.22.0
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.14.1 to 2.22.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/2.14.1...2.22.0)

---
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>
2023-12-14 23:52:20 +00:00
Benoit Marty
b6e3e875ac Organization renaming: vector-im -> element-hq 2023-12-13 11:09:03 +01:00
Benoit Marty
6d65a74f1d Organization renaming: replace all https://github.com/vector-im by https://github.com/element-hq 2023-12-13 11:01:40 +01:00
Benoit Marty
1c1c89fb86
Merge pull request from vector-im/feature/bma/mdm
Implement Mobile Device Manager feature with 3 keys.
2023-12-11 17:03:28 +01:00