Diffusion Ruqola 011d9b723f78

ruqola
011d9b723f78
Actions

Authored by vasudhamathur on Jan 25 2018, 1:24 PM.

Description

Merge branch 'master' of https://github.com/KDE/ruqola

Details

Committed

vasudhamathur

Jan 25 2018, 1:24 PM

Parents

R865:0b80dd11929a: Update rocket chat server URL
R865:29df0bc7a73e: Show original text

Branches

Unknown

Tags

Unknown

vasudhamathur committed R865:011d9b723f78: Merge branch 'master' of https://github.com/KDE/ruqola (authored by vasudhamathur).Jan 25 2018, 1:24 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
29df0bc7a73e	mlaurent	Show original text	Jan 25 2018
be8d4ad4d000	mlaurent	Fix cmake breaking	Jan 25 2018
cd648a21cb2f	mlaurent	Use original message	Jan 25 2018
978607916f7a	mlaurent	Propagate original text	Jan 25 2018
349d9c3c640b	mlaurent	Use emojimanager	Jan 25 2018
520bc9764ef5	mlaurent	Debug--	Jan 25 2018
35dfc941a4c0	mlaurent	Add Veluri Mithun as contributor	Jan 25 2018
2a649969cc77	mlaurent	Add url for reporting bug + use <br>	Jan 25 2018
ff625f74d9ec	mlaurent	Improve parsing.	Jan 25 2018
34ad83b38cb8	mlaurent	Use QTEST_GUILESS_MAIN	Jan 25 2018
b717fbd75bfc	mlaurent	We need a manager for emoji	Jan 25 2018
b142e622362a	mlaurent	GIT_SILENT: coding style	Jan 25 2018
05b48aa010af	mlaurent	Add autotest	Jan 25 2018
70dfd3b6a880	mlaurent	Add missing operator	Jan 25 2018
51fc184f6b54	mlaurent	Rename file	Jan 25 2018
226321fdd6d8	mlaurent	Parse emoji	Jan 25 2018
60bc1682590e	mlaurent	Parse emoji	Jan 25 2018
0835c038ce67	mlaurent	We need to parse qjsonarray	Jan 25 2018
4c3f9d1752c2	mlaurent	Use QLatin1String	Jan 25 2018
965504e3043e	mlaurent	GIT_SILENT: ignore me	Jan 25 2018
e443dc3098fb	mlaurent	Add emoji for the future	Jan 24 2018
4fbf80fddd96	mlaurent	Add more autotest	Jan 24 2018
161a57d4df63	mlaurent	Add autotest for emoji	Jan 24 2018
4af315f815c6	mlaurent	Fix cmake warning	Jan 24 2018
4abd02952cbe	mlaurent	Clean up	Jan 24 2018
4fa4468b4962	mlaurent	Fix parsing notification	Jan 24 2018
3bfa6753c0e8	mlaurent	Fix copyright	Jan 24 2018
6dd3a7000bdf	mlaurent	GIT_SILENT: ignore me	Jan 24 2018
815403ff54f7	mlaurent	Ignore me	Jan 24 2018
a17defdd1d4a	mlaurent	GIT_SILENT: ignore me	Jan 24 2018
84665a9e6a16	mlaurent	Test (ignore me)	Jan 24 2018
b45fd90b53d2	mlaurent	Look at parsing custom emoji	Jan 24 2018
fd715fa46b75	mlaurent	Clean up	Jan 24 2018
2b18bd8d5f0e	mlaurent	Try to load avatar	Jan 24 2018
c1d6ee699649	mlaurent	Try to improve notification	Jan 24 2018
065048923783	mlaurent	Remove debug	Jan 24 2018
471bb59221d1	mlaurent	Add autotest	Jan 24 2018
d347c6181825	mlaurent	For the future we need to show avatar	Jan 24 2018
435c09991b1d	mlaurent	We need to get sender too	Jan 24 2018
15d43eb077dc	mlaurent	Start to create autotest	Jan 24 2018
8a20ee117a3e	mlaurent	Extract code so we can autotest it	Jan 24 2018
934cb8f64755	mlaurent	Move to rocketchataccount	Jan 24 2018
cfe665ff1555	mlaurent	Improve autotest	Jan 23 2018
36dfa1332b59	mlaurent	Fix starred message	Jan 23 2018
83e50c76fffa	mlaurent	Workaround for editing message	Jan 23 2018
5c6177b75d2d	mlaurent	Forward starred message	Jan 23 2018
0e858c49190c	mlaurent	Break autotest so we can show problem	Jan 23 2018
d7ab22f97fb9	mlaurent	Start to implement starred message	Jan 23 2018
89dc513f7ede	mlaurent	Change color/font when we have a new day	Jan 23 2018
0f18e029de84	mlaurent	Use wordwrap	Jan 23 2018

