686 Commits

Author	SHA1	Message	Date
iNPUTmice	fef41ba2a2	pare body in type=normal messages as well	2014-09-11 13:18:29 +02:00
iNPUTmice	31f11070e3	IT'S CHRISTMAS ALREADY!	2014-09-10 17:59:57 +02:00
iNPUTmice	4b2e06b9c3	version bump, changelog and one last minute change for OTR	2014-09-09 14:30:16 +02:00
iNPUTmice	c02ef80086	Merge branch 'master' of github.com:siacs/Conversations ... Conflicts: src/eu/siacs/conversations/crypto/PgpEngine.java src/eu/siacs/conversations/persistance/FileBackend.java src/eu/siacs/conversations/ui/ShareWithActivity.java	2014-09-09 14:16:51 +02:00
iNPUTmice	facb1242b6	don't reset images from sending to waiting	2014-09-09 13:56:30 +02:00
iNPUTmice	d92e8381db	setting to increase font size. fixed #420	2014-09-08 23:58:37 +02:00
iNPUTmice	1871521aed	simplefied some code that might have been the source for some strange bugs	2014-09-08 20:29:57 +02:00
iNPUTmice	b23f8bd472	introduced downloadable interface. reverted some of the changes made to OTR	2014-09-08 20:09:44 +02:00
iNPUTmice	a6f0f0cb6e	bug fixes for forcing encryption	2014-09-08 14:29:35 +02:00
iNPUTmice	5cb11396f6	fixed sending offline pgp messages	2014-09-08 14:08:59 +02:00
iNPUTmice	58953e6193	settings to force encryption and setting for not saving messages to disk. fixed #353	2014-09-08 13:37:22 +02:00
iNPUTmice	3b9fd28ef4	don't fail displayed or received messages	2014-09-08 12:51:01 +02:00
iNPUTmice	19f98f5143	warn on missing presence subscription	2014-09-08 12:46:48 +02:00
iNPUTmice	409fdd8596	Merge branch 'development' of github.com:siacs/Conversations into development	2014-09-07 23:08:57 +02:00
iNPUTmice	449c2a544b	fixed #321 - delete otr fingerprints	2014-09-07 23:08:40 +02:00
Daniel Gultsch	5fe3f207d4	Merge pull request #426 from betheg/remove_strings ... deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.	2014-09-07 17:13:10 +02:00
iNPUTmice	90947597e5	fixed #425	2014-09-07 16:53:10 +02:00
Michael	f4d86ecff3	deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.	2014-09-07 15:58:59 +02:00
iNPUTmice	27ad80afc2	trying to avoid rejectedexection	2014-09-07 15:11:40 +02:00
Michael	ecd613dcdd	MUC: set the password from bookmarks.	2014-09-07 14:06:23 +02:00
iNPUTmice	d9990e6cd8	made shareing text with conferences possible again	2014-09-07 13:01:09 +02:00
iNPUTmice	b334ebd0fa	added missing breaks oO	2014-09-07 12:43:01 +02:00
iNPUTmice	890fb9a1b4	fixed npe	2014-09-07 00:09:12 +02:00
iNPUTmice	9a945af6b9	Merge branch 'development' of github.com:siacs/Conversations into development	2014-09-06 18:21:38 +02:00
iNPUTmice	0e5a0a07fd	made otr a little bit more solid when there is no presence subscription	2014-09-06 18:21:31 +02:00
Michael	375ec3a686	MUC: set password from invite message.	2014-09-05 22:07:35 +02:00
iNPUTmice	dc02137106	warn user if no presence subscription exists	2014-09-05 13:29:45 +02:00
iNPUTmice	34228d0e78	improved logging for avatar fetches	2014-09-05 13:29:20 +02:00
iNPUTmice	b8d289a932	fixed #342 - otr with facebook and other services without resources	2014-09-04 19:56:37 +02:00
iNPUTmice	01389e900b	reconnect accounts when resource has been changed in settings	2014-09-04 13:56:36 +02:00
iNPUTmice	9817251ed5	made muc password dialog hide the password (password field)	2014-09-04 11:46:13 +02:00
iNPUTmice	7a3bc5dc45	nick parsing (xep 0172) also enabled for messages and for pep	2014-09-04 10:50:06 +02:00
Daniel Gultsch	1d6c09e8ff	Merge pull request #397 from GZep/development ... XEP-0172	2014-09-04 10:28:13 +02:00
Daniel Gultsch	50f90d37b8	Merge pull request #417 from emdete/unicode_emoticons ... improve regex, implement pattern cache	2014-09-04 10:16:28 +02:00
iNPUTmice	6b9219c5f4	added support for password protected muc - fixed #203 and fixed #395	2014-09-03 19:35:45 +02:00
iNPUTmice	f19b1fb823	changed order of snackbar hints	2014-09-03 18:58:46 +02:00
M. Dietrich	0a2c73f246	improve emo mapping	2014-09-03 17:44:38 +02:00
M. Dietrich	0a686bc71c	use class, use codepoint	2014-09-03 17:29:13 +02:00
M. Dietrich	584984807e	make pattern static	2014-09-03 16:10:50 +02:00
M. Dietrich	cb3ba4045e	improve regex, implement pattern cache	2014-09-03 15:39:46 +02:00
iNPUTmice	2b941d19f8	more openpgp bug fixes	2014-09-03 15:39:35 +02:00
iNPUTmice	253438e698	more openpgp bug fixes	2014-09-03 15:33:44 +02:00
iNPUTmice	664c9c434f	avoiding resource conflicts	2014-09-03 14:57:40 +02:00
iNPUTmice	f1494f83ff	fixed pgp signature creation	2014-09-03 13:06:06 +02:00
iNPUTmice	5ae62f18b4	fixed pgp signature creation	2014-09-03 13:05:22 +02:00
iNPUTmice	1a09a4706b	added ability to disable notifications for specific conversations - fixed #322	2014-09-03 12:36:54 +02:00
iNPUTmice	1f378bffc8	made emoticon parsing enableable - default false	2014-09-03 09:15:07 +02:00
iNPUTmice	97b52abaf9	fixed #410 by removing that config option	2014-09-02 16:00:03 +02:00
iNPUTmice	0ae852a633	refactored share with activity	2014-09-02 15:51:20 +02:00
iNPUTmice	567827ffca	fixed #406	2014-09-02 11:31:56 +02:00