conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	add missing importstrz/master	lookshe	2015-08-11	2	-0/+2
\|
*	Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵	lookshe	2015-08-11	0	-0/+0
\|\ \| \| \| \| \| \|	trz/master
\| *	Merge branch 'trz/rename' (early part) into trz/master	lookshe	2015-06-19	6	-2/+44
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
\| \| *	Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference	steckbrief	2015-06-19	1	-2/+5
\| \| \|
\| \| *	Status color added to "create conversation" (refers to ticket #22 in flyspray)	steckbrief	2015-06-19	6	-2/+43
\| \| \|
\| * \|	Merge branch 'trz/rename' (early part) into trz/master	lookshe	2015-06-19	0	-0/+0
\| \|\\|
\| \| *	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	137	-780/+743
\| \|/ \| \| \| \| \| \| \| \| \| \|	"renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* \|	Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference	lookshe	2015-08-11	1	-2/+4
\| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
* \|	Status color added to "create conversation" (refers to ticket #22 in flyspray)	lookshe	2015-08-11	6	-2/+42
\|/ \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/utils/UIHelper.java
*	moved color picker to libs	lookshe	2015-04-15	37	-31/+219
\|
*	changed received and read confirmation setting to one list and put it to ↵	lookshe	2015-04-14	10	-83/+110
\| \| \| \|	settings class
*	adjusted todo	lookshe	2015-04-14	1	-0/+1
\|
*	check with lowercase to also match JPEG, JPeg ...	lookshe	2015-04-13	1	-1/+1
\|
*	adjusted todo	lookshe	2015-04-13	1	-0/+1
\|
*	changed last message in overview also to EmojiconTextView for displaying ↵	lookshe	2015-04-12	2	-4/+9
\| \| \| \|	smileys correctly
*	adjusted todo	lookshe	2015-04-12	1	-2/+0
\|
*	better and perhaps faster way for checking if a message is downloadable	lookshe	2015-04-12	1	-10/+18
\|
*	new settings to initialisation of Settings	lookshe	2015-04-12	1	-1/+1
\|
*	implementation for downloading only when enabled wlan	lookshe	2015-04-12	4	-3/+30
\|
*	added settings for accepting and downloading files	lookshe	2015-04-12	24	-29/+77
\| \| \| \|	fix in Settings, initialize with same values like in preferences.xml
*	add missing resource files	lookshe	2015-04-12	8	-0/+0
\|
*	Merge remote-tracking branch 'origin/trz/master' into trz/master	lookshe	2015-04-12	1	-3/+1
\|\
\| *	adjusted todo	lookshe	2015-04-12	1	-3/+1
\| \|
* \|	whatsapp-like smiley implementation	lookshe	2015-04-12	1026	-27/+4231
\| \|
* \|	whatsapp-like smiley implemantation	lookshe	2015-04-12	1	-1/+2
\|/
*	Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵	steckbrief	2015-04-11	7	-22/+38
\|\ \| \| \| \| \| \|	trz/master
\| *	show online status under avatar in same way for muc as the send button does	lookshe	2015-04-11	1	-13/+18
\| \|
\| *	differ between received and read message	lookshe	2015-04-11	6	-9/+20
\| \|
* \|	Color choose dialog	steckbrief	2015-04-11	26	-15/+688
\|/
*	no trim of messages or password	lookshe	2015-04-11	7	-9/+15
\| \| \| \|	check password with only spaces separately
*	correct parsing of led color	lookshe	2015-04-11	1	-1/+1
\|
*	todo added	lookshe	2015-04-11	1	-0/+1
\|
*	Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵	lookshe	2015-04-11	88	-635/+3322
\|\ \| \| \| \| \| \|	trz/master
\| *	timestamp parsing reverted	steckbrief	2015-03-31	2	-16/+31
\| \|
\| *	Configurable LED color (Attention: Expert setting because currently only ↵	steckbrief	2015-03-31	4	-3/+19
\| \| \| \| \| \| \| \|	text input)
\| *	Changes for emoticon parser reactivated	steckbrief	2015-03-31	5	-8/+290
\| \|
\| *	Merge tag '1.2.0' into trz/master	steckbrief	2015-03-30	86	-617/+2991
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/res/values-de/strings.xml src/main/res/xml/preferences.xml
\| \| *	bump version code1.2.0	iNPUTmice	2015-03-22	1	-2/+2
\| \| \|
\| \| *	pulled translations	iNPUTmice	2015-03-22	5	-0/+21
\| \| \|
\| \| *	properly set chat states when receiving otr status messages	iNPUTmice	2015-03-21	1	-1/+1
\| \| \|
\| \| *	respond to unreadable OTR messages with error message. fixed #1021	iNPUTmice	2015-03-21	5	-3/+42
\| \| \|
\| \| *	Merge branch 'development' of github.com:siacs/Conversations into development	iNPUTmice	2015-03-20	1	-1/+1
\| \| \|\
\| \| \| *	Update CHANGELOG.md	Daniel Gultsch	2015-03-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	fixed plugin link
\| \| * \|	wait for session iq to return sucessfully before sending other stanzas. ↵	iNPUTmice	2015-03-20	1	-26/+42
\| \| \|/ \| \| \| \| \| \| \| \| \|	fixed #1017
\| \| *	version bump to 1.2.0-beta1.2.0-beta	iNPUTmice	2015-03-19	2	-3/+5
\| \| \|
\| \| *	don't update presence for muc messages	iNPUTmice	2015-03-19	1	-5/+2
\| \| \|
\| \| *	pulled more translations	iNPUTmice	2015-03-19	1	-0/+5
\| \| \|
\| \| *	Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseen	Daniel Gultsch	2015-03-19	4	-8/+24
\| \| \|\ \| \| \| \| \| \| \| \|	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	4	-8/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# enable update last-seen for muc-msgs
\| \| * \|	Merge pull request #1043 from strb/choose_contact_multiple_squashed	Daniel Gultsch	2015-03-18	4	-6/+134
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Added multiple select to Choose Contact Activity (squashed)