Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								76889b9c58
								
							
						 | 
						
							
							
								
								handle invalid base64 is SASl SCRAM response
							
							
							
							
							
						 | 
						
							2016-05-07 11:34:17 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								e2d3bef739
								
							
						 | 
						
							
							
								
								Merge pull request #1829 from sebastianv89/patch-1
							
							
							
							
							
							
							
							Remove copy of innerkey 
							
						 | 
						
							2016-05-05 20:23:03 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a7cd05bd4e
								
							
						 | 
						
							
							
								
								report bind failure as account state
							
							
							
							
							
						 | 
						
							2016-05-05 20:22:47 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								0157039e87
								
							
						 | 
						
							
							
								
								log more information about HTTP’s max upload size
							
							
							
							
							
						 | 
						
							2016-05-05 19:34:44 +02:00 | 
						
					
				
					
						
							
							
								 
								Sebastian
							
						 | 
						
							
							
							
							
							
								
							
							
								544e1dee65
								
							
						 | 
						
							
							
								
								Remove copy of innerkey
							
							
							
							
							
							
							
							The line overwrites this.innerkey with the value that was already there. 
							
						 | 
						
							2016-05-05 17:09:01 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								6e0ec9b924
								
							
						 | 
						
							
							
								
								republish pgp signature when changing status
							
							
							
							
							
						 | 
						
							2016-05-05 13:17:04 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								12704fa640
								
							
						 | 
						
							
							
								
								refactor captcha response handling to avoid network on main thread exception
							
							
							
							
							
						 | 
						
							2016-05-05 09:58:35 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								8a81f85734
								
							
						 | 
						
							
							
								
								version bump to 1.12.1 + changelog
							
							
							
							
							
						 | 
						
							2016-05-04 22:24:07 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								c27663c456
								
							
						 | 
						
							
							
								
								clear password field before setting new one
							
							
							
							
							
						 | 
						
							2016-05-04 18:23:36 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								fb41a4ffaa
								
							
						 | 
						
							
							
								
								fixed npe when calling changepassword activity directly
							
							
							
							
							
						 | 
						
							2016-05-04 18:22:17 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								16eb1bfbd0
								
							
						 | 
						
							
							
								
								pulled translations from transifex
							
							
							
							
							
						 | 
						
							2016-05-04 13:19:07 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								b334582eff
								
							
						 | 
						
							
							
								
								Merge pull request #1827 from ka7/spelling_fix_no_translations
							
							
							
							
							
							
							
							spelling fixes 
							
						 | 
						
							2016-05-04 10:47:00 +02:00 | 
						
					
				
					
						
							
							
								 
								klemens
							
						 | 
						
							
							
							
							
							
								
							
							
								7047d68165
								
							
						 | 
						
							
							
								
								spelling fixes
							
							
							
							
							
						 | 
						
							2016-05-04 10:29:29 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								dee7fd3eab
								
							
						 | 
						
							
							
								
								Merge pull request #1826 from sebastianv89/patch-1
							
							
							
							
							
							
							
							Renaming of variable 
							
						 | 
						
							2016-05-04 09:28:46 +02:00 | 
						
					
				
					
						
							
							
								 
								Sebastian
							
						 | 
						
							
							
							
							
							
								
							
							
								cf374ec4ef
								
							
						 | 
						
							
							
								
								Renaming of variable
							
							
							
							
							
							
							
							Was probably just a copy/paste typo. 
							
						 | 
						
							2016-05-03 23:35:57 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								59f02f7766
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:siacs/Conversations
							
							
							
							
							
						 | 
						
							2016-05-03 22:17:16 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								cef2eb58a7
								
							
						 | 
						
							
							
								
								fixed presence template dedup for 'online' status
							
							
							
							
							
						 | 
						
							2016-05-03 22:16:51 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								fad8b702aa
								
							
						 | 
						
							
							
								
								use app name in resource suggestions
							
							
							
							
							
						 | 
						
							2016-05-03 12:41:37 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								cfa31beaf7
								
							
						 | 
						
							
							
								
								fixed spelling in readme
							
							
							
							
							
						 | 
						
							2016-05-03 09:39:30 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								f444390617
								
							
						 | 
						
							
							
								
								update 'create account' faq entry
							
							
							
							
							
						 | 
						
							2016-05-02 14:39:58 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								06a561743a
								
							
						 | 
						
							
							
								
								ping all accounts at the same time
							
							
							
							
							
						 | 
						
							2016-05-02 14:31:30 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								7674e01585
								
							
						 | 
						
							
							
								
								version bump to 1.12.0 + changelog
							
							
							
							
							
						 | 
						
							2016-05-02 11:05:53 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								bf92ef6cd3
								
							
						 | 
						
							
							
								
								pulled translations from transifex
							
							
							
							
							
						 | 
						
							2016-05-02 11:05:31 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								d23178acb9
								
							
						 | 
						
							
							
								
								show only username when registering account with magic create
							
							
							
							
							
						 | 
						
							2016-05-02 10:37:28 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								98ecac0ffa
								
							
						 | 
						
							
							
								
								removed unnecessary logging
							
							
							
							
							
						 | 
						
							2016-04-30 13:34:20 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								936006173c
								
							
						 | 
						
							
							
								
								properly cancel avatar tasks
							
							
							
							
							
						 | 
						
							2016-04-29 20:38:23 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								d5608cb4f3
								
							
						 | 
						
							
							
								
								catch ActivityNotFoundException when requesting battery op
							
							
							
							
							
						 | 
						
							2016-04-29 13:58:37 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								c7882b7225
								
							
						 | 
						
							
							
								
								port all android drop down list items to our own
							
							
							
							
							
						 | 
						
							2016-04-29 13:48:30 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								6d9ca25915
								
							
						 | 
						
							
							
								
								catch rare NPE when determining max http size
							
							
							
							
							
						 | 
						
							2016-04-29 13:24:26 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								252d015b71
								
							
						 | 
						
							
							
								
								synchronize around thumbnail cache to avoid loading images twice
							
							
							
							
							
						 | 
						
							2016-04-28 20:15:28 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								1d2e2f71c2
								
							
						 | 
						
							
							
								
								cancel potential tasks when receiving image preview from cache
							
							
							
							
							
						 | 
						
							2016-04-28 20:14:53 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								51753a1d39
								
							
						 | 
						
							
							
								
								cleaned up captcha dialog
							
							
							
							
							
						 | 
						
							2016-04-28 20:13:58 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								5021b9a5dd
								
							
						 | 
						
							
							
								
								don't request disco from self
							
							
							
							
							
						 | 
						
							2016-04-28 19:02:20 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								29616d02a8
								
							
						 | 
						
							
							
								
								removed unused config variables
							
							
							
							
							
						 | 
						
							2016-04-27 16:43:02 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ebcb13c8eb
								
							
						 | 
						
							
							
								
								made it possible to go back to welcome screen from edit account
							
							
							
							
							
						 | 
						
							2016-04-27 10:35:08 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								e6b526230a
								
							
						 | 
						
							
							
								
								renamed welcome header to untranslatable 'Start your Conversations'
							
							
							
							
							
						 | 
						
							2016-04-27 09:59:25 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								9c3e910dc4
								
							
						 | 
						
							
							
								
								prevent user from accidentally changing password after using magic create
							
							
							
							
							
						 | 
						
							2016-04-26 23:23:48 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								59652ecaf2
								
							
						 | 
						
							
							
								
								fixed table creation
							
							
							
							
							
						 | 
						
							2016-04-25 11:06:17 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								6a677a172b
								
							
						 | 
						
							
							
								
								Merge pull request #1821 from kriztan/patch-1
							
							
							
							
							
							
							
							Update build.gradle 
							
						 | 
						
							2016-04-24 11:26:01 +02:00 | 
						
					
				
					
						
							
							
								 
								Christian S
							
						 | 
						
							
							
							
							
							
								
							
							
								94983ca3ed
								
							
						 | 
						
							
							
								
								Update build.gradle
							
							
							
							
							
							
							
							this seems be be never used and could be removed 
							
						 | 
						
							2016-04-23 21:46:45 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a363e0a5d8
								
							
						 | 
						
							
							
								
								don't create templates for empty status messages
							
							
							
							
							
						 | 
						
							2016-04-23 15:10:35 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								cd1fbf60ec
								
							
						 | 
						
							
							
								
								add change prescence to manage account context menu
							
							
							
							
							
						 | 
						
							2016-04-23 12:33:56 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a9c1768107
								
							
						 | 
						
							
							
								
								show status messages in contact details
							
							
							
							
							
						 | 
						
							2016-04-23 12:19:00 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								1901abd05f
								
							
						 | 
						
							
							
								
								expert setting to manually change presence
							
							
							
							
							
						 | 
						
							2016-04-22 21:25:06 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								195b745efc
								
							
						 | 
						
							
							
								
								put welcome screen in scrollview
							
							
							
							
							
						 | 
						
							2016-04-22 00:17:08 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								1a073ca454
								
							
						 | 
						
							
							
								
								added magic create welcome screen
							
							
							
							
							
						 | 
						
							2016-04-19 18:03:24 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								bfe01c4322
								
							
						 | 
						
							
							
								
								version bump to 1.11.7 + changelog
							
							
							
							
							
						 | 
						
							2016-04-14 23:13:44 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								e9494af098
								
							
						 | 
						
							
							
								
								always notify by default in conferences
							
							
							
							
							
						 | 
						
							2016-04-14 22:37:05 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								eb63cdb9ad
								
							
						 | 
						
							
							
								
								removed unnecessary call to stopSelf() after logging out
							
							
							
							
							
						 | 
						
							2016-04-14 21:45:36 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								72aa10b536
								
							
						 | 
						
							
							
								
								add setting for quick sharing
							
							
							
							
							
						 | 
						
							2016-04-14 21:12:44 +02:00 |