Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,197 Commits 530 Branches 157 Tags 485 MiB
90ab40dccb
Commit Graph

18197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ericdecanini
90ab40dccb Merge remote-tracking branch 'origin/develop' into feature/eric/new-chat-bottom-sheet 2022-08-18 17:38:15 +02:00
Florian Renaud
ac0af80e48
Merge pull request #6866 from vector-im/feature/fre/start_dm_from_room_member_details 
Start DM on first message when selecting "direct message" from the room member details screen
 2022-08-18 13:04:17 +02:00
Florian Renaud
519855445e Start DM on first message when selecting "direct message" from the room member details 2022-08-18 11:37:55 +02:00
Florian Renaud
0dcab56e34
Merge pull request #6870 from vector-im/bugfix/fre/fix_emoji_unit_test 
Fix broken unit test on emoji search
 2022-08-18 11:36:28 +02:00
Florian Renaud
66092cfa25 Fix broken unit test on emoji search 2022-08-18 09:48:51 +02:00
ericdecanini
899673495a Changes copies on sheet actions 2022-08-17 21:42:39 +02:00
ericdecanini
ce8939a092 Merge remote-tracking branch 'origin/develop' into feature/eric/new-chat-bottom-sheet 
# Conflicts:
#	vector/src/main/res/values/strings.xml
 2022-08-17 21:13:39 +02:00
ericdecanini
f119de43b7 Adds explore rooms option to new chat bottom sheet 2022-08-17 21:12:08 +02:00
Benoit Marty
7a30c72828
Merge pull request #6865 from vector-im/revert-6838-dependabot/gradle/com.likethesalad.android-stem-plugin-2.2.0 
Revert "Bump stem-plugin from 2.1.1 to 2.2.0"
 2022-08-17 17:52:42 +02:00
Benoit Marty
0be7f3c356
Revert "Bump stem-plugin from 2.1.1 to 2.2.0" 2022-08-17 17:51:59 +02:00
Adam Brown
cc74dcfb90
Merge pull request #6589 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.11.1 
Bump realm-gradle-plugin from 10.11.0 to 10.11.1
 2022-08-17 16:19:14 +01:00
Benoit Marty
aef4c14b20
Merge pull request #6838 from vector-im/dependabot/gradle/com.likethesalad.android-stem-plugin-2.2.0 
Bump stem-plugin from 2.1.1 to 2.2.0
 2022-08-17 17:08:02 +02:00
Benoit Marty
5e308e02a0
Merge pull request #6716 from vector-im/dependabot/gradle/com.autonomousapps.dependency-analysis-1.12.0 
Bump com.autonomousapps.dependency-analysis from 1.11.2 to 1.12.0
 2022-08-17 17:06:55 +02:00
Benoit Marty
4485673db9
Merge pull request #6734 from vector-im/dependabot/gradle/flipper-0.157.0 
Bump flipper from 0.156.0 to 0.157.0
 2022-08-17 17:03:01 +02:00
Benoit Marty
2c82bf1990
Merge pull request #6743 from vector-im/dependabot/gradle/com.google.firebase-firebase-appdistribution-gradle-3.0.3 
Bump firebase-appdistribution-gradle from 3.0.2 to 3.0.3
 2022-08-17 17:02:11 +02:00
Benoit Marty
593c6e4b54
Merge pull request #6802 from vector-im/dependabot/gradle/fragment-1.5.2 
Bump fragment from 1.5.1 to 1.5.2
 2022-08-17 17:01:36 +02:00
Benoit Marty
8857decc87
Merge pull request #6701 from vector-im/sync-emojis 
Sync Emojis
 2022-08-17 16:32:55 +02:00
Benoit Marty
6031c50313
Merge pull request #6857 from vector-im/feature/bma/DANGER_GITHUB_API_TOKEN 
Try to fix Danger job
 2022-08-17 15:15:17 +02:00
Benoit Marty
6c860710bd
Merge pull request #6843 from vector-im/feature/bma/detect_object_log 
Fix some string template
 2022-08-17 14:37:42 +02:00
Benoit Marty
520d6f9b97
Merge pull request #6854 from vector-im/dependabot/gradle/com.gabrielittner.threetenbp-lazythreetenbp-0.11.0 
Bump lazythreetenbp from 0.10.0 to 0.11.0
 2022-08-17 14:37:09 +02:00
Benoit Marty
c5e601d726 Set GITHUB_TOKEN to let Danger be able to work on PR from forks. 2022-08-17 13:18:57 +02:00
Eric Decanini
b6bcefbb92
Merge pull request #6795 from vector-im/feature/eric/toolbar-space-name 
New App Layout: Space name reflected in toolbar
 2022-08-17 10:52:07 +02:00
Eric Decanini
4fedafc1be
Merge pull request #6749 from vector-im/feature/eric/space-list-modal 
Adds Space List Bottom Sheet
 2022-08-17 10:51:56 +02:00
