| 
							
							
								 Daniel Gultsch | cb1a36da79 | Merge pull request #642 from SamWhited/accountgetjid Rework `Account.getJid()' to return full JIDs | 2014-11-09 17:06:09 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | e9af0d4ca7 | Merge branch 'master' into development | 2014-11-09 17:02:49 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 61f046a675 | make avatar service not break on empty names | 2014-11-09 17:02:39 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 180a0e4408 | Rework `Account.getJid()' to return full JIDs Remove `Account.getFullJid()' | 2014-11-09 10:57:22 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ad6fef063b | fixed null pointer in message merger | 2014-11-09 16:47:31 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 377bd49ee8 | refactored code to always contain full jid for counterpart | 2014-11-09 16:21:13 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 2b99b694eb | fixed full jid for account | 2014-11-09 16:20:36 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 87c4fd9050 | return null if from ist not set in abstract stanza | 2014-11-09 16:18:53 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 53c7905631 | Check for illegal arguments to the toASCII func | 2014-11-09 09:05:02 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 7cfcf10f48 | Fix contact highlighting in MUC | 2014-11-09 07:20:08 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | fc594e9b73 | Fix issue with IDN SRV records | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 02db197a89 | Fix crash on account creation | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | cc34c60255 | Don't crash on packets with no "from" specified | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 1a3327f2b1 | Create avatar's for JID's w/o localparts | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 5ce0cd3802 | Fields that we sync on should be final | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | e49c2b14ed | Fix bug introduced by rebase | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 778fb9de6c | Fix letter avatar selection in MUC | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | efa4cec24d | More formatting fixes in MUC | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | dd426ca6de | Format contact names in MUC properly | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 1f5908b1d1 | Fix JID parsing error | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 9db624ec7b | It builds again! | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 864f319500 | Add a packet JID place I missed... | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | f108fc5a5c | Update more files to use JID objects | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | bf9207456e | Update another chunk of stuff to use JID objects | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | f15900426d | Update more files to use JID objects | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 9053f4aca0 | Move a chunk of classes over to using JID objects | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | a990861316 | Use factories to generate JIDs | 2014-11-09 06:59:49 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | a11878b139 | Improve JID error handling | 2014-11-09 06:59:49 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 8e23b6c272 | Add first attempt at JID class | 2014-11-09 06:59:49 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 589bf01545 | version bump to 0.8.3 + changelog | 2014-11-09 11:08:09 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 4d7bee2e38 | fixed #634 | 2014-11-09 10:51:54 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | acfbd44529 | got rid of MTM and mRandom variable in favor of using a reference to service | 2014-11-09 10:50:45 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 047aaf5d4f | check if socket was null before doing ssl connect | 2014-11-08 20:52:02 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ea657ece0d | update conversation fragment on every backend connect | 2014-11-08 20:51:27 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 8a2f20b6ed | Merge pull request #549 from emdete/p2 adjust api level wrapping | 2014-11-08 13:32:13 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 014f5a195b | bug fixes for the previous ui refactoring | 2014-11-07 21:49:31 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | e45d7bda38 | UI code refactoring | 2014-11-07 15:38:59 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | e42b6d715b | fixed #633 | 2014-11-06 17:25:14 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | dace729c5b | don't show avatar on initial account creation | 2014-11-06 16:51:50 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 413623337b | version bump to 0.8.2 | 2014-11-06 10:32:04 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 2253814519 | fixed notifications for images | 2014-11-05 21:37:40 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 6a43bda4d7 | fixed #617 | 2014-11-05 00:06:07 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 0c94804813 | Merge pull request #626 from SamWhited/issue612 Add last seen info to the database | 2014-11-04 22:59:32 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 7d4e03cc9a | Merge branch 'development' of https://github.com/siacs/Conversations into development | 2014-11-04 22:56:36 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 96563aca52 | Add last seen info to the database Fixes #612 | 2014-11-04 16:41:35 -05:00 |  | 
			
				
					| 
							
							
								 M. Dietrich | e22d3b4946 | adjust api level wrapping | 2014-11-04 20:05:45 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 88c0793694 | link to account details when touching own avatar | 2014-11-04 18:52:29 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | f10dd428ba | Convert about dialog to activity | 2014-11-04 12:48:46 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 8bf40308c8 | Move AboutDialog to correct path | 2014-11-04 12:47:58 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ff10b094a0 | clear avatar cache after nick name change | 2014-11-04 18:27:20 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | ff22f93185 | Merge pull request #625 from SamWhited/linterfix Make linter ignore properly checked API mismatch | 2014-11-04 17:59:26 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | b234b690c9 | Make linter ignore properly checked API mismatch | 2014-11-04 11:52:47 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | cd5a56e8e7 | show avatar in editaccount | 2014-11-04 17:38:41 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | b824e55277 | register nfc callback in every activity that provides a proper sharable uri | 2014-11-04 17:10:35 +01:00 |  | 
			
				
					| 
							
							
								 M. Dietrich | 2ce95b19a9 | optimize code abit | 2014-11-04 13:32:44 +01:00 |  | 
			
				
					| 
							
							
								 M. Dietrich | b6c20d9260 | implement "correct" ndef parsing | 2014-11-04 13:32:37 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | b3582c970e | made qr code available from muc and contact details as well | 2014-11-04 12:15:14 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 12e2f0bdd7 | added missing return statement. fixed api bug | 2014-11-04 11:04:05 +01:00 |  | 
			
				
					| 
							
							
								 M. Dietrich | fb24bf98c9 | be more OO | 2014-11-04 10:49:10 +01:00 |  | 
			
				
					| 
							
							
								 M. Dietrich | 32396b3bde | support pre JELLY_BEAN ndef | 2014-11-04 10:48:59 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 7a9327d960 | fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @emdete | 2014-11-03 23:47:49 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | d458919c8f | unfinishd qr code implemenation. thanks to @emdete | 2014-11-03 22:47:07 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 28a186cd6c | basic beam code / untested | 2014-11-03 20:55:46 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 4614ff343e | create file explicitly before downloading image | 2014-11-03 20:55:31 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ec9c264cf7 | more error handling for http connection | 2014-11-03 19:59:11 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 3e05ef77b1 | version bump to 0.8.1 | 2014-11-03 11:20:51 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 49920649db | always use exif helper | 2014-11-03 11:20:32 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 27f42dfb63 | more error handling in xmppconnection | 2014-11-03 10:03:45 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 1ea2e7dc3b | fixed arrayoutofbounds + spelling | 2014-11-01 14:33:34 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 46f147a82c | Merge branch 'gradle' into development Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib | 2014-10-30 15:33:13 -04:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 281ce3105f | Make conversations the root project | 2014-10-22 15:47:11 -04:00 |  |