|  iNPUTmice | f671938e84 | mark conversation as read when displayed marker from another client is received | 2014-10-02 21:07:11 +02:00 | 
				
					
						|  iNPUTmice | cc76e15b95 | avoided unecessary message searchs | 2014-10-02 18:54:21 +02:00 | 
				
					
						|  iNPUTmice | f8be57d43f | show displayed by contact on all devices | 2014-10-02 18:31:19 +02:00 | 
				
					
						|  iNPUTmice | 4b09f0e9d3 | properly dismiss notifications | 2014-10-02 17:36:02 +02:00 | 
				
					
						|  iNPUTmice | fd6f5b0e84 | calculate sample size for thumbnails as well | 2014-09-30 16:22:02 +02:00 | 
				
					
						|  Daniel Gultsch | 0733a94127 | Merge pull request #505 from betheg/fix_invite fixed muc invite with <body/>. | 2014-09-30 11:53:07 +02:00 | 
				
					
						|  Daniel Gultsch | 511b7a53f4 | notifiy only when necessary | 2014-09-29 18:28:13 +02:00 | 
				
					
						|  Michael | c8160b010d | fixed muc invite with <body/>. | 2014-09-29 17:59:53 +02:00 | 
				
					
						|  Daniel Gultsch | 87010e6094 | more improvments for new notification service | 2014-09-28 16:33:25 +02:00 | 
				
					
						|  Daniel Gultsch | bff23c2e23 | new notification service. first draft | 2014-09-28 15:21:56 +02:00 | 
				
					
						|  iNPUTmice | 1ae9338fc9 | made muc passwords and prefereced encryption method persistant across restarts | 2014-09-27 18:16:31 +02:00 | 
				
					
						|  Michael | 1d3a6125d2 | add false argument to inflate. | 2014-09-27 16:45:37 +02:00 | 
				
					
						|  iNPUTmice | 2415781ebf | fixed some lint warnings. thanks @betheg | 2014-09-27 11:46:56 +02:00 | 
				
					
						|  iNPUTmice | 8fb0fb0c0d | anwser to xmpp: style uris. fixed open conversations from android address book | 2014-09-27 11:37:02 +02:00 | 
				
					
						|  iNPUTmice | 6e77343407 | revised send button in landscape mode | 2014-09-27 10:51:46 +02:00 | 
				
					
						|  iNPUTmice | 54278febb4 | changed method that determins whether or not sm is available | 2014-09-23 15:36:20 +02:00 | 
				
					
						|  iNPUTmice | 248a1693ea | refactored options menu handling a bit | 2014-09-23 15:06:49 +02:00 | 
				
					
						|  iNPUTmice | b14f693c2e | dont mark message as send on resend | 2014-09-23 11:49:17 +02:00 | 
				
					
						|  iNPUTmice | 12c2fde61b | fixed rare npe | 2014-09-23 11:48:48 +02:00 | 
				
					
						|  iNPUTmice | 59009ded82 | fixed very rare npe | 2014-09-22 16:04:37 +02:00 | 
				
					
						|  iNPUTmice | 45aede14bd | fixed #452 | 2014-09-22 13:23:35 +02:00 | 
				
					
						|  iNPUTmice | bb065020ff | don't show time stamp within the last 6 hours of a new day | 2014-09-22 11:00:46 +02:00 | 
				
					
						|  iNPUTmice | c2bc15f5ba | added 'model' to selectable resources. fixed #461 | 2014-09-22 11:00:13 +02:00 | 
				
					
						|  iNPUTmice | 1f91ed11fa | show full date in message list, fixed #328 | 2014-09-21 23:16:23 +02:00 | 
				
					
						|  iNPUTmice | 98a8fd4d05 | changed message merger a bit | 2014-09-21 22:58:19 +02:00 | 
				
					
						|  iNPUTmice | cca5865ecb | fixed #454 - added fast srcolling to some lists | 2014-09-21 00:45:07 +02:00 | 
				
					
						|  Daniel Gultsch | d806923d57 | Merge pull request #460 from betheg/receipts indicates received messages with a tick. | 2014-09-20 19:55:53 +02:00 | 
				
					
						|  iNPUTmice | 37aacbeb74 | fixed presence splitting | 2014-09-20 16:26:40 +02:00 | 
				
					
						|  iNPUTmice | 0b86f65bdc | fixed #470 | 2014-09-20 16:02:49 +02:00 | 
				
					
						|  Michael | a86a09ab5b | indicates received messages with a tick. | 2014-09-20 15:49:25 +02:00 | 
				
					
						|  iNPUTmice | 295bfb7f1d | made xmppconnection service available in generators | 2014-09-20 15:29:06 +02:00 | 
				
					
						|  iNPUTmice | c282ef4645 | scroll fixes | 2014-09-19 21:09:54 +02:00 | 
				
					
						|  iNPUTmice | 2a185c8fc9 | background daemon doesn't start automatically if there are no enabled accounts. fixed #443 fixed #442 | 2014-09-19 17:21:33 +02:00 | 
				
					
						|  iNPUTmice | 3da0d5adce | fixed #462 | 2014-09-19 14:35:35 +02:00 | 
				
					
						|  Daniel Gultsch | 8796af22d1 | Merge pull request #448 from betheg/add_break add a forgotten break and remove some unused imports | 2014-09-19 10:32:40 +02:00 | 
				
					
						|  Michael | b9e7f4870c | add a forgotten break and remove some unused imports | 2014-09-13 21:15:45 +02:00 | 
				
					
						|  Michael | 00ff5c2dbd | MUC: notify also on private messages | 2014-09-13 14:02:14 +02:00 | 
				
					
						|  Michael | 0d873903b8 | add proper namespace in carbon | 2014-09-12 20:14:19 +02:00 | 
				
					
						|  iNPUTmice | db816187f8 | check if market is available before starting to install openkey chain | 2014-09-11 18:02:09 +02:00 | 
				
					
						|  iNPUTmice | dee46f3453 | match color in contact details to the colors in the send button. also migrated some other colors from hard coding to using resources | 2014-09-11 14:24:10 +02:00 | 
				
					
						|  iNPUTmice | ff41918cb7 | missed show=chat for send button colorization | 2014-09-11 13:19:46 +02:00 | 
				
					
						|  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 | 
				
					
						|  iNPUTmice | c62937016b | rotate avatars Conflicts:
	src/eu/siacs/conversations/persistance/FileBackend.java | 2014-09-02 11:31:39 +02:00 | 
				
					
						|  iNPUTmice | 2c9b2e6bf8 | fixed #406 | 2014-09-02 11:27:43 +02:00 | 
				
					
						|  iNPUTmice | f888b167c6 | rotate avatars | 2014-09-02 11:19:05 +02:00 | 
				
					
						|  Daniel Gultsch | 6045bcc2eb | Merge pull request #408 from emdete/unicode_emoticons add all whitespaces in regex | 2014-09-02 10:39:13 +02:00 | 
				
					
						|  M. Dietrich | a7b3aa343e | add all whitespaces in regex | 2014-09-02 01:18:25 +02:00 | 
				
					
						|  Daniel Gultsch | 6291ebf1a3 | Merge pull request #380 from emdete/unicode_emoticons add translation from ascii to unicode emoticons | 2014-09-01 23:58:00 +02:00 | 
				
					
						|  M. Dietrich | 546082147a | transform ascii to emoticons (on display only) | 2014-09-01 23:48:42 +02:00 | 
				
					
						|  iNPUTmice | d42ea45b1c | fixed #403 | 2014-09-01 14:03:21 +02:00 | 
				
					
						|  iNPUTmice | a7881754f5 | fixed #403 | 2014-09-01 13:51:49 +02:00 |