|  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 | 31f11070e3 | IT'S CHRISTMAS ALREADY! | 2014-09-10 17:59:57 +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 | 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 | 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 | 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 | 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 | 0e5a0a07fd | made otr a little bit more solid when there is no presence subscription | 2014-09-06 18:21:31 +02:00 | 
				
					
						|  iNPUTmice | dc02137106 | warn user if no presence subscription exists | 2014-09-05 13:29:45 +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 | 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 | 
				
					
						|  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 | 2c9b2e6bf8 | fixed #406 | 2014-09-02 11:27:43 +02:00 | 
				
					
						|  M. Dietrich | 546082147a | transform ascii to emoticons (on display only) | 2014-09-01 23:48:42 +02:00 | 
				
					
						|  iNPUTmice | 94389ac22a | show merged time and status in message adapter | 2014-08-31 18:55:15 +02:00 | 
				
					
						|  iNPUTmice | 28fa48704d | add missing blank before nick | 2014-08-31 17:48:00 +02:00 | 
				
					
						|  Bahtiar `kalkin-` Gadimov | 3e3451bcff | Smarter nickname highlight insert in confernces | 2014-08-31 17:24:52 +02:00 | 
				
					
						|  iNPUTmice | 1ac5be4855 | some code cleanup | 2014-08-31 16:28:21 +02:00 | 
				
					
						|  Daniel Gultsch | 8d456085e5 | Merge pull request #391 from betheg/fix_typo fix forgotten spelling. | 2014-08-31 15:56:41 +02:00 | 
				
					
						|  iNPUTmice | 8f8d4e320d | experimental message merging | 2014-08-31 14:29:12 +02:00 | 
				
					
						|  Michael | 3714947d5f | Merge remote-tracking branch 'upstream/development' into fix_typo | 2014-08-29 23:30:47 +02:00 | 
				
					
						|  iNPUTmice | 5450a2ae46 | fixed link to old resource | 2014-08-29 14:05:10 +02:00 | 
				
					
						|  iNPUTmice | b0d777d9ca | fixed npe | 2014-08-29 12:14:10 +02:00 | 
				
					
						|  iNPUTmice | 33172246c9 | fixed #389 | 2014-08-29 10:24:25 +02:00 | 
				
					
						|  Michael | 98dabe9ab4 | fix forgotten spelling. | 2014-08-28 16:49:52 +02:00 | 
				
					
						|  iNPUTmice | 85b31b8d8b | fixed spelling thanks @betheg | 2014-08-28 11:01:24 +02:00 | 
				
					
						|  iNPUTmice | 431d4ed44b | translated missing string in settings | 2014-08-27 09:43:53 +02:00 | 
				
					
						|  iNPUTmice | 07b422d4c8 | fixed message hint | 2014-08-25 15:43:50 +02:00 | 
				
					
						|  Daniel Gultsch | e0b759340d | jump right into edit account if now accounts are configured | 2014-08-23 21:31:27 +02:00 | 
				
					
						|  Daniel Gultsch | d504daec16 | changed workflow on inital avatar publication | 2014-08-23 20:00:05 +02:00 | 
				
					
						|  Daniel Gultsch | ee9872277d | removed server compat value in favor of a (small xep list) | 2014-08-23 15:56:30 +02:00 | 
				
					
						|  iNPUTmice | c40c8ee910 | tiny redesign for private muc messages | 2014-08-22 13:22:07 +02:00 |