Diffusion A user-friendly XMPP client for every device. 1e97071fc87a

Merge branch 'multimedia-messages'
1e97071fc87a
Actions

Authored by lnj on Nov 26 2019, 2:29 PM.

Description

Merge branch 'multimedia-messages'

Closes #287, #289.

Details

Committed

lnj	Nov 26 2019, 2:29 PM

Parents

R1041:78b07ca67ad3: Add new multimedia icons to kirigami-icons.qrc
R1041:039a14a0a297: Message: Remove QXmpp < 1.0 compatibility code

Branches

Unknown

Tags

Unknown

lnj committed R1041:1e97071fc87a: Merge branch 'multimedia-messages' (authored by lnj).Nov 26 2019, 2:29 PM

Merged Changes

Commit	Author	Details	Committed
78b07ca67ad3	jbbgameich/lnj	Add new multimedia icons to kirigami-icons.qrc	Nov 26 2019
2f8a2a4ffa7b	fazevedo/lnj	GStreamer plugins deploy and support for AppImage	Nov 26 2019
49705c814051	fazevedo/lnj	Introduce upgrade-qml-imports.sh bash script	Nov 26 2019
a0123d0bdf30	fazevedo/lnj	Extended multimedia support	Nov 26 2019
6d3d9828e468	fazevedo/lnj	Refactor media previews	Nov 26 2019
9fbb3ac32ffb	fazevedo/lnj	Refactor file chooser	Nov 26 2019
c2a206cc1ce6	fazevedo/lnj	Introduce MediaUtils helper	Nov 26 2019

Changes (70)

				Path	Packages
	M			CMakeLists.txt
	M			README.md
	M			kaidan_qml.qrc
	M			kirigami-icons.qrc
	A			src/AudioDeviceModel.cpp
	A			src/AudioDeviceModel.h
	M			src/CMakeLists.txt
	P			src/CameraImageCapture.cpp Copied from src/Notifications.cpp
	P			src/CameraImageCapture.h Copied from src/LogHandler.h
	A			src/CameraModel.cpp
	A			src/CameraModel.h
	M			src/Enums.h
	A			src/MediaRecorder.cpp
	A			src/MediaRecorder.h
	A			src/MediaSettingModel.h
	A			src/MediaSettings.cpp
	A			src/MediaSettings.h
	A			src/MediaUtils.cpp
	A			src/MediaUtils.h
	M			src/Message.cpp
	M			src/Message.h
	M			src/MessageHandler.cpp
	M			src/MessageHandler.h
	M			src/MessageModel.cpp
	M			src/MessageModel.h
	M			src/QmlUtils.cpp
	M			src/UploadManager.cpp
	M			src/main.cpp
	M			src/qml/AboutDialog.qml
	M			src/qml/ChatPage.qml
	M			src/qml/EmptyChatPage.qml
	M			src/qml/GlobalDrawer.qml
	M			src/qml/LoginPage.qml
	A			src/qml/MultimediaSettingsPage.qml
	M			src/qml/QrCodeScannerPage.qml
	M			src/qml/UserProfilePage.qml
	M			src/qml/elements/Avatar.qml
	M			src/qml/elements/ChatMessage.qml
	D			src/qml/elements/ChatMessageImage.qml
	M			src/qml/elements/EmojiPicker.qml
	M			src/qml/elements/FileChooser.qml
	M			src/qml/elements/FileChooserDesktop.qml
	M			src/qml/elements/FileChooserMobile.qml
	M			src/qml/elements/IconButton.qml
	P			src/qml/elements/MediaPreview.qml Copied from src/qml/elements/MediaPreviewImage.qml
	A			src/qml/elements/MediaPreviewAudio.qml
	P			src/qml/elements/MediaPreviewImage.qml Copied to multiple locations: src/qml/elements/MediaPreview.qml src/qml/elements/MediaPreviewLocation.qml src/qml/elements/MediaPreviewVideo.qml
	A			src/qml/elements/MediaPreviewLoader.qml
	P			src/qml/elements/MediaPreviewLocation.qml Copied from src/qml/elements/MediaPreviewImage.qml
	M			src/qml/elements/MediaPreviewOther.qml
	P			src/qml/elements/MediaPreviewVideo.qml Copied from src/qml/elements/MediaPreviewImage.qml
	M			src/qml/elements/MessageCounter.qml
	A			src/qml/elements/NewMedia.qml
	A			src/qml/elements/NewMediaLoader.qml
	A			src/qml/elements/NewMediaLocation.qml
	M			src/qml/elements/RosterAddContactSheet.qml
	M			src/qml/elements/RosterListItem.qml
	M			src/qml/elements/RosterRemoveContactSheet.qml
	M			src/qml/elements/RosterRenameContactSheet.qml
	M			src/qml/elements/RoundImage.qml
	M			src/qml/elements/SendMediaSheet.qml
	M			src/qml/elements/SubRequestAcceptSheet.qml
	M			src/qml/elements/TextAvatar.qml
	M			src/qml/main.qml
	M			src/qml/settings/ChangePassword.qml
	M			src/qml/settings/SettingsItem.qml
	M			src/qml/settings/SettingsPage.qml
	M			src/qml/settings/SettingsSheet.qml
	M			utils/build-linux-appimage.sh
	A			utils/upgrade-qml-imports.sh