Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							96e2dfa246
							
						
					 | 
					
						
						
							
							Merge pull request #447 from betheg/private_notify
						
						
						
						
						
						
						
						MUC: notify also on private messages 
						
					 | 
					
						2014-09-19 10:32:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d5b58449a0
							
						
					 | 
					
						
						
							
							Merge pull request #453 from Elinvention/development
						
						
						
						
						
						
						
						Created Italian translation 
						
					 | 
					
						2014-09-19 10:31:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							756832ce8e
							
						
					 | 
					
						
						
							
							Merge pull request #467 from qooob/development
						
						
						
						
						
						
						
						Localization update to 0.7.1 
						
					 | 
					
						2014-09-19 10:29:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							3fb38e6f08
							
						
					 | 
					
						
						
							
							Merge pull request #465 from beriain/development
						
						
						
						
						
						
						
						Update basque translation 
						
					 | 
					
						2014-09-19 10:28:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							74fb0686f3
							
						
					 | 
					
						
						
							
							Merge pull request #466 from weiss/add-german-translations
						
						
						
						
						
						
						
						Add missing German translations 
						
					 | 
					
						2014-09-19 10:28:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilia Rostovtsev
							
						 
					 | 
					
						
						
						
						
							
						
						
							b773c4636d
							
						
					 | 
					
						
						
							
							Updated localization
						
						
						
						
						
						
						
						Localization update in compliance with Conversations 0.7.1 
						
					 | 
					
						2014-09-19 12:16:23 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilia Rostovtsev
							
						 
					 | 
					
						
						
						
						
							
						
						
							bfb21b9e8a
							
						
					 | 
					
						
						
							
							Typoes
						
						
						
						
						
						
						
						Fixing typos 
						
					 | 
					
						2014-09-19 12:14:00 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilia Rostovtsev
							
						 
					 | 
					
						
						
						
						
							
						
						
							3caf5dd496
							
						
					 | 
					
						
						
							
							Updated username
						
						
						
						
						
						
						
						Changing URL of my account, in accordance with updated username 
						
					 | 
					
						2014-09-19 12:11:59 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Holger Weiß
							
						 
					 | 
					
						
						
						
						
							
						
						
							216b2a08fc
							
						
					 | 
					
						
						
							
							Add missing German translations
						
						
						
						
						
					 | 
					
						2014-09-19 00:07:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aitor Beriain
							
						 
					 | 
					
						
						
						
						
							
						
						
							45ac2572fe
							
						
					 | 
					
						
						
							
							Update strings.xml
						
						
						
						
						
					 | 
					
						2014-09-18 15:05:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aitor Beriain
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf5081127d
							
						
					 | 
					
						
						
							
							Update arrays.xml
						
						
						
						
						
					 | 
					
						2014-09-18 14:57:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Elia Argentieri
							
						 
					 | 
					
						
						
						
						
							
						
						
							17cf941bef
							
						
					 | 
					
						
						
							
							Created Italian translation
						
						
						
						
						
					 | 
					
						2014-09-14 12:38:20 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							2127fcb902
							
						
					 | 
					
						
						
							
							Merge branch 'development' of github.com:siacs/Conversations into development
						
						
						
						
						
					 | 
					
						2014-09-12 23:50:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a36958b88
							
						
					 | 
					
						
						
							
							fixed #446
						
						
						
						
						
					 | 
					
						2014-09-12 23:50:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							e6eef53768
							
						
					 | 
					
						
						
							
							Merge pull request #445 from betheg/namespace
						
						
						
						
						
						
						
						add proper namespace in carbon 
						
					 | 
					
						2014-09-12 20:27:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d873903b8
							
						
					 | 
					
						
						
							
							add proper namespace in carbon
						
						
						
						
						
					 | 
					
						2014-09-12 20:14:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							83c3b33f18
							
						
					 | 
					
						
						
							
							Merge branch 'development'
						
						
						
						
						
					 | 
					
						2014-09-12 17:53:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							cee898084e
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations
						
						
						
						
						
					 | 
					
						2014-09-12 17:53:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							73cba91c9b
							
						
					 | 
					
						
						
							
							version bump to 0.7.1
						
						
						
						
						
					 | 
					
						2014-09-12 17:52:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							ca560ae4de
							
						
					 | 
					
						
						
							
							updated swedish translations. thank you Anders Sandblad
						
						
						
						
						
					 | 
					
						2014-09-12 14:28:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							62cdd7c6d8
							
						
					 | 
					
						
						
							
							Merge pull request #441 from svetlemodry/master
						
						
						
						
						
						
						
						Czech translation for Conversations 
						
					 | 
					
						2014-09-12 14:16:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jaroslav Lichtblau
							
						 
					 | 
					
						
						
						
						
							
						
						
							00d2757b5a
							
						
					 | 
					
						
						
							
							Created Czech strings.xml translation file
						
						
						
						
						
					 | 
					
						2014-09-12 11:56:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jaroslav Lichtblau
							
						 
					 | 
					
						
						
						
						
							
						
						
							19488d39dc
							
						
					 | 
					
						
						
							
							czech arrays.xml file created
						
						
						
						
						
					 | 
					
						2014-09-11 18:03:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							db816187f8
							
						
					 | 
					
						
						
							
							check if market is available before starting to install openkey chain
						
						
						
						
						
					 | 
					
						2014-09-11 18:02:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							c9a342fc6e
							
						
					 | 
					
						
						
							
							more formating
						
						
						
						
						
					 | 
					
						2014-09-11 16:32:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							12b62adeca
							
						
					 | 
					
						
						
							
							added missing strings back. + formating
						
						
						
						
						
					 | 
					
						2014-09-11 16:22:33 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							7fd4f13ff8
							
						
					 | 
					
						
						
							
							added something about delivery failed to readme
						
						
						
						
						
					 | 
					
						2014-09-11 13:15:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							31f11070e3
							
						
					 | 
					
						
						
							
							IT'S CHRISTMAS ALREADY!
						
						
						
						
						
					 | 
					
						2014-09-10 17:59:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6d4a9cda1
							
						
					 | 
					
						
						
							
							started development on 0.8-alpha
						
						
						
						
						
					 | 
					
						2014-09-10 17:58:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1d6f91036
							
						
					 | 
					
						
						
							
							added bookmarks to XEP list
						
						
						
						
						
					 | 
					
						2014-09-09 22:51:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							1cd5949a79
							
						
					 | 
					
						
						
							
							added a list of XEPs
						
						
						
						
						
					 | 
					
						2014-09-09 22:16:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							79a8c29bc5
							
						
					 | 
					
						
						
							
							Merge pull request #435 from kruks23/translation4
						
						
						
						
						
						
						
						Update Spanish Translations 
						
					 | 
					
						2014-09-09 18:54:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d4ad58356
							
						
					 | 
					
						
						
							
							Update Spanish Translations
						
						
						
						
						
					 | 
					
						2014-09-09 18:45:03 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9c4637b31
							
						
					 | 
					
						
						
							
							hide encryption settings under 'expert options'
						
						
						
						
						
					 | 
					
						2014-09-08 22:11:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							3f77e5fa55
							
						
					 | 
					
						
						
							
							bumped openpgp-api to version 5
						
						
						
						
						
					 | 
					
						2014-09-08 20:31:26 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Schürmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							0be263d5d3
							
						
					 | 
					
						
						
							
							Work on Yubikey decryption
						
						
						
						
						
					 | 
					
						2014-09-08 14:09:15 +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 | 
					
					
						
						
							
							
							
						
					 |