| 
							
							
								 kruks23 | ad19100b9d | Update Spanish Translations | 2014-05-14 19:18:07 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f4eebd091c | fixed #105 | 2014-05-14 18:32:58 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 65e7294802 | Merge branch 'development' into feature/take_picture | 2014-05-14 00:09:38 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | ebae779d73 | one more entry to strings file | 2014-05-13 18:06:56 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 888de850cf | Merge branch 'development' into feature/take_picture | 2014-05-13 17:23:58 +02:00 |  | 
			
				
					| 
							
							
								 Beriain | efac008ffb | Fix | 2014-05-13 16:52:35 +02:00 |  | 
			
				
					| 
							
							
								 Beriain | 8d27d0c44a | Merge https://github.com/siacs/Conversations into development | 2014-05-13 16:46:03 +02:00 |  | 
			
				
					| 
							
							
								 Beriain | 1150f47add | Update basque translation and include preferences | 2014-05-13 16:42:26 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 6dfd885d34 | submenu for attach file | 2014-05-13 15:25:04 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 3cd369fb7b | german translation | 2014-05-13 13:51:13 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f38c7b22fd | further translations | 2014-05-13 11:23:11 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | cce12af766 | fixed french language | 2014-05-13 10:18:59 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 32d2efd459 | Merge pull request #88 from BenoitBouvarel/development Translation into French | 2014-05-12 23:29:26 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | dee1ba3bdd | Merge pull request #101 from kruks23/development Preferences Spanish Translations | 2014-05-12 23:28:19 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | ae768598fe | Preferences Spanish Translations | 2014-05-12 23:22:47 +02:00 |  | 
			
				
					| 
							
							
								 alvar | cb706e9e82 | Fix a typo in catalan translation | 2014-05-12 23:15:18 +02:00 |  | 
			
				
					| 
							
							
								 alvar | d07139d3c4 | Translation into catalan language | 2014-05-12 23:14:58 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | ecea4a5cd2 | fixed parsing error on missing %s | 2014-05-12 23:12:01 +02:00 |  | 
			
				
					| 
							
							
								 Beriain | 3858715ccf | Update basque translation | 2014-05-12 17:19:00 +02:00 |  | 
			
				
					| 
							
							
								 Beriain | 75f7695087 | Merge https://github.com/siacs/Conversations into development | 2014-05-12 17:09:32 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 3455d10a4a | Better error handling if attach file doesnt work (on permission denied) and unified encrypted and unencrypted file attachment | 2014-05-12 14:59:46 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 4d0bf7971e | transfered preferences descritpions into strings.xml | 2014-05-11 13:55:15 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | fcc021aa94 | Delete styles.xml | 2014-05-10 11:26:53 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | 1f32089ec0 | Merge remote-tracking branch 'origin/development' into development Conflicts:
	res/values-es/arrays.xml
	res/values-es/strings.xml | 2014-05-10 11:23:56 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | 3d913c2e0e | Translation into spanish. | 2014-05-10 11:23:04 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | 38d3da6c2b | #79 First translation into spanish. | 2014-05-10 10:50:57 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | ef0bc6714a | added dialog for otr file transfer | 2014-05-09 21:20:34 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | a14a28973a | nicer descriptions in notificaton for images and encrypted messages | 2014-05-09 20:46:43 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schürmann | 8a2da100d5 | Improve OTR fingerprint dialog and fix german sentence | 2014-05-08 19:03:32 +02:00 |  | 
			
				
					| 
							
							
								 Beriain | 42c07bf4ae | Update basque translation | 2014-05-08 15:59:32 +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 |  | 
			
				
					| 
							
							
								 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 | 6b20a213b0 | basic german translation | 2014-05-06 22:14:02 +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 | 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 | f36f218469 | unified presence selection for otr and file transfer | 2014-04-26 12:40:21 +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 | 77da0c6b5d | allow images to be opened with gallary app | 2014-04-21 19:51:03 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 8006931f80 | put more string into strings.xml | 2014-04-18 00:17:34 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 4a36abf30f | added clear history dialog (no funcionality) | 2014-04-18 00:17:34 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | bdf9770a61 | made ui with sending images a little smoother | 2014-04-15 15:19:02 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 2014af0f7e | Merge pull request #59 from jelmer/typo-preemptively Fix typo: Preemptivly -> Preemptively. | 2014-04-14 10:23:06 +02:00 |  | 
			
				
					| 
							
							
								 Jelmer Vernooij | 3727b90ce1 | Fix typo: Preemptivly -> Preemptively. | 2014-04-14 02:38:21 +02:00 |  | 
			
				
					| 
							
							
								 Jelmer Vernooij | 802c21a793 | Fix two typos: assoziated -> associated. | 2014-04-14 02:22:03 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 7dfe4ae082 | some code cleanup. added setting to auto accept files. socks5 connections are now threaded | 2014-04-13 18:09:40 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 51100ab48b | failed messages get now marked inline | 2014-04-11 09:13:56 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 644473205a | incomming jingle packets are routed to their connection. added presence chooser in gui | 2014-04-10 14:12:08 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 78bd6c423f | fixed #52. thanks @strb | 2014-04-07 23:58:59 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 3f403fb8a9 | jingle connection and manager. able to trigger dialog in gajim | 2014-04-07 20:05:45 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | c30bf75a5d | gui for images | 2014-04-06 15:34:08 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 7749103909 | added attach file action | 2014-04-06 15:28:19 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | cc977eee90 | renamed [Archive conversation|Leave conference] to End this conversation | 2014-04-06 15:23:40 +02:00 |  | 
			
				
					| 
							
							
								 Rene Treffer | 5684849249 | Remove option to enable/disable TLS (now enabled by default) | 2014-04-03 21:22:17 +02:00 |  | 
			
				
					| 
							
							
								 Rene Treffer | e6797e1db4 | Remove option for compression (enabled by default / hidden setting) | 2014-04-03 20:54:50 +02:00 |  | 
			
				
					| 
							
							
								 Rene Treffer | 9502ff25dd | Add compression support | 2014-04-03 18:37:25 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 21be7bc160 | added permenant notification when one or more accounts are unable to connect | 2014-04-03 09:21:45 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | ade2982b5e | fixed #32 | 2014-03-31 19:28:03 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 6285851352 | fixed #31 | 2014-03-31 19:27:42 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | ea766d970f | crash reporter | 2014-03-27 16:09:23 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f4c9c19ec0 | spelling | 2014-03-26 21:07:16 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | a9e34d3492 | tryed to fix more otr bugs. new resource setting | 2014-03-21 22:14:52 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 6be2a08f19 | otr messages are now ignored if conversations isnt 100% sure the message is ours | 2014-03-19 16:16:40 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 8cd59bb944 | better muc invitations. clearified the creation of ad hoc mucs with an alert dialog | 2014-03-15 15:13:35 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 841c6e04a9 | muc invites in conference details | 2014-03-15 06:20:59 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | afe1244709 | muc creation | 2014-03-15 04:59:18 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f3b6c99693 | changed layout a bit in messages | 2014-03-15 00:42:01 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 8f9712c64e | added security indicator on every single message | 2014-03-15 00:19:42 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | b0d57d01c4 | renaming conferences over conference details | 2014-03-14 23:32:48 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | b1a3d09ca6 | use conference subject to identiy room | 2014-03-14 22:40:56 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 4e4a767743 | added display of own fingerprint | 2014-03-14 21:36:38 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 4e20b81bd9 | fixed problem with null messages. added ask again button | 2014-03-14 18:56:52 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 03f9f6e54d | fixed some graphic bugs | 2014-03-13 22:14:05 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 9c811f8fb2 | sharing text | 2014-03-13 21:37:27 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 678dbd37c6 | finished registration | 2014-03-13 17:29:22 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | eec3906692 | fixed bug where one couldnt short click to edit in the account list | 2014-03-13 04:32:19 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | eadebeb77c | added server info and deal with thi 'connecting...' bug | 2014-03-12 22:31:50 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | d943e218a4 | make conference notificaton optional | 2014-03-12 14:55:23 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f9fbc02825 | default notification sound | 2014-03-08 04:18:42 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 5955da3519 | fixed a couple of pgp bugs | 2014-03-08 00:31:29 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 93d11b3c99 | made untrust certificate warning more beautified | 2014-03-07 20:22:26 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | e4963ce86e | ui fixes for tablets | 2014-03-07 18:22:15 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | b7d8c34386 | request focus bug fix | 2014-03-07 18:21:57 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 3bb5fcb3ca | tls exceptions for untrusted certs | 2014-03-07 14:24:33 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | c666b086d6 | display keys in contact details | 2014-03-06 20:00:46 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 78312d71dd | reworked contact details | 2014-03-05 15:41:14 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 6f86638341 | more workaroud for ejabberd bugs | 2014-03-04 04:09:15 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 8e4be5256e | Muc Options even more awesome | 2014-03-04 02:51:01 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | c609eefefa | api changes. muc options | 2014-03-03 05:01:02 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 2ab6cb0ada | hover effect | 2014-03-01 11:05:40 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | acf80bddd0 | rebranding | 2014-02-28 18:46:01 +01:00 |  |