1
0
Fork 1
Commit graph

1690 commits

Author SHA1 Message Date
Sam Whited
d5e69bb0e5 Add first attempt at JID class 2014-11-09 06:59:49 -05:00
Sam Whited
527af80fd2 Add jxmpp-stringprep-libidn dependency 2014-11-09 06:59:49 -05:00
iNPUTmice
101e328f22 bumped gradle files + changelog 2014-11-09 11:09:52 +01:00
iNPUTmice
67af26b601 version bump to 0.8.3 + changelog 2014-11-09 11:08:09 +01:00
iNPUTmice
cbd6d360b6 fixed #634 2014-11-09 10:51:54 +01:00
iNPUTmice
d879d1e425 use proper theme for MTM 2014-11-09 10:51:35 +01:00
iNPUTmice
045b17dd26 got rid of MTM and mRandom variable in favor of using a reference to service 2014-11-09 10:50:45 +01:00
iNPUTmice
01adfcf06d check if socket was null before doing ssl connect 2014-11-08 20:52:02 +01:00
iNPUTmice
386e7f04f8 update conversation fragment on every backend connect 2014-11-08 20:51:27 +01:00
Daniel Gultsch
1dd228091f Merge pull request #549 from emdete/p2
adjust api level wrapping
2014-11-08 13:32:13 +01:00
iNPUTmice
c9294b372f bug fixes for the previous ui refactoring 2014-11-07 21:49:31 +01:00
iNPUTmice
ea133bd66b UI code refactoring 2014-11-07 15:38:59 +01:00
iNPUTmice
5791f53b1f fixed #633 2014-11-06 17:25:14 +01:00
iNPUTmice
d949738433 don't show avatar on initial account creation 2014-11-06 16:51:50 +01:00
iNPUTmice
8ec409a261 linked conference 2014-11-06 10:48:00 +01:00
iNPUTmice
9cf3c9d2a7 linked conference room 2014-11-06 10:46:06 +01:00
iNPUTmice
23c949dea0 version bump to 0.8.2 2014-11-06 10:32:04 +01:00
iNPUTmice
0958affcb9 fixed notifications for images 2014-11-05 21:37:40 +01:00
iNPUTmice
7a62b088d6 fixed #617 2014-11-05 00:06:07 +01:00
iNPUTmice
7cc8539b67 reformated license a bit 2014-11-04 23:47:15 +01:00
Daniel Gultsch
f263ee78e4 Merge pull request #626 from SamWhited/issue612
Add last seen info to the database
2014-11-04 22:59:32 +01:00
iNPUTmice
632264f6e1 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-04 22:56:36 +01:00
Daniel Gultsch
c62c95533b Merge pull request #616 from SamWhited/license-compliance
License compliance via an "about" menu item
2014-11-04 22:56:33 +01:00
Sam Whited
c748a7cece Add last seen info to the database
Fixes #612
2014-11-04 16:41:35 -05:00
M. Dietrich
72e728560f adjust api level wrapping 2014-11-04 20:05:45 +01:00
Sam Whited
129eae46a4 Shorten license text and fix height of scrollview 2014-11-04 13:26:48 -05:00
Sam Whited
46d6d27b27 Use normal text size and color 2014-11-04 13:17:15 -05:00
Sam Whited
a7cd57a0c5 Make links clickable in about text 2014-11-04 13:09:56 -05:00
iNPUTmice
d49b2e5562 link to account details when touching own avatar 2014-11-04 18:52:29 +01:00
Sam Whited
6a6ad33435 Convert about dialog to activity 2014-11-04 12:48:46 -05:00
Sam Whited
2a5080aeff Use real copyright symbol © 2014-11-04 12:48:25 -05:00
Sam Whited
9271841125 Move AboutDialog to correct path 2014-11-04 12:47:58 -05:00
Sam Whited
107ff7195c Add about dialog with license info 2014-11-04 12:47:58 -05:00
iNPUTmice
bf6e49c51b clear avatar cache after nick name change 2014-11-04 18:27:20 +01:00
Daniel Gultsch
aac40085cd Merge pull request #625 from SamWhited/linterfix
Make linter ignore properly checked API mismatch
2014-11-04 17:59:26 +01:00
Sam Whited
4b33ca9737 Make linter ignore properly checked API mismatch 2014-11-04 11:52:47 -05:00
iNPUTmice
1a693ef0ba show avatar in editaccount 2014-11-04 17:38:41 +01:00
iNPUTmice
8a12483508 register nfc callback in every activity that provides a proper sharable uri 2014-11-04 17:10:35 +01:00
Daniel Gultsch
b8066d9421 Merge pull request #622 from emdete/p1
P1
2014-11-04 17:02:46 +01:00
M. Dietrich
971a05feef optimize code abit 2014-11-04 13:32:44 +01:00
M. Dietrich
00a26b71d9 implement "correct" ndef parsing 2014-11-04 13:32:37 +01:00
iNPUTmice
ca5f2c82ca made qr code available from muc and contact details as well 2014-11-04 12:15:14 +01:00
iNPUTmice
bad0629151 added missing return statement. fixed api bug 2014-11-04 11:04:05 +01:00
Daniel Gultsch
6d9c32bd1c Merge pull request #620 from emdete/p0
P0
2014-11-04 10:50:19 +01:00
M. Dietrich
28d52dea17 be more OO 2014-11-04 10:49:10 +01:00
M. Dietrich
51ee7b3abf support pre JELLY_BEAN ndef 2014-11-04 10:48:59 +01:00
iNPUTmice
fa4427a5b9 fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @emdete 2014-11-03 23:47:49 +01:00
iNPUTmice
bc95323609 unfinishd qr code implemenation. thanks to @emdete 2014-11-03 22:47:07 +01:00
iNPUTmice
ef594db52b fixed merge error 2014-11-03 21:22:26 +01:00
iNPUTmice
40ac6fd0d6 Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc
Conflicts:
	src/main/AndroidManifest.xml
2014-11-03 21:07:24 +01:00