conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-04	1	-1/+1
\|\
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-02	2	-49/+49
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-06	3	-166/+139
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-03	1	-30/+88
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-23	2	-6/+3
\|\\|
* \|	Merge trz/rename into trz/rebase	steckbrief	2015-10-22	3	-156/+112
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-15	1	-22/+32
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-05	1	-1/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	6	-3706/+0
\| \| \| \| \| \| \| \| \| \| \| \|	"renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* \|	fixes FS#35 - Shortcut Badger compatible to setting always_notify_in_conference	lookshe	2015-08-16	1	-1/+1
\| \|
* \|	- Introduction of SwipeRefreshLayout for conversation view	steckbrief	2015-08-12	1	-31/+44
\| \| \| \| \| \| \| \| \| \|	- OnScrollListener for ListView of messages removed and replaced with swipe refresh - Loading of messages now possible even if no message is present in conversation
* \|	Merge tag '1.5.2' into trz/rebase	lookshe	2015-08-11	3	-240/+411
\|/
*	changed received and read confirmation setting to one list and put it to ↵	lookshe	2015-04-14	1	-9/+1
\| \| \| \|	settings class
*	implementation for downloading only when enabled wlan	lookshe	2015-04-12	1	-0/+20
\|
*	Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵	steckbrief	2015-04-11	1	-1/+5
\|\ \| \| \| \| \| \|	trz/master
\| *	differ between received and read message	lookshe	2015-04-11	1	-1/+5
\| \|
* \|	Color choose dialog	steckbrief	2015-04-11	1	-10/+2
\|/
*	correct parsing of led color	lookshe	2015-04-11	1	-1/+1
\|
*	Configurable LED color (Attention: Expert setting because currently only ↵	steckbrief	2015-03-31	1	-1/+10
\| \| \| \|	text input)
*	Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseen	Daniel Gultsch	2015-03-19	1	-1/+1
\|\ \| \| \| \|	add delivery receipts for private muc msgs & enable update last-seen for muc-msgs
\| *	# add delivery receipts for private muc msgs	BrianBlade	2015-03-18	1	-1/+1
\| \| \| \| \| \| \| \|	# enable update last-seen for muc-msgs
* \|	Merge pull request #1036 from QuentinC/development	Daniel Gultsch	2015-03-18	1	-1/+1
\|\ \ \| \| \| \| \| \|	Green led color is better with "full-green"
\| * \|	Green led color is better with "full-green"	Quentin	2015-03-04	1	-1/+1
\| \| \|
* \| \|	open location directly from notification	iNPUTmice	2015-03-10	1	-0/+25
\| \|/ \|/\|
* \|	display geo uris as location. show 'send loction' in share menu if request ↵	iNPUTmice	2015-03-07	1	-0/+18
\| \| \| \| \| \| \| \|	location intent can be resolved
* \|	avoid unnecessary thread creation	iNPUTmice	2015-03-05	1	-16/+21
\|/
*	added methods to count number of unread messages	Daniel Gultsch	2015-03-02	1	-0/+8
\|
*	mark all sent messages up to a marker as displayed	Daniel Gultsch	2015-03-01	1	-9/+10
\|
*	use conversations green in notification led	iNPUTmice	2015-02-27	1	-1/+1
\|
*	Update NotificationService.java	QuentinC	2015-02-27	1	-1/+1
\| \| \|	Revert led light color
*	- Update mBuilder in NotificationService.java to ensure that the led is ↵	Quentin	2015-02-27	1	-1/+2
\| \| \| \| \| \| \|	displayed at the right color. CF: http://stackoverflow.com/questions/14953793/android-notification-led-doesnt-use-my-color#comment20991762_14953793 - Changed led Color to green to remember the icon color and led times
*	reset incoming chat state when going into background	iNPUTmice	2015-02-23	1	-0/+3
\|
*	get rid of some useless debugging	iNPUTmice	2015-02-23	1	-3/+0
\|
*	added typing notifications through XEP-0085. fixed #210	iNPUTmice	2015-02-21	1	-0/+22
\|
*	always go through reconnect method instead of just starting XmppConnection ↵	iNPUTmice	2015-02-18	1	-4/+1
\| \| \| \|	threads
*	moved roster loading to async task as well	iNPUTmice	2015-02-17	1	-10/+22
\|
*	loading avatars in seperate tasks	iNPUTmice	2015-02-15	1	-14/+26
\|
*	load messages asynchronously	iNPUTmice	2015-02-12	1	-2/+18
\|
*	added actions to error notification	iNPUTmice	2015-02-10	2	-1/+47
\|
*	Use Material Design Icons on API 21+	Sam Whited	2015-01-29	1	-6/+17
\|
*	adapt caps on whether or not message confirmation is on	iNPUTmice	2015-01-26	1	-1/+5
\|
*	made connect time out more failsave	iNPUTmice	2015-01-25	1	-5/+8
\|
*	fixed mam to work with muc	iNPUTmice	2015-01-24	2	-9/+17
\|
*	deal with user entering full jids in join conference dialog	iNPUTmice	2015-01-21	1	-1/+3
\|
*	Merge pull request #908 from betheg/otr4j	Daniel Gultsch	2015-01-21	1	-1/+1
\|\ \| \| \| \|	otr4j: update to 0.22
\| *	otr4j: update to 0.22	Michael	2015-01-20	1	-1/+1
\| \|
* \|	Add color / category to foreground notification	Sam Whited	2015-01-20	1	-7/+14
\|/
*	fixed legacy translation of image received	iNPUTmice	2015-01-19	1	-1/+3
\|
*	check for deleted files when loading more messages from history	iNPUTmice	2015-01-19	1	-1/+3
\|
*	account for rounding errors when rescheduling wake up	iNPUTmice	2015-01-19	1	-150/+153
\|