filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,171 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

1036 Commits

Author SHA1 Message Date
Eric Decanini eeb7d60e59
Merge pull request #5860 from vector-im/feature/eric/replace-search-room-subheader 
Replaces subtitle in Search Rooms with room context rather than last event
 2022-05-30 11:13:10 +02:00
Eric Decanini b8c0c61a4c
Merge pull request #6073 from vector-im/feature/eric/improve-back-navigation 
Adds up navigation in spaces
 2022-05-30 10:38:28 +02:00
Adam Brown 0675b7c16c
Merge pull request #5995 from vector-im/feature/adm/ftue-sign-in 
FTUE - Sign in
 2022-05-25 17:30:03 +01:00
Valere 136d2e330a added change log 2022-05-25 16:52:56 +02:00
Valere 52eb48d808
Merge pull request #6077 from vector-im/feature/aris/crypto_replay_attack 
Feature/aris/crypto replay attack
 2022-05-25 16:20:26 +02:00
Maxime NATUREL c8fb034c57
Merge pull request #6128 from vector-im/feature/mna/PSF-999-auto-refresh-db 
[Location sharing] - Update DB entity when a live is timed out (PSF-999)
 2022-05-25 14:59:54 +02:00
Johannes Marbach f5a621a6d5
Merge pull request #6140 from vector-im/johannes/widget-screen-rotation 
Prevent widget web view from reloading on screen / orientation change (PSF-1034)
 2022-05-25 13:42:24 +02:00
Adam Brown b76899a6e0 adding changelog entry 2022-05-25 10:22:27 +01:00
Adam Brown ae9922a731
Merge pull request #6136 from vector-im/feature/adm/foss-avoid-gms-location-provider 
Excluding the gms play-service-location from maplibre for fdroid builds
 2022-05-25 08:59:18 +01:00
Michael Kaye 20422a5451 towncrier 2022-05-24 16:40:03 +01:00
Johannes Marbach 7913a42664 Add changelog file 2022-05-24 16:36:26 +02:00
Adam Brown bec72264cd excluding the gms play-service-location optional transistive dependency for the fdroid variant 
- fixes fdroid being unable to compile the project due to a non foss dependency
 2022-05-24 10:10:03 +01:00
Adam Brown a59b8bf50c
Merge pull request #6065 from vector-im/feature/adm/matrix-org-ordering 
FTUE - Only override sign up steps for `matrix.org`
 2022-05-23 21:24:48 +01:00
Maxime NATUREL 695c234139 Adding changelog entry 2022-05-23 17:34:51 +02:00
Maxime NATUREL 9a38d59f9a
Merge pull request #6092 from vector-im/feature/mna/PSF-888-navigation 
[Location sharing] - Navigation to Map view from live location message (PSF-888)
 2022-05-23 13:54:04 +02:00
Benoit Marty fd252dbaff
Merge pull request #5856 from ofalvai/bugfix/ofa/read-recept-text-scale 
Use fixed text size in read receipt counter
 2022-05-23 13:41:03 +02:00
Adam Brown 98999c754f
Merge pull request #5868 from vector-im/feature/adm/ftue-email-verification 
[FTUE] - Email input and verification
 2022-05-23 11:14:46 +01:00
Benoit Marty 71e14ea43b
Merge pull request #6110 from vector-im/defect/jorgem/PSE-613-fix-multi-invites-to-room 
Fix sending multiple invites to a room reaching only one or two people
 2022-05-23 09:39:47 +02:00
Jorge Martín 96e3544a47 Fix sending multiple invites to a room reaching only one or two people 2022-05-23 08:14:32 +02:00
Onuray Sahin 109b381e2e
Merge pull request #6103 from vector-im/feature/ons/fix_live_location_flickering 
Glide - Use current drawable while loading new static map image
 2022-05-20 18:36:12 +03:00
ariskotsomitopoulos e323caa233 Merge branch 'develop' into feature/aris/crypto_replay_attack 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
 2022-05-20 15:46:15 +03:00
ariskotsomitopoulos c958d3a383 Merge branch 'develop' into feature/aris/crypto_replay_attack 2022-05-20 15:43:08 +03:00
Adam Brown 735adf0c96 adding changelog entry 2022-05-20 12:11:44 +01:00
Onuray Sahin 468cc30019 Changelog added. 2022-05-20 12:22:24 +03:00
Benoit Marty b547a49ab3
Merge pull request #6089 from vector-im/feature/bma/real_fail 
Ensure calling 'fail()' is not caught by the Exception handler
 2022-05-20 10:33:02 +02:00
ClaireG b379ef46ec
Revert: Use member name instead of room name in DM creation item (#6049) 2022-05-19 14:14:58 +00:00
Onuray Sahin da764d7c9a
Merge pull request #6074 from vector-im/feature/ons/poll_refactoring 
Poll refactoring with unit tests (PSF-1020)
 2022-05-19 14:53:45 +03:00
Onuray Sahin 1605ae1607 Merge branch 'develop' into feature/ons/poll_refactoring 
* develop: (251 commits)
  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.
  Update TimelinePreviousLastForwardTest.kt
  Changelog.d
  Rename 'getDomain' to 'getServerName'.
  Well-known lookups should not include the port of a server.
  Ah it was used in Gplay variant. Anyway I think we can still remove this now.
  Fix parsing of location data in non encrypted room
  Additionally increment for TimelinePreviousLastForwardTest
  Notify other devices of acceptance of verification request
  Instead of using a magic number, explicitly test for the events we expect.
  Adding comments on some strings and removing non necessary plural
  Remove ShortcutBadger lib and usage (it was dead code)
  Version++
  Fastlane file
  Towncrier
  Add `.login` to get the username of the PR merger.
  Rename folder for the PlayStore
  Remove empty translations
  ...

# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
 2022-05-19 13:39:43 +03:00
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