Changes (66)

				Path	Packages
	M			CMakeLists.txt
	M			autotests/CMakeLists.txt
	A			autotests/data/json/emoji.json
	A			autotests/data/json/emojiparent.json
	A			autotests/data/json/messageremovedstarred.json
	A			autotests/data/json/messagestarred.json
	A			autotests/data/json/notification.json
	P			autotests/emojimanagertest.cpp Copied from autotests/rocketchatcachetest.cpp
	P			autotests/emojimanagertest.h Copied from autotests/rocketchatcachetest.h
	A			autotests/emojitest.cpp
	P			autotests/emojitest.h Copied from autotests/notificationtest.h
	M			autotests/messageattachmenttest.cpp
	M			autotests/messagetest.cpp
	M			autotests/messageurltest.cpp
	M			autotests/notificationtest.cpp
	M			autotests/rocketchataccountsettingstest.cpp
	P			autotests/rocketchatcachetest.cpp Copied to autotests/emojimanagertest.cpp
	M			autotests/ruqolaserverconfigtest.cpp
	M			autotests/textconvertertest.cpp
	M			autotests/textconvertertest.h
	M			autotests/typingnotificationtest.cpp
	M			autotests/usertest.cpp
	M			autotests/utilstest.cpp
	M			autotests/utilstest.h
	M			src/CMakeLists.txt
	M			src/aboutdata/qmlaboutdata.cpp
	M			src/authentication.cpp
	M			src/ddpapi/ddpclient.cpp
	M			src/emoji.cpp
	M			src/emoji.h
	P			src/emojimanager.cpp Copied from src/downloadfilejob.cpp
	P			src/emojimanager.h Copied from src/downloadfilejob.h
	M			src/main.cpp
	M			src/message.cpp
	M			src/message.h
	M			src/messagemodel.cpp
	M			src/messagemodel.h
	M			src/notification.cpp
	M			src/notification.h
	M			src/qml/ActiveChat.qml
	M			src/qml/FancyMessageDelegate.qml
	M			src/qml/MainComponent.qml
	M			src/qml/OpenDirectChannelDialog.qml
	M			src/qml/UserInput.qml
	M			src/qml/messages/MessageBase.qml
	M			src/qml/messages/MessageMenu.qml
	M			src/qml/messages/NewDateLabel.qml
	M			src/qml/messages/UserMessage.qml
	M			src/restapi/restapirequest.cpp
	M			src/rocketchataccount.cpp
	M			src/rocketchataccount.h
	M			src/rocketchatbackend.cpp
	M			src/rocketchatbackend.h
	M			src/rocketchatcache.cpp
	M			src/rocketchatcache.h
	M			src/room.cpp
	M			src/roommodel.h
	M			src/ruqola.cpp
	M			src/ruqola.h
	M			src/ruqolaserverconfig.cpp
	M			src/textconverter.cpp
	M			src/unityservicemanager.cpp
	M			src/unityservicemanager.h
	M			src/utils.cpp
	M			src/utils.h
	M			tests/qml/ActiveChat.qml