|  Daniel Gultsch | b0a0863ba2 | Merge pull request #89 from dschuermann/fix-otr-message Improve OTR fingerprint dialog and fix german sentence | 2014-05-08 20:08:49 +02:00 | 
				
					
						|  Dominik Schürmann | 8a2da100d5 | Improve OTR fingerprint dialog and fix german sentence | 2014-05-08 19:03:32 +02:00 | 
				
					
						|  Dominik Schürmann | 30aea38713 | Merge pull request #2 from siacs/development 2 | 2014-05-08 18:46:37 +02:00 | 
				
					
						|  Daniel Gultsch | c555a9d03c | sending text message after returing from pending intent | 2014-05-08 17:31:53 +02:00 | 
				
					
						|  Daniel Gultsch | 7fa61564b8 | better flow after returning from openkeychain for various actions | 2014-05-08 16:52:19 +02:00 | 
				
					
						|  Beriain | 42c07bf4ae | Update basque translation | 2014-05-08 15:59:32 +02:00 | 
				
					
						|  Dominik Schürmann | 1b2ce1a309 | Merge pull request #1 from siacs/development pull | 2014-05-08 14:40:03 +02:00 | 
				
					
						|  Daniel Gultsch | 99a56a2bde | offer to announce pgp key if pgp encryption is selected from menu | 2014-05-08 14:35:21 +02:00 | 
				
					
						|  Daniel Gultsch | 0ed29c1c77 | more informative dialog if contact doesn't announce public key | 2014-05-08 14:23:09 +02:00 | 
				
					
						|  Daniel Gultsch | dc73a25ae4 | code cleanup | 2014-05-08 11:53:00 +02:00 | 
				
					
						|  Daniel Gultsch | 0d8bf660db | fixed download button on pgp images | 2014-05-08 10:14:12 +02:00 | 
				
					
						|  Daniel Gultsch | f4330b3a48 | Merge pull request #87 from dschuermann/development Use git submodule with openpgp-api-lib only | 2014-05-07 20:06:12 +02:00 | 
				
					
						|  Dominik Schürmann | fa81beac3d | Use git submodule with openpgp-api-lib only | 2014-05-07 18:52:11 +02:00 | 
				
					
						|  Dominik Schürmann | 650e1ebda8 | Add readme | 2014-05-07 17:01:17 +02:00 | 
				
					
						|  Dominik Schürmann | 14dd8cc078 | Initial import from main repo | 2014-05-07 16:31:28 +02:00 | 
				
					
						|  Daniel Gultsch | 02e8db4f4c | updated readme | 2014-05-07 16:02:05 +02:00 | 
				
					
						|  Benoit Bouvarel | 02673b2866 | Traduction Francaise | 2014-05-07 15:38:27 +02:00 | 
				
					
						|  Daniel Gultsch | 5a407c766c | fixed #70 #65 | 2014-05-07 13:19:50 +02:00 | 
				
					
						|  Daniel Gultsch | daa000dd75 | improved next encryption selection | 2014-05-07 13:09:40 +02:00 | 
				
					
						|  Daniel Gultsch | 247f45f46b | remembering text. awesome | 2014-05-07 12:59:15 +02:00 | 
				
					
						|  Daniel Gultsch | 12a3865c47 | correct status after error iq | 2014-05-07 12:58:57 +02:00 | 
				
					
						|  Daniel Gultsch | 955b7dbc7e | wee bit of code cleanup | 2014-05-07 12:33:55 +02:00 | 
				
					
						|  Daniel Gultsch | 6b20a213b0 | basic german translation | 2014-05-06 22:14:02 +02:00 | 
				
					
						|  Daniel Gultsch | 2b37dfbe93 | Merge pull request #80 from beriain/development Add Basque and Spanish translations | 2014-05-06 21:40:11 +02:00 | 
				
					
						|  Daniel Gultsch | 461f2ffb16 | basic pgp encrypted file transfer | 2014-05-06 21:34:30 +02:00 | 
				
					
						|  kruks23 | 0578fb3850 | #79 First translation into spanish. | 2014-05-06 20:34:51 +02:00 | 
				
					
						|  Beriain | b8023b4dfc | Merge https://github.com/siacs/Conversations into development | 2014-05-06 16:56:59 +02:00 | 
				
					
						|  Beriain | 86887274c7 | Update basque and spanish translations | 2014-05-06 16:50:27 +02:00 | 
				
					
						|  Daniel Gultsch | f7033cb7e0 | content name and creator are properly set | 2014-05-03 18:47:53 +02:00 | 
				
					
						|  Daniel Gultsch | 2df57f38a0 | properly reply to iq requests. reply to disco | 2014-05-03 17:42:44 +02:00 | 
				
					
						|  Daniel Gultsch | 4822d4dce7 | allow roster pushes only from bare jid or null | 2014-05-03 17:07:37 +02:00 | 
				
					
						|  Daniel Gultsch | be2f7e047a | more cleanup in res files | 2014-05-03 17:06:54 +02:00 | 
				
					
						|  Daniel Gultsch | 4893d8030b | removed unnecessary files | 2014-05-03 17:04:41 +02:00 | 
				
					
						|  Daniel Gultsch | 3cfb4a0cd6 | added restart button to openkeychain dialog | 2014-05-03 15:24:19 +02:00 | 
				
					
						|  Mikel | 794f9d6cc8 | Add Basque and Spanish translations | 2014-05-02 21:21:56 +02:00 | 
				
					
						|  Daniel Gultsch | 82bccedf70 | nicer dialog screen if openkeychain is not installed | 2014-05-02 12:02:18 +02:00 | 
				
					
						|  Daniel Gultsch | 37c8e157d0 | reworked openpgp integration part #1 | 2014-05-01 22:33:49 +02:00 | 
				
					
						|  Daniel Gultsch | 4b66b4b5d1 | bug fix for jingle | 2014-04-26 17:26:22 +02:00 | 
				
					
						|  Daniel Gultsch | f36f218469 | unified presence selection for otr and file transfer | 2014-04-26 12:40:21 +02:00 | 
				
					
						|  Daniel Gultsch | a55ddb889e | fixed #75 | 2014-04-25 23:14:43 +02:00 | 
				
					
						|  Daniel Gultsch | 6942840061 | setting backround color if image comes directly from cache | 2014-04-25 23:09:15 +02:00 | 
				
					
						|  Daniel Gultsch | 645139eb68 | couple of more optimazations on image loading | 2014-04-25 23:06:20 +02:00 | 
				
					
						|  Daniel Gultsch | bf2d0d5596 | smoother scrolling (first step) | 2014-04-25 16:24:56 +02:00 | 
				
					
						|  Daniel Gultsch | 18c183a767 | deny files with unknown file types | 2014-04-23 21:19:56 +02:00 | 
				
					
						|  Daniel Gultsch | 9a8e55acd1 | added download button for images not accepted automatically | 2014-04-22 18:46:40 +02:00 | 
				
					
						|  Daniel Gultsch | aa5f775fc7 | added support for ibb | 2014-04-22 13:11:53 +02:00 | 
				
					
						|  Daniel Gultsch | d151ad9031 | code cleanup | 2014-04-21 20:39:57 +02:00 | 
				
					
						|  Daniel Gultsch | 77da0c6b5d | allow images to be opened with gallary app | 2014-04-21 19:51:03 +02:00 | 
				
					
						|  Daniel Gultsch | fc6a16c31b | added missing transport id | 2014-04-21 12:03:26 +02:00 | 
				
					
						|  Daniel Gultsch | 4d730fd1ed | added proxy activate and a lot of code clean up. totatly untested | 2014-04-20 22:34:27 +02:00 |