conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \|	Related to FS#199: Removed unnecessary differentiation between a ↵	steckbrief	2016-04-18	3	-16/+1
\| \| \|/ \| \|/\| \| \| \| \| \| \|	conversation with the own account
\| * \|	removed unused string	lookshe	2016-04-17	1	-1/+0
\| \| \|
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-17	71	-275/+573
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java src/main/res/values-bg/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
\| \| *	@Overrides addedtrz/merge_1.11.7	lookshe	2016-04-17	1	-0/+6
\| \| \|
\| \| *	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	71	-310/+573
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: README.md build.gradle gradle/wrapper/gradle-wrapper.properties src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml src/main/res/xml/preferences.xml
\| \| \| *	version bump to 1.11.7 + changelog1.11.7	Daniel Gultsch	2016-04-14	2	-2/+7
\| \| \| \|
\| \| \| *	always notify by default in conferences	Daniel Gultsch	2016-04-14	2	-3/+1
\| \| \| \|
\| \| \| *	removed unnecessary call to stopSelf() after logging out	Daniel Gultsch	2016-04-14	1	-5/+11
\| \| \| \|
\| \| \| *	add setting for quick sharing	Daniel Gultsch	2016-04-14	3	-17/+51
\| \| \| \|
\| \| \| *	removed unused call to cancel events	Daniel Gultsch	2016-04-14	1	-1/+0
\| \| \| \|
\| \| \| *	create Config varibale to show the disable foreground service button	Daniel Gultsch	2016-04-13	2	-3/+6
\| \| \| \|
\| \| \| *	hacky workaround to determine if uri points to private file on < lolipop	Daniel Gultsch	2016-04-13	3	-9/+25
\| \| \| \|
\| \| \| *	return own jid as true counterpart on self messages in muc	Daniel Gultsch	2016-04-13	1	-0/+3
\| \| \| \|
\| \| \| *	added share uri button to conference details	Daniel Gultsch	2016-04-12	15	-14/+43
\| \| \| \|
\| \| \| *	reverse order in contact chooser	Daniel Gultsch	2016-04-12	1	-1/+1
\| \| \| \|
\| \| \| *	minor code cleanup	Daniel Gultsch	2016-04-12	1	-3/+1
\| \| \| \|
\| \| \| *	republish avatar if server offers non-persistent pep :-(	Daniel Gultsch	2016-04-11	4	-37/+144
\| \| \| \|
\| \| \| *	version bump to 1.11.6 + changelog1.11.6	Daniel Gultsch	2016-04-10	2	-2/+6
\| \| \| \|
\| \| \| *	pulled translations from transifex	Daniel Gultsch	2016-04-10	29	-86/+27
\| \| \| \|
\| \| \| *	add entries to gitignore	Daniel Gultsch	2016-04-10	1	-0/+2
\| \| \| \|
\| \| \| *	don't throw IO exception at end of stream	Daniel Gultsch	2016-04-10	1	-1/+0
\| \| \| \|
\| \| \| *	fixed 'connecting…' button	Daniel Gultsch	2016-04-10	1	-3/+6
\| \| \| \|
\| \| \| *	moved authentication into seperate method. force close socket before ↵	Daniel Gultsch	2016-04-10	1	-38/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changing status
\| \| \| *	introduced setting to turn of notification led	Daniel Gultsch	2016-04-09	3	-5/+15
\| \| \| \|
\| \| \| *	update gradle and gradle plugin	Daniel Gultsch	2016-04-09	3	-4/+4
\| \| \| \|
\| \| \| *	use startdate as lower bound when querying archive with after=x	Daniel Gultsch	2016-04-09	1	-13/+3
\| \| \| \|
\| \| \| *	don't show contact details when in conversations with self	Daniel Gultsch	2016-04-09	3	-1/+8
\| \| \| \|
\| \| \| *	use last received message id when querying archive	Daniel Gultsch	2016-04-09	1	-7/+17
\| \| \| \|
\| \| \| *	transform nimbuzz workaround into a more general 'waitForDisco' condition	Daniel Gultsch	2016-04-09	1	-6/+11
\| \| \| \|
\| \| \| *	add required disco#items query to timeout list	Daniel Gultsch	2016-04-08	1	-1/+4
\| \| \| \|
\| \| \| *	increase version code to fix nasty bug in 1.11.5 beta1.11.5	Daniel Gultsch	2016-04-08	1	-1/+1
\| \| \| \|
\| \| \| *	removed ernoexception in exchange for a regular exeption to prevent verify ↵	Daniel Gultsch	2016-04-08	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	error on <5.0
\| \| \| *	version bump to 1.11.5 + changelog	Daniel Gultsch	2016-04-08	2	-2/+5
\| \| \| \|
\| \| \| *	pulled translations from transifex	Daniel Gultsch	2016-04-08	2	-3/+23
\| \| \| \|
\| \| \| *	check file owner when attaching files or using them as avatar	Daniel Gultsch	2016-04-07	4	-2/+55
\| \| \| \|
\| \| \| *	prevent null pointer when checking http upload max size	Daniel Gultsch	2016-04-07	1	-6/+6
\| \| \| \|
\| \| \| *	tell people to build debug instead of release	Daniel Gultsch	2016-04-06	1	-1/+1
\| \| \| \|
\| \| \| *	version bump to 1.11.4 + changelog1.11.4	Daniel Gultsch	2016-04-05	2	-2/+6
\| \| \| \|
\| \| \| *	better detect broken pep	Daniel Gultsch	2016-04-05	2	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mark pep as broken when publishing bundle or device list failed reset 'brokenness' when account is getting disabled
\| \| \| *	fixing travis	Daniel Gultsch	2016-04-04	2	-4/+11
\| \| \| \|
\| \| \| *	switched around info and items query to avoid race condition	Daniel Gultsch	2016-04-04	1	-1/+1
\| \| \| \|
\| \| \| *	pulled translations from transifex	Daniel Gultsch	2016-04-04	12	-26/+71
\| \| \| \|
\| \| \| *	removed unnecessary wait for disconnect	Daniel Gultsch	2016-04-04	1	-6/+0
\| \| \| \|
\| \| \| *	made sure the disco#items query has returned before finalizing the bind	Daniel Gultsch	2016-04-04	1	-12/+24
\| \| \| \|
\| * \| \|	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-04-17	0	-0/+0
\| \|\\| \|
\| \| * \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-16	2	-3/+8
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-07	6	-56/+131
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
\| \| * \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-06	12	-144/+135
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
\| \| * \ \ \	Merge commit 'remotes/origin/trz/rename~1' into trz/rebase	steckbrief	2016-04-06	0	-0/+0
\| \| \|\ \ \ \
* \| \| \| \| \| \|	DatabaseBackend updated to serve Conversatiosn Database version and ↵	steckbrief	2016-04-17	17	-38/+393
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conversations+ Database version HttpUpload Flag introduced for message to identify if a link was sent after httpupload message hint for httpupload added (message parsing and message generating)