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

1160 Commits

Author SHA1 Message Date
Onuray Sahin
2e2dffd9c9 Merge branch 'develop' into live_location_labs_flag 
* develop:
  Space explore rooms screen alignment with design in figma (#5834)
  leaving space aligned with ios (#5942)
  Fix usage of System.currentTimeMillis(). This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
 2022-05-19 12:52:05 +03:00
fedrunov
a30912f688
Space explore rooms screen alignment with design in figma (#5834) 2022-05-19 11:49:20 +02:00
fedrunov
18842b5e3d
leaving space aligned with ios (#5942) 2022-05-19 11:49:08 +02:00
Onuray Sahin
5b43257f35 Changelog added. 2022-05-19 12:44:51 +03:00
Michael Kaye
5260e729ac
Merge pull request #6095 from vector-im/michaelk/correct_well_known_behaviour 
Well known lookups should be to port 443 only.
 2022-05-18 16:50:43 +01:00
Michael Kaye
9c99d12c44 Changelog.d 2022-05-18 15:32:06 +01:00
Benoit Marty
7ae3f6ea40
Merge pull request #6083 from vector-im/feature/bma/remove_badge 
Remove ShortcutBadger lib and usage (it was dead code)
 2022-05-18 16:19:37 +02:00
Maxime NATUREL
738ce18a2f
Merge pull request #5989 from vector-im/feature/mna/PSF-884-location-view 
[Location sharing] - Message for live sharing in timeline (PSF-884)
 2022-05-18 15:39:51 +02:00
Maxime NATUREL
b2765e4b63 Adding changelog entry 2022-05-18 14:44:44 +02:00
Benoit Marty
328d834851 changelog 2022-05-18 13:09:58 +02:00
Jorge Martín
123ad87eda Notify other devices of acceptance of verification request 2022-05-18 12:31:32 +02:00
Michael Kaye
f7303789a0
Merge pull request #6025 from vector-im/michaelk/skip_tests_failing_on_ci 
Improve test handling in CI
 2022-05-18 09:51:17 +01:00
Benoit Marty
adb537006a Remove ShortcutBadger lib and usage (it was dead code) 2022-05-18 09:06:04 +02:00
Benoit Marty
e14b9a445e Towncrier 2022-05-17 21:13:08 +02:00
ariskotsomitopoulos
abbc57429a Add changelog 2022-05-17 17:16:27 +03:00
Onuray Sahin
edd35872f3 Fix ending poll power level condition. 2022-05-17 15:44:39 +03:00
Benoit Marty
46e8737426
Merge pull request #6039 from vector-im/feature/dla/fix-sip-on-unhold 
Direction and track need to be set for hold/unhold
 2022-05-17 14:33:02 +02:00
ericdecanini
520c3e474c Adds changelog file 2022-05-17 12:02:29 +02:00
ariskotsomitopoulos
324856d700 Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
 2022-05-17 11:55:07 +03:00
Michael Kaye
012b20fca6 changelog.d 2022-05-16 15:59:41 +01:00
Benoit Marty
afd2804ed3
Merge branch 'develop' into feature/mna/PSF-884-location-view 2022-05-16 14:42:38 +02:00
Adam Brown
a893f5acdb applying the manual reordering of the sign up stages only when matrix.org is selected 
- lifts the logic up to the view model
 2022-05-16 12:33:54 +01:00
Benoit Marty
5387c9101e Changelog 2022-05-16 12:23:10 +02:00
Benoit Marty
15366f8d2a
Merge pull request #5973 from vector-im/michaelk/document_public_baseurl_requirement 
Document need for public_baseurl to be correctly set.
 2022-05-16 11:27:31 +02:00
Benoit Marty
90035de5f2
Merge pull request #6047 from chagai95/add-presence-indicator-busy-and-away 
add presence indicator busy and away
 2022-05-16 11:26:11 +02:00
Benoit Marty
9234c60155
Merge pull request #6038 from vector-im/feature/bma/detekt 
Detekt
 2022-05-13 23:40:53 +02:00
chagai95
491b3c351b
Create 6047.feature 2022-05-13 14:00:32 +02:00
Benoit Marty
d17a273cb4 Changelog 2022-05-12 22:56:09 +02:00
Valere
22e0506814 Prevent 4S / megolm backup desync + sign with MSK 2022-05-12 18:45:35 +02:00
David Langley
44e8974c02 direction and track need to be set for hold/unhold 2022-05-12 17:01:44 +01:00
Ahmed Radhouane Belkilani
6a523ccc38 Allow using the latest user avatar and display name for all messages in the timeline 
Signed-off-by: Jorge Martín Espinosa <jorgem@element.io>
 2022-05-12 15:43:20 +02:00
ericdecanini
52c404ac9c Merge remote-tracking branch 'origin/develop' into feature/eric/replace-search-room-subheader 2022-05-12 14:36:04 +02:00
ariskotsomitopoulos
40de685f1a Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
 2022-05-12 14:41:38 +03:00
Benoit Marty
cd509accdb
Merge pull request #5936 from hanthor/develop 
Added themed icon for Android 13
 2022-05-11 17:34:38 +02:00
Valere
304cb07858
Merge pull request #5559 from vector-im/feature/bca/crypto_better_key_share 
Update/Revise SDK to implement reference flowchart for key sharing/forwarding + use backup
 2022-05-11 12:05:58 +02:00
Travis Ralston
019ec6c1c8
Merge pull request #5997 from vector-im/travis/spec/v1.3-edit/nothreads 
Remove spec v1.3 check for threads
 2022-05-10 14:47:48 -06:00
Travis Ralston
f1de116eff add changelog 2022-05-10 13:18:12 -06:00
Valere
12ab4787f1 Merge branch 'develop' into feature/bca/crypto_better_key_share 2022-05-10 19:30:52 +02:00
Benoit Marty
eafe65b417
Merge pull request #5831 from emotionalamoeba/develop 
Updated copy and moved override in profile screen
 2022-05-10 14:40:40 +02:00
Adam Brown
ece48baa9d
Merge pull request #5965 from vector-im/feature/adm/matrix-id-certificate 
Handling SSL/TLS errors during WellKnown lookup
 2022-05-10 12:17:48 +01:00
Onuray Sahin
185cd316c9
Merge pull request #5911 from vector-im/feature/ons/voip_screen_sharing 
Screen sharing over WebRTC
 2022-05-10 13:06:33 +03:00
Benoit Marty
e35bb772c1
Merge pull request #5941 from vector-im/feature/bma/konfetti_speed 
No animation -> no chat effect
 2022-05-09 17:05:53 +02:00
Maxime NATUREL
889e09a891 Adding changelog entry 2022-05-09 15:15:33 +02:00
Michael Kaye
21fc4e31b4 Towncrier 2022-05-09 11:54:59 +01:00
hanthor
e1960e9593
Merge branch 'vector-im:develop' into develop 2022-05-06 14:57:11 -04:00
Adam Brown
e97cdb03fa updating the well known lookup to take into account certificate errors when triggered via the sign in with matrix id flow 2022-05-06 16:38:40 +01:00
Aris Kotsomitopoulos
3c9b5d2ec0
Merge pull request #5927 from vector-im/feature/aris/threads_improve_rendering_issue_5151 
Feature/aris/threads improve rendering issue 5151
 2022-05-06 17:19:01 +03:00
ariskotsomitopoulos
87c42898ee Add changelog 2022-05-06 12:16:10 +03:00
ericdecanini
1cb14d6be7 Adds changelog file 2022-05-05 19:16:53 +02:00
hanthor
6cd92a5d77
Merge branch 'vector-im:develop' into develop 2022-05-05 12:23:46 -04:00