dependabot[bot]
f0dc938fd0
Bump lazythreetenbp from 0.10.0 to 0.11.0 
Bumps [lazythreetenbp](https://github.com/gabrielittner/lazythreetenbp) from 0.10.0 to 0.11.0.
- [Release notes](https://github.com/gabrielittner/lazythreetenbp/releases)
- [Changelog](https://github.com/gabrielittner/lazythreetenbp/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gabrielittner/lazythreetenbp/compare/0.10.0...0.11.0)

---
updated-dependencies:
- dependency-name: com.gabrielittner.threetenbp:lazythreetenbp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-16 23:11:40 +00:00
Benoit Marty
27de9230b1 Ignore ktlint string-template. 2022-08-16 16:28:27 +02:00
Benoit Marty
446bf7e0aa changelog 2022-08-16 16:10:15 +02:00
Benoit Marty
ea465a1b86 Fix false positive on string template suspicious usage. 2022-08-16 16:06:08 +02:00
Benoit Marty
6089d24409 Fix some string template issue. 2022-08-16 16:05:50 +02:00
Benoit Marty
6ac88a9420 Add a check on suspicious string template. 
Especially we want to ensure that the app does not log unexpected content.
 2022-08-16 16:05:40 +02:00
Adam Brown
74d99b156f
Merge pull request #6833 from vector-im/feature/adm/removing-login-poc 
Removing `Login2` proof of concept
 2022-08-16 13:02:40 +01:00
ericdecanini
8b0fba2ef5 Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
 2022-08-16 11:58:25 +02:00
Benoit Marty
680dc207c0
Merge pull request #6841 from vector-im/feature/bma/frozen_classes 
Feature/bma/frozen classes
 2022-08-16 11:53:39 +02:00
Benoit Marty
1389262c3f Let danger check for frozen classes 2022-08-16 11:41:30 +02:00
Benoit Marty
08fff48065 Revert "Simple check to prevent frozen class modificaiton" 
This reverts commit 28ca03cc67.
 2022-08-16 11:14:01 +02:00
Benoit Marty
8a4bd0c467
Merge pull request #6805 from vector-im/cgizard/ISSUE-6645 
Add inputType for room name creation and settings
 2022-08-16 11:05:57 +02:00
dependabot[bot]
6c767de148
Bump stem-plugin from 2.1.1 to 2.2.0 
Bumps [stem-plugin](https://github.com/LikeTheSalad/android-stem) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/LikeTheSalad/android-stem/releases)
- [Changelog](https://github.com/LikeTheSalad/android-stem/blob/master/CHANGELOG.md)
- [Commits](https://github.com/LikeTheSalad/android-stem/compare/2.1.1...2.2.0)

---
updated-dependencies:
- dependency-name: com.likethesalad.android:stem-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-15 23:09:41 +00:00
Onuray Sahin
6c65b0a9e0
Merge pull request #6807 from vector-im/feature/mna/device-management-header-list 
[Devices Management] Header view for sessions lists in new layout (PSG-668)
 2022-08-15 23:09:53 +03:00
Onuray Sahin
d92cf04b6f Fix string resource. 2022-08-15 15:33:42 +03:00
Onuray Sahin
54d8c9de48 Remove unnecessary background color. 2022-08-15 15:19:49 +03:00
Adam Brown
314b077fbd adding changelog entry 2022-08-15 11:58:04 +01:00
Adam Brown
d365ccdc21 removing unused login2 resources 2022-08-15 11:51:13 +01:00
Adam Brown
19261ab2d0 removing login2 classes 2022-08-15 11:51:13 +01:00
bmarty
ecfa7db07d Sync Emojis 2022-08-15 00:03:34 +00:00
Florian Renaud
62f7b40a3e Add changelog entry 2022-08-12 13:10:49 +02:00
Florian Renaud
9eb6969456 Use Content models in CreateRoomBodyBuilder 2022-08-12 13:10:49 +02:00
Florian Renaud
a1152ff72c Improve RoomHistoryVisibility enum mapping 2022-08-12 13:10:49 +02:00
Florian Renaud
a124b514b8 Improve GuestAccess enum mapping 2022-08-12 13:10:49 +02:00
Florian Renaud
969689cdb9 Use CreateRoomStateEvent in RoomFeaturePreset.setupInitialStates 2022-08-12 13:10:49 +02:00
Adam Brown
d702210f26
Merge pull request #6810 from vector-im/revert-6732-dependabot/gradle/dagger-2.43.2 
Revert "Bump dagger from 2.42 to 2.43.2"
 2022-08-11 17:15:55 +01:00
Adam Brown
ef3615594b
Revert "Bump dagger from 2.42 to 2.43.2" 2022-08-11 17:15:29 +01:00