Commit Graph

263 Commits

Author SHA1 Message Date
valere
3e1b59d062 Merge branch 'develop' into feature/bca/rust_flavor 2023-04-06 08:53:20 +02:00
ganfra
ac65defe56 Replace Terms and Conditions with Acceptable Use Policy. 2023-03-30 20:41:05 +02:00
valere
33535a5746 lint 2023-03-30 11:23:43 +02:00
valere
438b0a69ea Fix unused resource 2023-03-29 09:59:49 +02:00
valere
927f7757cd Merge branch 'develop' into feature/bca/rust_flavor 2023-03-28 17:17:35 +02:00
Yoan Pintas
9fd1a22e10
Pillify permalinks (#8242) 2023-03-21 21:31:45 +00:00
valere
14d28a01a6 unused resource 2023-03-15 20:46:01 +01:00
valere
95b6c2ae48 unused resource 2023-03-15 16:16:51 +01:00
valere
c3bcdb1c28 unused resource 2023-03-15 14:20:57 +01:00
valere
5f185c51e7 Merge branch 'develop' into feature/bca/rust_flavor 2023-03-09 18:21:41 +01:00
Yoan Pintas
94675b9f85
create encrypted DM for user invite by email (#8172)
Co-authored-by: jonnyandrew <jonny.andrew@protonmail.com>
2023-03-06 22:05:43 +00:00
Florian Renaud
0d28b3a860 Handle errors when updating push rules 2023-02-23 09:24:13 +01:00
Benoit Marty
2453f2cee0
Merge pull request #8115 from luixxiul/localization-3
Replace 'Use Bots' with 'Use bots' for localization experience on Weblate
2023-02-16 10:16:23 +01:00
Maxime NATUREL
552af673ff
Merge pull request #8069 from vector-im/feature/mna/poll-history-details
[Poll] History list: details screen of a poll (PSG-1041, PSG-1151)
2023-02-13 17:47:54 +01:00
Suguru Hirahara
6cc089a774
Replace 'Use Bots' with 'Use bots'
Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
2023-02-11 02:25:51 +09:00
Hugh Nimmo-Smith
10a1ea033b Merge branch 'develop' into hughns/msc3824-oidc-aware 2023-02-09 09:53:26 +00:00
jonnyandrew
d922126f4b
[Rich text editor] Add code block, quote and list indentation actions (#8045)
* Add remaining rich text editor actions

* Render code blocks in the timeline

* Hide indentation buttons when not in a list
2023-02-08 17:47:22 +00:00
valere
b48e6f5d71 Merge branch 'develop' into feature/bca/rust_flavor 2023-02-06 10:29:00 +01:00
Maxime NATUREL
384e7f674d Adding go to timeline event button 2023-02-02 17:55:55 +01:00
yostyle
369c0f166d Let the user know when we are not able to decrypt the voice broadcast chunks 2023-02-01 17:28:42 +01:00
jonnyandrew
00f9c362da
[Rich text editor] Add inline code to rich text editor (#8011)
Also:
- Fixes https://github.com/vector-im/element-android/issues/7975
- See https://github.com/noties/Markwon/issues/423
2023-01-30 17:35:29 +00:00
Hugh Nimmo-Smith
dcf3872c33 Merge branch 'develop' into hughns/msc3824-oidc-aware 2023-01-25 14:53:16 +00:00
valere
8b50fa3828 Merge branch 'develop' into feature/bca/rust_flavor 2023-01-25 15:17:17 +01:00
Benoit Marty
42d27af90c Handle String TODO. Keep interesting error_check_network 2023-01-25 12:04:13 +01:00
Florian Renaud
fea3441bbf Pause voice broadcast if there is no network 2023-01-24 07:32:35 +01:00
Hugh Nimmo-Smith
8cf29f65cd Design update 2023-01-23 17:13:59 +00:00
valere
4ee53ad9d0 Merge branch 'develop' into feature/bca/rust_flavor 2023-01-23 09:17:26 +01:00
yostyle
ba9720416a Send voice message should not be allowed during a voice broadcast recording 2023-01-19 08:44:53 +01:00
valere
1ab4a2fd8a Merge branch 'develop' into feature/bca/rust_flavor 2023-01-18 23:38:10 +01:00
Hugh Nimmo-Smith
3333d86776 Merge branch 'develop' into hughns/msc3824-oidc-aware 2023-01-18 17:08:16 +00:00
Hugh Nimmo-Smith
1ac04b0070 Merge branch 'develop' into hughns/msc3824-oidc-aware 2023-01-18 17:05:36 +00:00
Maxime NATUREL
0cdbceaa00
Merge pull request #7951 from vector-im/feature/mna/poll-history-load-more-ui
[Poll] History list: Load more UI mechanism (PSG-1095)
2023-01-18 09:35:25 +01:00
Benoit Marty
5ff9792237
Merge pull request #7949 from vector-im/feature/bma/fixSmallBugs
Fix small bugs
2023-01-17 16:47:53 +01:00
Maxime NATUREL
98fff95f6a Display message to user in case of loading error 2023-01-17 16:04:33 +01:00
Maxime NATUREL
c91761240a Handle sync when landing on the screen 2023-01-17 16:04:33 +01:00
Maxime NATUREL
ec65564800 Render specific empty list message when loading more is still possible 2023-01-17 16:04:33 +01:00
Maxime NATUREL
e8e94b5189 Adding load more item at the end of the list of polls 2023-01-17 16:04:32 +01:00
Maxime NATUREL
6b98b3023e
Merge pull request #7851 from vector-im/feature/mna/poll-message-decryption-error
[Poll] Warning message on decryption failure of some events (PSG-1025)
2023-01-16 10:19:00 +01:00
valere
4ae93d5a2c Merge branch 'develop' into feature/bca/rust_flavor 2023-01-15 17:17:22 +01:00
valere
607f375bcd fix cancel user verification
remove dead code
2023-01-15 17:13:00 +01:00
Florian Renaud
31e599f2e2
Merge pull request #7919 from vector-im/bugfix/fre/handle_vb_playback_crash
Voice Broadcast - Handle exceptions during playback
2023-01-13 18:29:28 +01:00
Benoit Marty
06ac22488e Fix typo. 2023-01-13 10:45:09 +01:00
Florian Renaud
72e0dc4bd2 Voice Broadcast - only send a notification on the first chunk 2023-01-12 18:08:43 +01:00
valere
c0397875f0 Merge branch 'develop' into feature/bca/rust_flavor 2023-01-12 14:51:03 +01:00
Maxime NATUREL
3b9faa5f31 Render specific message on decryption error 2023-01-12 10:01:49 +01:00
Onuray Sahin
c012d559b7
Merge pull request #7900 from vector-im/feature/ons/render_ended_poll
Render ended polls (PSG-904)
2023-01-10 21:06:03 +03:00
Florian Renaud
2d24eb1273 Handle playback error 2023-01-10 15:42:37 +01:00
Onuray Sahin
a8b111dc8c Code review fixes. 2023-01-10 15:04:13 +03:00
valere
13d3f4f1a7 Merge branch 'develop' into feature/bca/rust_flavor 2023-01-10 08:55:04 +01:00
valere
3bae04c04a Merge branch 'develop' into feature/bca/rust_flavor 2023-01-09 23:46:14 +01:00