kruks23
							
						 | 
						
							
							
							
							
							
								
							
							
								116456691d
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://github.com/siacs/Conversations into development
							
							
							
							
							
						 | 
						
							2014-05-20 17:49:54 +02:00 | 
						
					
				
					
						
							
							
								 
								Beriain
							
						 | 
						
							
							
							
							
							
								
							
							
								2b50c9912b
								
							
						 | 
						
							
							
								
								Update and fix basque translation
							
							
							
							
							
						 | 
						
							2014-05-20 16:35:02 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ff6e51356f
								
							
						 | 
						
							
							
								
								Merge pull request #128 from kruks23/development
							
							
							
							
							
							
							
							Update Spanish Translations 
							
						 | 
						
							2014-05-20 11:52:11 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								f79d92ab67
								
							
						 | 
						
							
							
								
								highlight people in conferences by clicken on their picture
							
							
							
							
							
						 | 
						
							2014-05-20 11:44:43 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								13f9f23946
								
							
						 | 
						
							
							
								
								fixed ping time out after session resume
							
							
							
							
							
						 | 
						
							2014-05-20 11:05:03 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								8f92d8d109
								
							
						 | 
						
							
							
								
								ported pending subscription support to new roster mgmt
							
							
							
							
							
						 | 
						
							2014-05-20 10:48:07 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a582d44dba
								
							
						 | 
						
							
							
								
								added search icon
							
							
							
							
							
						 | 
						
							2014-05-20 10:15:47 +02:00 | 
						
					
				
					
						
							
							
								 
								kruks23
							
						 | 
						
							
							
							
							
							
								
							
							
								a5a356a7a7
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://github.com/siacs/Conversations into development
							
							
							
							
							
						 | 
						
							2014-05-19 21:42:23 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								371c985c25
								
							
						 | 
						
							
							
								
								made roster persistant aka enabled versioning again
							
							
							
							
							
						 | 
						
							2014-05-19 21:05:17 +02:00 | 
						
					
				
					
						
							
							
								 
								kruks23
							
						 | 
						
							
							
							
							
							
								
							
							
								2a1067b20a
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://github.com/siacs/Conversations into development
							
							
							
							
							
						 | 
						
							2014-05-19 20:21:25 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a6f9a742c0
								
							
						 | 
						
							
							
								
								some code cleanup to deal with the roster mgmt changes from earlier
							
							
							
							
							
						 | 
						
							2014-05-19 15:39:50 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								993477cd83
								
							
						 | 
						
							
							
								
								reworked roster/contact handling. might break some stuff. not sycing to disk yet
							
							
							
							
							
						 | 
						
							2014-05-19 15:15:09 +02:00 | 
						
					
				
					
						
							
							
								 
								kruks23
							
						 | 
						
							
							
							
							
							
								
							
							
								7994b6866b
								
							
						 | 
						
							
							
								
								Update Spanish Translations
							
							
							
							
							
						 | 
						
							2014-05-18 19:33:38 +02:00 | 
						
					
				
					
						
							
							
								 
								kruks23
							
						 | 
						
							
							
							
							
							
								
							
							
								e27bb52575
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://github.com/siacs/Conversations into development
							
							
							
							
							
						 | 
						
							2014-05-18 19:10:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								590e2403ab
								
							
						 | 
						
							
							
								
								bind and session request more compatible
							
							
							
							
							
						 | 
						
							2014-05-18 17:32:20 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								e857cf979d
								
							
						 | 
						
							
							
								
								fixed #123 fixed122
							
							
							
							
							
						 | 
						
							2014-05-18 13:23:26 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								7fc7201abb
								
							
						 | 
						
							
							
								
								cleaned up edit account dialog a little
							
							
							
							
							
						 | 
						
							2014-05-18 11:49:44 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								0cdd74417f
								
							
						 | 
						
							
							
								
								fixed #53 aka server not found bug
							
							
							
							
							
						 | 
						
							2014-05-18 11:25:04 +02:00 | 
						
					
				
					
						
							
							
								 
								kruks23
							
						 | 
						
							
							
							
							
							
								
							
							
								b79ff3af6c
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://github.com/siacs/Conversations into development
							
							
							
							
							
						 | 
						
							2014-05-17 22:03:12 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								66aacf7e3e
								
							
						 | 
						
							
							
								
								sending session after unsucesfull session resume. fixed #116
							
							
							
							
							
						 | 
						
							2014-05-17 21:57:44 +02:00 | 
						
					
				
					
						
							
							
								 
								kruks23
							
						 | 
						
							
							
							
							
							
								
							
							
								2abb57be34
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://github.com/siacs/Conversations into development
							
							
							
							
							
						 | 
						
							2014-05-17 20:41:33 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								c07d3deea3
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development
							
							
							
							
							
						 | 
						
							2014-05-17 19:33:55 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ae6c99012e
								
							
						 | 
						
							
							
								
								bumped version 0.2.3
							
							
							
							
							
						 | 
						
							2014-05-17 19:23:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								b7b25b472c
								
							
						 | 
						
							
							
								
								receiving pgp images important bug fix
							
							
							
							
							
						 | 
						
							2014-05-17 19:22:14 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								736e09fbb5
								
							
						 | 
						
							
							
								
								added record audio button
							
							
							
							
							
						 | 
						
							2014-05-17 19:21:16 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								27060e303c
								
							
						 | 
						
							
							
								
								made sending session more compliant
							
							
							
							
							
						 | 
						
							2014-05-17 19:20:31 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								4c17937640
								
							
						 | 
						
							
							
								
								receiving pgp images important bug fix
							
							
							
							
							
						 | 
						
							2014-05-17 19:19:06 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								4d2e50224c
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development
							
							
							
							
							
						 | 
						
							2014-05-17 13:36:25 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								fddb098857
								
							
						 | 
						
							
							
								
								updated changelog for version 0.2.2
							
							
							
							
							
						 | 
						
							2014-05-17 13:30:32 +02:00 | 
						
					
				
					
						
							
							
								 
								kruks23
							
						 | 
						
							
							
							
							
							
								
							
							
								813896dbc9
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://github.com/siacs/Conversations into development
							
							
							
							
							
						 | 
						
							2014-05-17 13:04:33 +02:00 | 
						
					
				
					
						
							
							
								 
								the-username
							
						 | 
						
							
							
							
							
							
								
							
							
								e34fddd7e1
								
							
						 | 
						
							
							
								
								Update Validator.java
							
							
							
							
							
						 | 
						
							2014-05-17 12:50:17 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a32d95cdd3
								
							
						 | 
						
							
							
								
								fixed #66
							
							
							
							
							
						 | 
						
							2014-05-17 12:10:58 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								cab9b10e35
								
							
						 | 
						
							
							
								
								spelling
							
							
							
							
							
						 | 
						
							2014-05-17 12:02:14 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								bab69ffcf9
								
							
						 | 
						
							
							
								
								fixed #108
							
							
							
							
							
						 | 
						
							2014-05-17 11:08:32 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								836366bf2d
								
							
						 | 
						
							
							
								
								added translators to readme
							
							
							
							
							
						 | 
						
							2014-05-17 10:50:29 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								84a4620649
								
							
						 | 
						
							
							
								
								version bump to 0.2.2
							
							
							
							
							
						 | 
						
							2014-05-17 10:04:57 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								8bf0945f2f
								
							
						 | 
						
							
							
								
								permanent notification disapears now when account is being deleted + code clean up
							
							
							
							
							
						 | 
						
							2014-05-17 10:03:15 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								b84b67268b
								
							
						 | 
						
							
							
								
								fixed #113
							
							
							
							
							
						 | 
						
							2014-05-17 09:43:47 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								f9394e2e69
								
							
						 | 
						
							
							
								
								Merge pull request #120 from kruks23/development
							
							
							
							
							
							
							
							Update Spanish Translations + harcoded pref_advanced_options 
							
						 | 
						
							2014-05-16 23:13:08 +02:00 | 
						
					
				
					
						
							
							
								 
								kruks23
							
						 | 
						
							
							
							
							
							
								
							
							
								9b95b07b97
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://github.com/siacs/Conversations into development
							
							
							
							
							
						 | 
						
							2014-05-16 22:49:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								cd1afbd39a
								
							
						 | 
						
							
							
								
								reworked message to conferences
							
							
							
							
							
						 | 
						
							2014-05-16 22:46:15 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a0a5ca9585
								
							
						 | 
						
							
							
								
								fixed npe for otr sessions with non contacts
							
							
							
							
							
						 | 
						
							2014-05-16 22:44:54 +02:00 | 
						
					
				
					
						
							
							
								 
								kruks23
							
						 | 
						
							
							
							
							
							
								
							
							
								e50f009004
								
							
						 | 
						
							
							
								
								Update Spanish Translations + harcoded pref_advanced_settings
							
							
							
							
							
						 | 
						
							2014-05-16 22:35:58 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								225447f2f5
								
							
						 | 
						
							
							
								
								updated german translation
							
							
							
							
							
						 | 
						
							2014-05-16 16:16:35 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								aa68045c58
								
							
						 | 
						
							
							
								
								offline sending of pgp fixed
							
							
							
							
							
						 | 
						
							2014-05-16 13:42:20 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								c8f8bab2a1
								
							
						 | 
						
							
							
								
								formating
							
							
							
							
							
						 | 
						
							2014-05-16 13:18:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								1cf1e62e30
								
							
						 | 
						
							
							
								
								fixed null in shared link
							
							
							
							
							
						 | 
						
							2014-05-16 12:07:58 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								afd1ba657a
								
							
						 | 
						
							
							
								
								Merge pull request #117 from BenoitBouvarel/development
							
							
							
							
							
							
							
							French translation + hard-coded string > @string 
							
						 | 
						
							2014-05-16 11:55:17 +02:00 | 
						
					
				
					
						
							
							
								 
								Benoit Bouvarel
							
						 | 
						
							
							
							
							
							
								
							
							
								3d0f08e319
								
							
						 | 
						
							
							
								
								French translation + hard-coded string > @string
							
							
							
							
							
						 | 
						
							2014-05-16 01:13:07 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								3426df21c1
								
							
						 | 
						
							
							
								
								Merge pull request #109 from kruks23/development
							
							
							
							
							
							
							
							Update Spanish Translations 
							
						 | 
						
							2014-05-15 12:07:41 +02:00 |