SpiritCroc
5749e31508
Automatic upstream merge postprocessing
...
Change-Id: Ic88df521a426bfe12b6fbbbcbdca534722ce7a6c
2021-04-14 14:02:43 +02:00
SpiritCroc
20e185ef48
Restore setting functionality for unimportant unread type and count
...
Change-Id: Ied403f8fad4a7fa4e9dd1422c9ca08690183c1b1
2021-04-14 13:58:37 +02:00
SpiritCroc
04c0d7c121
Add back chats marked unread to notifications tab
...
Likely also required for the "mark all as read" feature to work properly
since v1.1.4
Change-Id: I375860e55e3f188526f90cf7ffdccf192871e745
2021-04-14 13:26:35 +02:00
SpiritCroc
811950cb18
Various fixes after merge
...
- Fix compile
- Fix counting chats marked unread
- Fix counting chats with unread messages
Change-Id: Ibf928c5380a1b7ec25f2c510b97ee4f726fe7c0d
2021-04-14 13:20:50 +02:00
SpiritCroc
0e601aa8f0
Merge tag 'v1.1.4' into sc
...
Note: this merge needs more work, since upstream changed implementations
affecting following features:
- Mark unread
- Notification count badges
- Overview list filtering / combined overview
- Remember expanded categories
- Read receipt layout
Change-Id: If728bb54dd7c423b57bd3f59d23d86a1a0e5e435
Conflicts:
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/RoomSummaryEntity.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
vector/src/main/java/im/vector/app/core/utils/Emoji.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/layout/item_timeline_event_base_state.xml
2021-04-13 09:28:13 +02:00
SpiritCroc
5d7a1605da
merge_helpers.sh: Fix spaces for upstream_previous_tag
...
Change-Id: I669fd7e764419c9c78c15d7a3c5e5a6ce8af4af4
2021-04-12 16:01:39 +02:00
SpiritCroc
79daede4f5
[TMP] Automatic upstream merge preparation
...
Change-Id: Ic73bcab6bcb749b183f47ab8cf6ee647239822b7
2021-04-12 15:58:23 +02:00
SpiritCroc
d6fb89492a
Automatic revert to unchanged upstream strings, pt.1
...
Change-Id: I82ed105a407d79a9faa756b523e89dbfe5e14246
2021-04-12 15:58:22 +02:00
SpiritCroc
d329f08162
Increment version
...
Change-Id: Ieeae5d0355183e5fadd8a0303514d8af9d7301a5
2021-04-12 10:57:35 +02:00
SpiritCroc
0320bf2d05
SC dark themes: less bright bottom sheet / day separator
...
Change-Id: I806f21c85ead59870d2a11bd1c5d3f101ac39325
2021-04-11 10:28:33 +02:00
SpiritCroc
6a8cd9a329
Fix sometimes overlapping URL preview text with timestamp
...
Change-Id: Ib441c2d0a447051b4dde2990111f748f1f3f2d66
2021-04-09 12:54:40 +02:00
Benoit Marty
0a326015ef
Merge branch 'release/1.1.4'
2021-04-09 12:41:04 +02:00
Benoit Marty
5ee8cf7ebf
Prepare release 1.1.4
2021-04-09 12:40:11 +02:00
Marcus Hoffmann
1f37da276e
propagate jitsi LIBRE_BUILD exclusion rules to not pull in gms libs
...
Previously jitsi only had optional dependencies being disabled by the
LIBRE build flag but a while ago they introduced optional exclusion
rules which don't transitively propagate to consumers of the library, so
instead we need to mirror the exclusion rules from the jitsi gradle file:
See: 7a64bf006e/android/sdk/build.gradle (L53)
2021-04-09 12:25:47 +02:00
SpiritCroc
16c06f5f62
Automatic SchildiChat string correction
...
Change-Id: If21ffd3164e94d6d668f4057ecd4afbeb36dd83d
2021-04-09 11:57:24 +02:00
SpiritCroc
235cfa48ee
Automatic upstream merge postprocessing
...
Change-Id: I4b019ba99e9d48b57791e1bf33ccca553ae40483
2021-04-09 11:57:22 +02:00
SpiritCroc
6aa6f3e01b
Merge tag 'v1.1.3' into sc
...
Change-Id: I50f78eeec11fc4d606ddabb68d08a5ff97bbad13
Conflicts:
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
2021-04-09 11:57:11 +02:00
SpiritCroc
5bfc106a33
[TMP] Automatic upstream merge preparation
...
Change-Id: I8850efdce1c1c8d1b1ff08471634d012810d95a4
2021-04-09 11:55:41 +02:00
SpiritCroc
2407c905fe
Automatic revert to unchanged upstream strings, pt.1
...
Change-Id: I0a3b0614e9533b7c572205eb571c21afa325cc7e
2021-04-09 11:55:41 +02:00
SpiritCroc
61e9bfce5b
pre_merge.sh: Fix when last merge was not tagged
...
Change-Id: Ib48f8369884a13b7556bb0c3a70c367a940028c9
2021-04-09 11:55:15 +02:00
Benoit Marty
93bc5abcb5
Update the Emoji source file
2021-04-09 10:32:11 +02:00
Benoit Marty
5311bacfff
ktlint
2021-04-09 10:26:28 +02:00
Benoit Marty
da7c2e38f6
Merge pull request #3140 from vector-im/feature/bca/verification_as_per_web
...
Fix EW-EA compatibility for verification
2021-04-09 10:24:01 +02:00
Benoit Marty
0d9990b2e3
Merge pull request #3147 from oogm/develop
...
Update import_emojis.py to retain keyword order
2021-04-09 10:00:47 +02:00
Benoit Marty
2d6fca9214
Merge pull request #3143 from vector-im/feature/bma/discovery_filtering
...
Filter some other words when navigating into the room directory
2021-04-09 08:52:32 +02:00
oogm
327e75e8e5
Update CHANGES.md
2021-04-08 22:26:31 +02:00
oogm
a4a3777722
Update import_emojis.py to retain keyword order
2021-04-08 22:14:41 +02:00
Benoit Marty
f1e280827d
Ensure there is no dup and cleanup
2021-04-08 19:39:49 +02:00
Benoit Marty
7e605eb4d4
Merge pull request #3145 from vector-im/bma/merge_avail
...
Small cleanup for #3084
2021-04-08 19:36:35 +02:00
Matthew Hodgson
1233fde261
Update forbidden_terms.txt
2021-04-08 18:26:55 +01:00
Benoit Marty
ee3eb8e1d6
Cleanup
2021-04-08 18:52:53 +02:00
Benoit Marty
2a1e52745f
Some cleanup after merge of #3084
2021-04-08 18:50:28 +02:00
Aleks
9d96f90e49
keyword-spacing fix + wildcard-imports fix
2021-04-08 18:50:28 +02:00
Aleks
4451b682b1
merge + register/available endpoint corrections
2021-04-08 18:50:28 +02:00
Aleks
9ce9d1e549
CHANGES.md updated
2021-04-08 18:50:28 +02:00
Aleks
2e9f8ae6ae
registration availability endpoint added
2021-04-08 18:50:05 +02:00
Benoit Marty
65b4b2915f
Merge pull request #3142 from vector-im/feature/bma/global_retry
...
Generic hanlding of rate limit eror by the SDK
2021-04-08 18:23:52 +02:00
Benoit Marty
153d393bf1
Prevent searching for forbidden terms
2021-04-08 17:28:47 +02:00
Benoit Marty
1715143b85
Filter some other words
...
Cannot filter canonical alias anymore, as we now use word boundaries
2021-04-08 16:54:41 +02:00
Benoit Marty
7b1d313e8e
Small cleanup
2021-04-08 12:46:55 +02:00
Benoit Marty
c6bd378104
Test is passing
2021-04-08 12:44:28 +02:00
Valere
760e14531f
Fix EW-EA compatibility for verification
2021-04-08 12:09:35 +02:00
Benoit Marty
8dead986a5
Always try to retry Http requests in case of 429 ( #1300 )
2021-04-08 10:59:51 +02:00
Benoit Marty
9b5bc60fa9
Remove unused parameter and use same value than the JS SDK
2021-04-08 09:54:51 +02:00
Benoit Marty
3b6234a9a2
Merge pull request #3133 from vector-im/feature/bma/wl_fixes
...
Weblate fixes
2021-04-07 19:11:16 +02:00
Benoit Marty
b423d5da4c
typo
2021-04-07 19:00:02 +02:00
Benoit Marty
e7608469ca
Import SAS strings
2021-04-07 18:42:52 +02:00
Benoit Marty
eef6d92b89
Merge pull request #3129 from vector-im/feature/bma/dn_iteration
...
Empty room name small iteration
2021-04-07 18:41:08 +02:00
Benoit Marty
e61a9e75e8
Merge pull request #3055 from vector-im/feature/bma/get_event
...
Get event
2021-04-07 18:38:17 +02:00
Benoit Marty
47aeadef7c
Add configuration for new Irish language
2021-04-07 18:34:54 +02:00
