Andreas Straub
							
						 | 
						
							
							
							
							
							
								
							
							
								cb7980c65e
								
							
						 | 
						
							
							
								
								Use bareJid for own session retrieval
							
							
							
							
							
						 | 
						
							2015-07-19 21:32:26 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Straub
							
						 | 
						
							
							
							
							
							
								
							
							
								c1d23b2395
								
							
						 | 
						
							
							
								
								Migrate to new PEP layout
							
							
							
							
							
							
							
							Merge prekeys into bundle node 
							
						 | 
						
							2015-07-19 21:32:26 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Straub
							
						 | 
						
							
							
							
							
							
								
							
							
								6492801b89
								
							
						 | 
						
							
							
								
								Formatting fixes
							
							
							
							
							
						 | 
						
							2015-07-19 21:32:26 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Straub
							
						 | 
						
							
							
							
							
							
								
							
							
								74026b742b
								
							
						 | 
						
							
							
								
								Save IdentityKeys in database
							
							
							
							
							
						 | 
						
							2015-07-19 21:32:26 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Straub
							
						 | 
						
							
							
							
							
							
								
							
							
								9e07fc5651
								
							
						 | 
						
							
							
								
								DatabaseBackend bugfixes
							
							
							
							
							
							
							
							Don't leak cursors, initially create tables 
							
						 | 
						
							2015-07-19 21:32:26 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Straub
							
						 | 
						
							
							
							
							
							
								
							
							
								299bbdf27f
								
							
						 | 
						
							
							
								
								Reformat code to use tabs
							
							
							
							
							
							
							
							This really sucks to do it like this. Sorry. :( 
							
						 | 
						
							2015-07-19 21:32:26 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Straub
							
						 | 
						
							
							
							
							
							
								
							
							
								065519d3f3
								
							
						 | 
						
							
							
								
								Added axolotl activation code to UI
							
							
							
							
							
						 | 
						
							2015-07-19 21:32:26 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Straub
							
						 | 
						
							
							
							
							
							
								
							
							
								77619b55e4
								
							
						 | 
						
							
							
								
								Added PEP and message protocol layers
							
							
							
							
							
							
							
							Can now fetch/retrieve from PEP, as well as encode/decode messages 
							
						 | 
						
							2015-07-19 21:32:26 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Straub
							
						 | 
						
							
							
							
							
							
								
							
							
								f73aa1a200
								
							
						 | 
						
							
							
								
								Reworked axolotl protocol layer
							
							
							
							
							
							
							
							Numerous fixes 
							
						 | 
						
							2015-07-19 21:32:25 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Straub
							
						 | 
						
							
							
							
							
							
								
							
							
								077932eb55
								
							
						 | 
						
							
							
								
								CryptoNext Menu entries added
							
							
							
							
							
						 | 
						
							2015-07-19 21:32:25 +02:00 | 
						
					
				
					
						
							
							
								 
								Andreas Straub
							
						 | 
						
							
							
							
							
							
								
							
							
								b8048a5538
								
							
						 | 
						
							
							
								
								CryptoNext persistance layer mockup
							
							
							
							
							
							
							
							Initial sketch of the peripheral storage infrastructure for the new
axolotl-based encryption scheme. 
							
						 | 
						
							2015-07-19 21:32:21 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								c4f3e5be3f
								
							
						 | 
						
							
							
								
								shut up linter
							
							
							
							
							
						 | 
						
							2015-07-19 14:51:11 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								9b70c7e68c
								
							
						 | 
						
							
							
								
								bugfix: don't crash if aes key could not be set before jingle transfer
							
							
							
							
							
						 | 
						
							2015-07-19 14:51:04 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								5c017e5186
								
							
						 | 
						
							
							
								
								bugfix: use sendIqPacket method in service instead of invoking XmppConnection directly
							
							
							
							
							
						 | 
						
							2015-07-19 14:25:30 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								0166ced46c
								
							
						 | 
						
							
							
								
								bugfix: accept status code 201 on http upload
							
							
							
							
							
						 | 
						
							2015-07-19 13:36:02 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								f58b2afcaa
								
							
						 | 
						
							
							
								
								changed switch widget
							
							
							
							
							
						 | 
						
							2015-07-18 19:38:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								731e1dcd43
								
							
						 | 
						
							
							
								
								Merge branch 'development'
							
							
							
							
							
						 | 
						
							2015-07-18 00:17:17 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								451345f8ed
								
							
						 | 
						
							
							
								
								bump version to 1.5.0
							
							
							
							
							
						 | 
						
							2015-07-18 00:16:32 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								15b880f3a1
								
							
						 | 
						
							
							
								
								pulled translations
							
							
							
							
							
						 | 
						
							2015-07-18 00:02:13 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ce527c8b76
								
							
						 | 
						
							
							
								
								account for downloaded http files in dup checker
							
							
							
							
							
						 | 
						
							2015-07-18 00:01:34 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								aa1b9de20c
								
							
						 | 
						
							
							
								
								code cleanup
							
							
							
							
							
						 | 
						
							2015-07-17 23:58:53 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								c3584a6db7
								
							
						 | 
						
							
							
								
								fixed inactive http download
							
							
							
							
							
						 | 
						
							2015-07-17 23:58:33 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								13cce172ab
								
							
						 | 
						
							
							
								
								show error message in account details when info has not been edited
							
							
							
							
							
						 | 
						
							2015-07-17 13:14:24 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								1f43115544
								
							
						 | 
						
							
							
								
								increased ibb block size
							
							
							
							
							
						 | 
						
							2015-07-17 13:06:51 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								4f62793a67
								
							
						 | 
						
							
							
								
								version bump to 1.5.0-beta.2
							
							
							
							
							
						 | 
						
							2015-07-16 14:27:36 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								425f0479a8
								
							
						 | 
						
							
							
								
								even less jumpy
							
							
							
							
							
						 | 
						
							2015-07-16 14:06:54 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								6a329c7465
								
							
						 | 
						
							
							
								
								fixed some ux glitches in editaccount
							
							
							
							
							
						 | 
						
							2015-07-16 13:42:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								babbd389f6
								
							
						 | 
						
							
							
								
								removed empty translation file
							
							
							
							
							
						 | 
						
							2015-07-16 13:29:59 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a31ab555b8
								
							
						 | 
						
							
							
								
								Merge branch 'development' of github.com:siacs/Conversations into development
							
							
							
							
							
						 | 
						
							2015-07-16 13:26:12 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								7bd66549d8
								
							
						 | 
						
							
							
								
								made 'check image on http host' message more generic. fixed #1281
							
							
							
							
							
						 | 
						
							2015-07-16 13:25:52 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								b477b8f57b
								
							
						 | 
						
							
							
								
								fixed some npes
							
							
							
							
							
						 | 
						
							2015-07-16 13:14:51 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								43fb216e72
								
							
						 | 
						
							
							
								
								Merge pull request #1285 from kriztan/patch-2
							
							
							
							
							
							
							
							fixed another typo 
							
						 | 
						
							2015-07-16 11:07:16 +02:00 | 
						
					
				
					
						
							
							
								 
								Christian S.
							
						 | 
						
							
							
							
							
							
								
							
							
								73e703e5d4
								
							
						 | 
						
							
							
								
								fixed another typo
							
							
							
							
							
						 | 
						
							2015-07-16 10:15:26 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								3190f114e7
								
							
						 | 
						
							
							
								
								Merge pull request #1283 from Manouchehri/development
							
							
							
							
							
							
							
							Fixed broken URL. 
							
						 | 
						
							2015-07-16 10:12:49 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								1a36d21023
								
							
						 | 
						
							
							
								
								Merge pull request #1284 from kriztan/patch-1
							
							
							
							
							
							
							
							fixed typo 
							
						 | 
						
							2015-07-16 10:12:42 +02:00 | 
						
					
				
					
						
							
							
								 
								Christian S.
							
						 | 
						
							
							
							
							
							
								
							
							
								612e8bd794
								
							
						 | 
						
							
							
								
								fixed typo
							
							
							
							
							
						 | 
						
							2015-07-16 07:36:35 +02:00 | 
						
					
				
					
						
							
							
								 
								David Manouchehri
							
						 | 
						
							
							
							
							
							
								
							
							
								34aff6f8cf
								
							
						 | 
						
							
							
								
								Fixed broken URL.
							
							
							
							
							
							
							
							The HTTPS server is throwing GitHub's certificate instead of a proper one, so I'm going to stick with HTTP for now. 
							
						 | 
						
							2015-07-15 18:23:59 -04:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								2fa9af735b
								
							
						 | 
						
							
							
								
								mention http upload component in readme
							
							
							
							
							
						 | 
						
							2015-07-15 19:01:05 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								b525b42e59
								
							
						 | 
						
							
							
								
								fixed crash on invalid muc bookmarks
							
							
							
							
							
						 | 
						
							2015-07-15 17:42:08 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ffffca10f0
								
							
						 | 
						
							
							
								
								renamed colors
							
							
							
							
							
						 | 
						
							2015-07-13 12:55:13 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								84bfe8c721
								
							
						 | 
						
							
							
								
								catch exception on broken android phones
							
							
							
							
							
						 | 
						
							2015-07-12 20:17:12 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								558d065d48
								
							
						 | 
						
							
							
								
								made lock button reflect encryption status of the next messages instead of the last
							
							
							
							
							
						 | 
						
							2015-07-12 17:59:22 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								58bc4cba06
								
							
						 | 
						
							
							
								
								only try to change affilations for known jids
							
							
							
							
							
						 | 
						
							2015-07-11 21:24:51 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								4274fe90ac
								
							
						 | 
						
							
							
								
								try to catch weird npe in android sdk
							
							
							
							
							
						 | 
						
							2015-07-11 21:24:30 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								5dd83a5fe6
								
							
						 | 
						
							
							
								
								null check otr fingerprint before display
							
							
							
							
							
						 | 
						
							2015-07-11 21:23:58 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								c4876fab1b
								
							
						 | 
						
							
							
								
								spelling
							
							
							
							
							
						 | 
						
							2015-07-11 20:00:40 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ee3d15765d
								
							
						 | 
						
							
							
								
								Merge branch 'development'
							
							
							
							
							
						 | 
						
							2015-07-10 15:21:27 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								81af16fb6c
								
							
						 | 
						
							
							
								
								added changelog
							
							
							
							
							
						 | 
						
							2015-07-10 15:21:16 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								b73901c3ae
								
							
						 | 
						
							
							
								
								Merge branch 'development'
							
							
							
							
							
						 | 
						
							2015-07-10 15:17:07 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								fce613e4a6
								
							
						 | 
						
							
							
								
								version bump to 1.5.0-beta
							
							
							
							
							
						 | 
						
							2015-07-10 15:15:44 +02:00 |