Commit Graph

23617 Commits

Author SHA1 Message Date
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 #8577 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 #8666 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 #8710 from element-hq/feature/bma/elementHq
Element hq
2023-12-21 09:14:58 +01:00
Benoit Marty 6feee61f17
Merge pull request #8711 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 #8672 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 #8698 from vector-im/feature/bma/mdm
Implement Mobile Device Manager feature with 3 keys.
2023-12-11 17:03:28 +01:00
Benoit Marty 9652932095
Merge pull request #8706 from vector-im/sync-sas-strings
Sync SAS Strings
2023-12-11 16:04:44 +01:00
bmarty 9c6fbcd141 Sync SAS Strings 2023-12-11 00:03:20 +00:00
bmarty 7e40b933c0 Sync analytics plan 2023-12-11 00:03:18 +00:00
Benoit Marty 4d5fefa105 Fix issue on chinese language resource. 2023-12-06 14:57:50 +01:00
Benoit Marty 5e4b8ed536
Merge pull request #8700 from vector-im/feature/fga/handle_functional_members
Support Functional members #3736
2023-12-06 14:16:11 +01:00
Benoit Marty bb866601ef Fix test compilation issue. 2023-12-05 14:25:36 +01:00
Benoit Marty 6452b5c2b4 Make DefaultMdmService a singleton and use Binds instead of Provides. 2023-12-04 17:54:48 +01:00
Benoit Marty 882020fdba Fix test compilation issue. 2023-12-04 15:54:17 +01:00
Benoit Marty 7e2b01b3fd Add link to spec in changelog. 2023-12-04 09:21:32 +01:00
Benoit Marty 778dab7bb7 Cleanup and safer Json model. 2023-12-04 09:20:25 +01:00
Benoit Marty 8e0c503b45 Support Functional members #3736 2023-12-04 09:16:26 +01:00
Benoit Marty 5987ca9c48 changelog 2023-11-30 18:24:58 +01:00
Benoit Marty fb077d5065 Implement Mobile Device Manager feature with 3 keys. 2023-11-30 18:18:00 +01:00
Benoit Marty bb9d1fc8d8 version++ 2023-11-28 17:23:40 +01:00
Benoit Marty f6ca7e5d0b Merge tag 'v1.6.8' into develop
tag
2023-11-28 17:19:08 +01:00
Benoit Marty 552b143f8c Merge branch 'release/1.6.8' into main 2023-11-28 17:18:51 +01:00
Weblate f46a9d6cc8 Update release script now that there is only on crypto implementation. 2023-11-28 17:17:44 +01:00
Benoit Marty b27dc02cfd Adding fastlane file for version 1.6.8 2023-11-28 17:13:37 +01:00
Benoit Marty 6ba03f82e4 Changelog for version 1.6.8 2023-11-28 17:12:03 +01:00
jonnyandrew a6fafb07da
Remove quote from message actions menu (#8689) 2023-11-27 16:30:44 +00:00
Benoit Marty 0c1f190035
Merge pull request #8674 from vector-im/feature/bma/infiniteRingCall
Ensure Background sync is not stopped when there is an active call.
2023-11-23 17:45:20 +01:00
Benoit Marty 8d85d047b7 Ensure Background sync is not stopped when there is an active call, even when the app goes to background. 2023-11-22 09:42:39 +01:00
Benoit Marty 84158ece37 Ensure Background sync is not stopped when there is an active call.
It was happening since the application is foregrounded when VectorCallActivity is displayed.
2023-11-22 09:31:20 +01:00
jonnyandrew 63ef40f58b
Fix issue with timeline message view reuse while rich text editor is enabled (#8688) 2023-11-17 17:09:18 +00:00
yostyle 31d3b9d385 Add changelog 2023-11-16 16:29:26 +01:00
yostyle 7755da881e Move crypto migration 2023-11-16 16:29:26 +01:00
giomfo fd5530a2f9
Merge pull request #8683 from vector-im/giomfo/fix_custom_gateway_check
Unified Push: Ignore the potential SSL error when the custom gateway is testing
2023-11-15 22:26:06 +01:00
Giom Foret ee2fd9f123 add changelog 2023-11-15 17:20:37 +01:00
Giom Foret 7c58af735b Unified Push: Ignore the potential SSL error when the custom gateway is testing
When the Unified Push is enabled, the application checks the potential custom gateway before applying it. If an SSL error happens, the application may ignore this error and keep using this custom gateway. The actual SSL check will be done server side where this gateway is actually used.
2023-11-15 17:10:44 +01:00
Valere 1a941149ab
Merge pull request #8679 from vector-im/feature/bca/bump_crypto_sdk_version
bump crypto sdk to 0.3.16
2023-11-14 22:26:32 +01:00
Benoit Marty 98e09eedc3
Merge pull request #8671 from yostyle/yostyle/update_email_regex
Update regex for email address to be aligned on RFC 5322
2023-11-14 14:32:00 +01:00
yostyle 3d7489c7c5 Fix PR comment 2023-11-14 12:38:10 +01:00