ariskotsomitopoulos
b2a2fe2710
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
# tools/check/forbidden_strings_in_code.txt
# vector/build.gradle
# vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
# vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
# vector/src/main/java/im/vector/app/features/command/Command.kt
# vector/src/main/java/im/vector/app/features/command/CommandParser.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
# vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
# vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
# vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
# vector/src/main/res/layout/fragment_timeline.xml
# vector/src/main/res/xml/vector_settings_labs.xml
2022-01-27 17:11:26 +02:00
Benoit Marty
76599af088
Add default description for nl-NL
2022-01-25 19:05:20 +01:00
Benoit Marty
17de88e5f6
Remove the check on number of enum class.
...
Now that we have more developers, we can have conflict because ot the number of exception. Let's hope we will not do the mistake...
2022-01-24 18:12:41 +01:00
Benoit Marty
58197b8853
Fix enum class warning
2022-01-20 15:37:57 +01:00
ariskotsomitopoulos
3bd21d04d8
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
# tools/check/forbidden_strings_in_code.txt
2022-01-11 14:09:49 +02:00
Valere
3f0122be01
Update nb of enum classes
2022-01-10 09:44:11 +01:00
ariskotsomitopoulos
ac5caccdf9
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
# tools/check/forbidden_strings_in_code.txt
# vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
# vector/src/main/res/menu/menu_timeline.xml
2022-01-07 13:29:43 +02:00
Adam Brown
12abd3b019
updating enum class counter
2022-01-06 10:25:41 +00:00
Benoit Marty
48e15b1c36
Restore line deleted during GitHub conflict fixing by mistake
2022-01-04 16:15:25 +01:00
Benoit Marty
7bbea52e66
Merge branch 'develop' into feature/bma/math_final
2022-01-04 16:13:23 +01:00
Benoit Marty
2dc88d1477
Fix code quality
2022-01-03 20:22:57 +01:00
Benoit Marty
b39caeb04d
2 new enums
2022-01-03 15:27:59 +01:00
ariskotsomitopoulos
0d9bc188d7
Fix code quality issues
2021-12-26 00:48:11 +02:00
Benoit Marty
4949a06343
Use stable build tools for the release.
2021-12-14 16:37:52 +01:00
Benoit Marty
be33a53e56
code quality
2021-12-14 09:06:43 +01:00
Benoit Marty
a40e60ba8f
Merge branch 'develop' into feature/bma/posthog
2021-12-13 23:18:14 +01:00
Benoit Marty
d3a1746475
Use id from existing views instead of "hard-coded" values
...
And improve our extension
2021-12-07 16:56:27 +01:00
Benoit Marty
673cbb29de
Merge branch 'develop' into feature/bma/posthog
2021-12-07 14:26:31 +01:00
Benoit Marty
88605b65b7
Merge pull request #4628 from vector-im/feature/bma/compressVideo
...
Add script to compress video and convert to gif file
2021-12-03 18:13:20 +01:00
Benoit Marty
b2dce51fc2
Add script to compress video and convert to gif file
2021-12-03 17:30:30 +01:00
Adam Brown
6a3d4044ef
removing unused imports and increasing enum allowance
2021-12-03 15:30:55 +00:00
Benoit Marty
055c9be9ce
Add a script to import the plan to Element-Android project
2021-12-02 14:10:03 +01:00
Benoit Marty
6cb8a2458f
Remove extra new lines in XML
2021-12-01 23:06:49 +01:00
Benoit Marty
6624039413
Use @id and not @+id when referencing ids in layouts - RelativeLayout and toolbarId
2021-12-01 22:44:07 +01:00
Benoit Marty
e106ff8de0
Use @id and not @+id when referencing ids in layouts - ConstraintLayout
2021-12-01 22:19:33 +01:00
Benoit Marty
2d17156861
Use @id and not @+id when referencing ids in layouts - accessibilityTraversal
2021-12-01 22:16:28 +01:00
Benoit Marty
6d3df0d802
Use @id and not @+id when referencing ids in layouts - ConstraintLayout
2021-12-01 22:13:21 +01:00
Benoit Marty
e233915c0f
Jitsi android-sdk-3.1.0 -> android-sdk-3.10.0
2021-11-18 15:58:40 +01:00
Benoit Marty
855b672f48
Add content scanner service ( #4392 )
...
* Add content scanner APIs
* Move to content scanner matrix SDK to FOSS
* Update file service
* Refactoring
* Replace matrix callbacks by coroutines
* Fix lint errors
* Add changelog
Co-authored-by: yostyle <yoanp@element.io>
2021-11-17 11:18:20 +01:00
Benoit Marty
be3aafeef2
Merge pull request #4433 from vector-im/feature/bma/android12
...
Android12
2021-11-16 13:27:33 +01:00
Benoit Marty
aa3f36b7b7
Target API 31 - Android 12 - #4262
2021-11-15 12:24:48 +01:00
bmarty
a33bcbb81a
Sync Emojis
2021-11-15 00:01:55 +00:00
yostyle
6ddf3f6e5a
Fix lint errors
2021-11-10 22:31:23 +01:00
Benoit Marty
8f854d725d
./fastlane/metadata/android/vi/full_description.txt now exists
2021-11-04 13:01:40 +01:00
Adam Brown
d3234b33d3
increase enum class allowance by 1
2021-10-26 20:03:10 +01:00
Benoit Marty
efc1e9b87c
Merge pull request #4217 from vector-im/sync-emojis
...
Sync Emojis
2021-10-12 14:54:36 +02:00
ariskotsomitopoulos
ccc4a43737
Sync Emojis
2021-10-11 14:13:18 +00:00
ganfra
3bdf264a53
Merge develop into feature/fga/mavericks_2
2021-10-08 10:49:43 +02:00
ganfra
606cddc826
Mavericks 2: replace MvRxViewModelFactory by MavericksViewModelFactory
2021-10-01 17:11:53 +02:00
Benoit Marty
920f467231
Disqble some check, not true anymore
2021-10-01 14:11:26 +02:00
ganfra
f6b81b36d0
Mavericks 2: switch from MvRxState to MavericksState
2021-10-01 10:08:06 +02:00
Benoit Marty
b5614a1cd5
SQ descriptions are now available
2021-09-29 14:18:52 +02:00
Adam Brown
712b8ede14
adding benchmarking script to start monitoring build times
...
- makes use of the gradle-profiler to run the build multiple times
- currently uses reduced warm up/iteration count as the build takes a long time, can be increased once the build time is reduced
2021-09-23 16:20:41 +01:00
Valere
8fd784e275
Improve leave space (all + none)
2021-09-16 09:20:25 +02:00
Benoit Marty
2239d710db
Handle missing descriptions for SQ
2021-09-08 17:30:02 +02:00
Valere
aaa9c7e795
fix rebase
2021-07-30 19:05:47 +02:00
Valere
5adceaca23
Code quality
2021-07-30 18:44:14 +02:00
Onuray Sahin
1aa706dee5
Lint fixes.
2021-07-30 15:25:02 +03:00
Valere
57c75f8039
Ugrade unstable room notice in settings
...
default update parent, clean migrate bottomsheet layout
2021-06-24 09:38:52 +02:00
Benoit Marty
d6363a6e1b
Update template and use a more power full configuration
2021-06-18 21:35:09 +02:00
