conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-11	3	-208/+151
\|\
\| *	Removed stupid DNS query code	steckbrief	2015-12-11	3	-205/+147
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-10	36	-422/+100
\|\\|
\| *	Moved logcat to a module, increased error robustness for loading last messages	steckbrief	2015-12-10	36	-408/+74
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-06	3	-2/+15
\|\\|
\| *	Fix flagging no more messages on server for conversation	steckbrief	2015-12-06	3	-2/+15
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-04	4	-20/+50
\|\\|
\| *	Implements FS#83: Reload from last received message	steckbrief	2015-12-04	4	-20/+50
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-04	1	-3/+6
\|\\|
\| *	Implements FS#89 - Change about information	steckbrief	2015-12-04	1	-3/+6
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-04	23	-124/+124
\|\\|
\| *	Fixes FS#75 - Change color names to reasonable names	steckbrief	2015-12-04	23	-124/+124
\| \|
* \|	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	1	-1/+1
\|\\|
\| *	Fixed compile error in inner class	steckbrief	2015-12-02	1	-1/+1
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-02	42	-227/+688
\|\\|
\| *	Partially implements FS#6: Conference ID changed to c+bugs@confere	steckbrief	2015-11-20	2	-1/+2
\| \| \| \| \| \| \| \|	nce.thedevstack.de
\| *	Implements FS#67: Introduce central logging class to use log prefix, new ↵	steckbrief	2015-11-20	42	-226/+686
\| \| \| \| \| \| \| \|	activity to show logcat output and button to copy contents
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-06	22	-579/+786
\|\\|
\| *	FileBackend splitted into several util classes for separate concerns: ↵	steckbrief	2015-11-06	22	-580/+771
\| \| \| \| \| \| \| \|	AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-03	20	-172/+601
\|\\|
\| *	Implements FS#26: Introduction of dialog to choose whether to resize a ↵	steckbrief	2015-11-03	17	-173/+549
\| \| \| \| \| \| \| \|	picture or not
\| *	Implements FS#24: Introduce setting for picture resizing	steckbrief	2015-10-30	7	-1/+52
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-23	11	-30/+41
\|\\|
\| *	Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in ↵	steckbrief	2015-10-23	11	-30/+39
\| \| \| \| \| \| \| \|	values for the setting fixed, preferences involved in the decision for auto downloading image links moved to global Utility Class
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-22	1	-1/+2
\|\\|
\| *	Implements FS#78: Allow installation on SD card	steckbrief	2015-10-22	1	-1/+2
\| \|
* \|	Merge trz/rename into trz/rebase	steckbrief	2015-10-22	25	-351/+536
\|\\|
\| *	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
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-16	2	-1/+4
\|\\|
\| *	Fixes FS#82: Background color of conversation list item set to primary ↵	steckbrief	2015-10-16	2	-1/+4
\| \| \| \| \| \| \| \|	background color
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-15	3	-36/+64
\|\\|
\| *	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
\| \|
* \|	fix imports and namespaces	steckbrief	2015-10-05	2	-1/+3
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-05	7	-36/+76
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ↵	steckbrief	2015-10-05	7	-36/+76
\| \| \| \| \| \| \| \|	access to app information
* \|	fixed importstrz/1.5.2.2	lookshe	2015-10-05	5	-11/+11
\| \|
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2015-10-05	23	-16/+700
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
\| *	Publishing additional information in message details dialog such as message ↵	steckbrief	2015-10-04	4	-28/+235
\| \| \| \| \| \| \| \|	type and message status
\| *	Note added where to change sth. for FS#70	steckbrief	2015-10-04	1	-1/+2
\| \|
\| *	Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵	steckbrief	2015-10-04	13	-4/+473
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Open resource list on long click in conversations overview, open resource list on click on bare jid in contact details view, Message details dialog added
\| *	New logo added, fixes FS#56	steckbrief	2015-10-04	5	-0/+0
\| \|
\| *	Fixes FS#49: Highlight the selected conversation in list	steckbrief	2015-09-02	3	-10/+14
\| \|
\| *	Fixes FS#50: Replace phone numbers and email addresses in messages with links	steckbrief	2015-09-02	2	-2/+2
\| \|
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-21	1	-3/+3
\| \|\ \| \|/ \|/\|
\| *	moved merged files to correct location	lookshe	2015-08-16	3	-15/+16
\| \|
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-16	35	-409/+396
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
\| * \|	resolve of some compiler errors	lookshe	2015-08-13	3	-1/+3
\| \| \|