| 
							
							
								 Daniel Gultsch | fe5c4cab46 | don't reinit conversation when coming back to activity. avoids unnecessary scrolling | 2015-05-12 03:56:13 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | ceadf2f6fb | pulled updated translations from transifex | 2015-05-11 14:28:36 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | b6f85ba0dd | avoid using paragraph style breaks by accident | 2015-05-11 14:18:30 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 9156665add | increased space between merged messages a bit | 2015-05-11 09:20:08 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 53e43daa0d | add a little bit of space between merged messages. | 2015-05-11 09:08:56 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 21deda7b00 | no font padding on red hearts | 2015-05-11 08:45:38 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 22b12091a1 | rewrote parts of message adapter to avoid using NULL views | 2015-05-11 07:57:52 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 239e86a98a | optimized heart render code a bit | 2015-05-10 12:04:11 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 33d1621e3b | added white heart to new rendering as well | 2015-05-10 11:56:23 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | e6d336c293 | Merge branch 'development' of github.com:siacs/Conversations into development | 2015-05-10 11:45:01 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 1e28f60038 | changed conversation red to material red | 2015-05-10 03:14:13 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 4c486f5e58 | paint single unicode hearts as red and slightly larger | 2015-05-10 03:12:44 +02:00 |  | 
			
				
					| 
							
							
								 Andreas Shimokawa | 9e78e3e09d | only forward incoming chat messages to Pebble App and Gadgetbridge | 2015-05-08 21:36:20 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | d9e5035c08 | config option to reset attempt counts when changing network (default=true) | 2015-05-08 06:50:28 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | c4a4dd2392 | throw proper exception before changing account into error state | 2015-05-08 06:30:06 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | e0653c0371 | fixed encrypted ibb file transfer which was broken with ART. fixes #1172 | 2015-05-07 14:19:51 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 05f0aa614f | fixed npe when binval value of vcard avatar is null | 2015-05-07 11:07:15 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | d74e8a8a0e | fixed npe when missing instructions on failed register | 2015-05-06 04:33:21 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | db726a59b8 | fwiw don't allow stanza count to go over MAX_INT | 2015-05-06 04:29:45 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | b7c672e10e | avoid fetching avatars multiple times in parallel | 2015-05-05 10:29:41 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 5136bf9832 | r/o support for vcard avatars. pep avatars will be prefered | 2015-05-05 06:17:34 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | e6aa604ade | enabled sm logging by default at least for development branch | 2015-05-05 06:10:47 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 61fd5d6696 | clean up in attachment chooser code. fixed #1168 | 2015-05-04 09:54:10 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 2582ece210 | open market if share location plugin isn't installed | 2015-05-04 04:38:12 +02:00 |  | 
			
				
					| 
							
							
								 Alexander Groshev | d15da64c5d | Fix typos in URL to the project | 2015-05-03 20:53:27 +03:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 43db9cdf4b | turn send button in cancel button while in whisper mode | 2015-05-03 09:30:30 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | c4bfffe6a9 | mark account with incompatible server when no sasl mechansim could be found | 2015-05-02 12:10:56 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 53fea9e1fe | replace send button with quick action button as long as no text has been entered | 2015-05-02 11:38:56 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | e1fab8a488 | pulled translations from transifex | 2015-05-01 13:52:19 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | bcdfdb9ccf | added config option to be a bit more verbose about stanza counts | 2015-04-29 16:15:07 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f0d51fcb77 | pulled translations from transifex | 2015-04-29 10:19:03 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 6a15bc26b6 | npe check after reading image uri | 2015-04-28 22:23:45 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | d94c231a74 | adjust dimens slightly to work with v21+ (v21 doesn't count the navigation bar) | 2015-04-28 16:25:32 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 92d14c4a00 | increased padding on image buttons on v21 to match material guidelines | 2015-04-28 14:46:52 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 93e942f96d | made material icons smaller (24dp) | 2015-04-28 14:28:51 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f3805b8bab | stop conference details from crashing when rotating the screen | 2015-04-28 13:56:08 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 51bf8ec98e | fixed npe when rotating screen in contact details activity | 2015-04-28 13:31:33 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | b1843fb61a | print stack trace on io error | 2015-04-28 09:35:10 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | b10b8e2c50 | escape nick in highlight regex pattern | 2015-04-28 09:32:58 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f8e06d8e9a | revert undo timeout to a more reasonable value | 2015-04-28 09:25:58 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | a4ff8e3633 | increased padding around switches in manage accounts | 2015-04-27 12:19:05 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 4caa92e8ff | handle returning from camera without picture | 2015-04-27 12:18:27 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | e11d658f5e | use xmppserviceconnection to send iq packets in jingle connection | 2015-04-26 20:27:30 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | c283fec0d1 | hard code bitmap configs | 2015-04-26 20:26:59 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 7f2a83a684 | pulled translations from transifex | 2015-04-26 10:48:36 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 0fda254d48 | Merge pull request #1135 from BrianBlade/manage_certificates Add option to remove manually approved certificates | 2015-04-25 19:09:50 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 5ea1c547d5 | fixed service discovery by properly storing and checking identities | 2015-04-25 18:24:10 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 82daf849aa | fixed #1039 | 2015-04-25 14:42:32 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 77caf73103 | Merge pull request #1146 from BrianBlade/minor_otr_tweaks OTR: Fix onContactStatusChanged & dont archive OTR | 2015-04-25 14:09:38 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | d07baccf97 | cleaned up file handling | 2015-04-25 14:08:24 +02:00 |  |