conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| *	Simplification of DNS requests.	steckbrief	2016-02-12	1	-0/+12
\| \| \| \| \| \| \| \|	Originally introduced for FS#92, but now extended with retrieval for XEP-0368 (http://xmpp.org/extensions/xep-0368.html)
\| *	Compilation errors and merge mixups fixed	steckbrief	2016-02-11	2	-6/+29
\| \|
\| *	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-15	6	-0/+280
\| \|\ \| \| \| \| \| \| \| \| \|	Cast problem fixed
\| * \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-13	2	-0/+79
\| \|\ \
\| * \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-17	1	-1/+1
\| \|\ \ \
\| * \ \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-16	9	-11/+291
\| \|\ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-11	1	-0/+53
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-10	10	-363/+10
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-04	1	-7/+2
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-04	2	-2/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-02	10	-10/+423
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-06	5	-0/+560
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-03	8	-1/+296
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-23	3	-14/+19
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge trz/rename into trz/rebase	steckbrief	2015-10-22	3	-7/+300
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	fix imports and namespaces	steckbrief	2015-10-05	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-05	1	-0/+62
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Manually merged conflicting files: src/main/AndroidManifest.xml src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/ui/AboutPreference.java
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed imports	lookshe	2015-10-05	4	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2015-10-05	4	-0/+418
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes FS#135: condition NOT message.isRead() added to check if notification ↵	steckbrief	2016-02-09	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	should be shown for a message
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	implementation hint for FS#96 added	steckbrief	2016-02-09	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes FS#135: condition NOT message.isRead() added to check if notification ↵	steckbrief	2016-02-09	1	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	should be shown for a message
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed minor class cast issue	steckbrief	2016-01-16	1	-4/+4
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introducing some specialized IqPacketGenerators	steckbrief	2016-01-15	10	-87/+283
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- IqPacketGenerator - PubSubPacketGenerator - AvatarPacketGenerator
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved all avatar related work to AvatarService	steckbrief	2016-01-15	4	-65/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- publishAvatar moved from XmppConnectionService to AvatarService
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implements FS#111: Compress resized picture with PNG format	steckbrief	2016-01-15	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implements FS#64: Show who wrote last message in conversation overview	steckbrief	2016-01-15	1	-2/+12
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved all avatar related work to AvatarService	steckbrief	2016-01-13	19	-239/+318
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- fetchAvatar, fetchAvatarPep, fetchAvatarVcard, checkForAvatar moved from XmppConnectionService to AvatarService - Several unused imports removed - XmppSendUtil introduced to enable presencePacket and iqPacket sending without using XmppConnectionService since the account has everything needed - UiUpdateHelper introduced to enable UI updates without using XmppConnectionService directly
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Publish avatars as PNG	steckbrief	2016-01-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes FS#107, Implements FS#77	steckbrief	2016-01-08	1	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show the number of online resources in account view and enable show resources by clicking on the account jid
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes FS#99: Adjust namespace according to XEP-0363	steckbrief	2016-01-04	1	-1/+1
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Value of namespace constant changed to 'urn:xmpp:http:upload'
* \| \| \| \| \| \| \| \| \| \| \| \|	Log error in case logcat command could not be executed; Show toast in case ↵	steckbrief	2015-12-17	1	-1/+1
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nothing is copied
* \| \| \| \| \| \| \| \| \| \| \|	Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵	steckbrief	2015-12-16	14	-198/+342
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	distinguishes between image resizing and compressing/saving
* \| \| \| \| \| \| \| \| \| \| \|	Fixes FS#95: NPE when opening message details for failed file transfer	steckbrief	2015-12-16	1	-1/+2
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Removed stupid DNS query code	steckbrief	2015-12-11	3	-205/+147
\| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Moved logcat to a module, increased error robustness for loading last messages	steckbrief	2015-12-10	35	-407/+73
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fix flagging no more messages on server for conversation	steckbrief	2015-12-06	3	-2/+15
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Implements FS#83: Reload from last received message	steckbrief	2015-12-04	3	-16/+44
\| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fixes FS#75 - Change color names to reasonable names	steckbrief	2015-12-04	3	-16/+9
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fixed compile error in inner class	steckbrief	2015-12-02	1	-1/+1
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Partially implements FS#6: Conference ID changed to c+bugs@confere	steckbrief	2015-11-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nce.thedevstack.de
* \| \| \| \| \| \| \|	Implements FS#67: Introduce central logging class to use log prefix, new ↵	steckbrief	2015-11-20	36	-226/+639
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	activity to show logcat output and button to copy contents
* \| \| \| \| \| \|	FileBackend splitted into several util classes for separate concerns: ↵	steckbrief	2015-11-06	22	-580/+771
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.
* \| \| \| \| \|	Implements FS#26: Introduction of dialog to choose whether to resize a ↵	steckbrief	2015-11-03	14	-173/+521
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	picture or not
* \| \| \| \| \|	Implements FS#24: Introduce setting for picture resizing	steckbrief	2015-10-30	3	-0/+24
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in ↵	steckbrief	2015-10-23	9	-27/+36
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	values for the setting fixed, preferences involved in the decision for auto downloading image links moved to global Utility Class
* \| \| \|	Access to preferences moved to global utility class ↵	steckbrief	2015-10-21	24	-350/+532
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ConversationsPlusPreferences. Unused imports removed. Unnecessary references to XmppConnectionService removed. Bug in call order in StartConversationActivity for the setting hide_offline fixed.
* \| \| \|	added comment for clarification, why the timestamp of the first msg of msg ↵	steckbrief	2015-10-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	list is needed to query older msgs with mam
* \| \| \|	Removed unused imports	steckbrief	2015-10-15	1	-4/+0
\| \| \| \|
* \| \| \|	Fixes FS#81 - avoid jumps after loading messages	steckbrief	2015-10-15	2	-32/+64
\| \|_\|/ \|/\| \|