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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c82cdb36f6
							
						
					 | 
					
						
						
							
							Merge pull request #1180 from ashimokawa/development
						
						
						
						
						
						
						
						only forward incoming chat messages to Pebble App and Gadgetbridge (#1179) 
						
					 | 
					
						2015-05-09 04:37:07 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							90b74d4b80
							
						
					 | 
					
						
						
							
							version code bumped
						
						
						
						
						
					 | 
					
						2015-05-07 14:24:40 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							9eaa6800ca
							
						
					 | 
					
						
						
							
							bumped version code
						
						
						
						
						
					 | 
					
						2015-05-05 08:10:16 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							e388c75452
							
						
					 | 
					
						
						
							
							update travis config
						
						
						
						
						
					 | 
					
						2015-05-04 05:49:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							768f1ef237
							
						
					 | 
					
						
						
							
							update build tools and target api
						
						
						
						
						
					 | 
					
						2015-05-04 05:40:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							32593cff87
							
						
					 | 
					
						
						
							
							updated contributor list in README.md
						
						
						
						
						
						
						
						* added BrianBlade to list
* linked Pull Requests for each Contributor 
						
					 | 
					
						2015-05-04 05:07:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							2582ece210
							
						
					 | 
					
						
						
							
							open market if share location plugin isn't installed
						
						
						
						
						
					 | 
					
						2015-05-04 04:38:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7415c8f3b3
							
						
					 | 
					
						
						
							
							Merge pull request #1167 from sattellite/patch-1
						
						
						
						
						
						
						
						Fix typos in URL to the project 
						
					 | 
					
						2015-05-04 03:53:22 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							fbf81f59db
							
						
					 | 
					
						
						
							
							version bump to 1.3.1
						
						
						
						
						
					 | 
					
						2015-05-02 12:12:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9cc8ba320f
							
						
					 | 
					
						
						
							
							mark account with incompatible server when no sasl mechansim could be found
						
						
						
						
						
					 | 
					
						2015-05-02 12:11:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ecd3634c91
							
						
					 | 
					
						
						
							
							shut up linter. fixed build
						
						
						
						
						
					 | 
					
						2015-05-02 12:11:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f97aaab014
							
						
					 | 
					
						
						
							
							Merge tag '1.3.0'
						
						
						
						
						
					 | 
					
						2015-05-02 12:11:14 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							48e8e0f1fc
							
						
					 | 
					
						
						
							
							version bump to 1.4.0-alpha (in development)
						
						
						
						
						
					 | 
					
						2015-05-02 12:00:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							650255e18a
							
						
					 | 
					
						
						
							
							shut up linter. fixed build
						
						
						
						
						
					 | 
					
						2015-05-02 11:58:19 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							8617932aad
							
						
					 | 
					
						
						
							
							version bump to 1.3.0
						
						
						
						
						
					 | 
					
						2015-05-01 13:52: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							0624401137
							
						
					 | 
					
						
						
							
							version bump to 1.3.0-beta
						
						
						
						
						
					 | 
					
						2015-04-28 22:23:59 +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 | 
					
					
						
						
							
							
							
						
					 |