|  iNPUTmice | 56b4ac1751 | use isBareJid instead of getResourcePart().isEmpty() | 2014-11-09 19:06:43 +01:00 | 
				
					
						|  iNPUTmice | eb9e988361 | fixed muc sender history for some cases (where the previous nick was a valid jid) | 2014-11-09 18:24:01 +01:00 | 
				
					
						|  Sam Whited | 180a0e4408 | Rework `Account.getJid()' to return full JIDs Remove `Account.getFullJid()' | 2014-11-09 10:57:22 -05:00 | 
				
					
						|  iNPUTmice | 377bd49ee8 | refactored code to always contain full jid for counterpart | 2014-11-09 16:21:13 +01:00 | 
				
					
						|  Sam Whited | 7cfcf10f48 | Fix contact highlighting in MUC | 2014-11-09 07:20:08 -05:00 | 
				
					
						|  Sam Whited | 02db197a89 | Fix crash on account creation | 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 | 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 | 9db624ec7b | It builds again! | 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 | 
				
					
						|  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 | 7d4e03cc9a | Merge branch 'development' of https://github.com/siacs/Conversations into development | 2014-11-04 22:56:36 +01: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 | 
				
					
						|  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 | 
				
					
						|  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 |