Changes in [Deprecated] Riot Android/[DEPRECATED] RiotX application @ Element Translations

2 / 442

/ 442

AnonymousWebHacker

Comment added

[Deprecated] Riot Android / [DEPRECATED] RiotX application — Spanish

Ocultar todos los mensajes del usuario

3 years ago

AnonymousWebHacker

Comment added

[Deprecated] Riot Android / [DEPRECATED] RiotX application — Spanish

Ignorar usuario

3 years ago

AnonymousWebHacker

Comment added

[Deprecated] Riot Android / [DEPRECATED] RiotX application — Spanish

Comment added 3 years ago

AnonymousWebHacker

Comment added

[Deprecated] Riot Android / [DEPRECATED] RiotX application — Spanish

Cancelar invitación

3 years ago

None

Merged repository

[Deprecated] Riot Android / [DEPRECATED] RiotX application

Merged repository 3 years ago

None

New alert

[Deprecated] Riot Android / [DEPRECATED] RiotX application

Repository outdated. 3 years ago

None

New alert

[Deprecated] Riot Android / [DEPRECATED] RiotX application

Repository outdated. 3 years ago

None

New alert

[Deprecated] Riot Android / [DEPRECATED] RiotX application

Could not merge the repository. 3 years ago

bmarty

Failed merge on repository

[Deprecated] Riot Android / [DEPRECATED] RiotX application

error: Your local changes to the following files would be overwritten by checkout:
	matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetPostAPIMediator.kt
	matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetService.kt
	matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/WidgetContent.kt
	matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/WidgetType.kt
	matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManager.kt
	matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/CreateWidgetTask.kt
	matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
	matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetService.kt
	matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetURLFormatter.kt
	matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetManager.kt
	matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/token/GetScalarTokenTask.kt
	matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/token/ScalarTokenStore.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/sticker/StickerPickerActionHandler.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetItem.kt
	vector/src/main/java/im/vector/riotx/features/widgets/WidgetFragment.kt
	vector/src/main/java/im/vector/riotx/features/widgets/WidgetPostAPIHandler.kt
	vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewEvents.kt
	vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewModel.kt
	vector/src/main/java/im/vector/riotx/features/widgets/webview/WebviewPermissionUtils.kt
	vector/src/main/java/im/vector/riotx/features/widgets/webview/WidgetWebView.kt
Please commit your changes or stash them before you switch branches.
error: The following untracked working tree files would be overwritten by checkout:
	matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetDependenciesHolder.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/sticker/StickerPickerConstants.kt
Please move or remove them before you switch branches.
Aborting (1)

3 years ago

bmarty

Component locked

[Deprecated] Riot Android / [DEPRECATED] RiotX application

Component locked 3 years ago

bmarty

Component unlocked

[Deprecated] Riot Android / [DEPRECATED] RiotX application

Component unlocked 3 years ago

None

Committed changes

[Deprecated] Riot Android / [DEPRECATED] RiotX application — Kabyle