index
:
conversations
BrianBlade-feature/swipe_out_conversation
CryptoNextAlpha
CryptoNextBeta
JingleFixes
MessageParserNext
UnreadCountBadge
cbe
delay_fixes
development
dnsfixes
feature/file_transfer
feature/foreground_service
feature/http_upload
feature/mam
feature/otr_verification
idn_fixes
issue921
lolipop_dns_server_discovery
master
more_logging_for_view_intent
muc_vcard_avatars
nfc
possible_copperhead_fixes
reworked_host_finder_loop
show_members_in_conference
show_send_button_in_softkeyboard
six_love
slack_workaround
tor_support
travis-fixes
travis_fixes
trz/emojicon-merge
trz/emojicon-new
trz/master
trz/merge_1.10.0
trz/merge_1.10.1
trz/merge_1.11.0
trz/merge_1.11.1
trz/merge_1.11.7
trz/merge_1.12.4
trz/merge_1.5.2
trz/merge_1.6.3
trz/merge_1.9.3
trz/merge_1.9.4
trz/rebase
trz/rename
trz/test
verbose_login_log
copy of conversations repo
lookshe
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
src
/
main
/
java
/
eu
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Fields that we sync on should be final
Sam Whited
2014-11-09
1
-1
/
+1
*
Fix bug introduced by rebase
Sam Whited
2014-11-09
1
-5
/
+4
*
Fix letter avatar selection in MUC
Sam Whited
2014-11-09
2
-13
/
+2
*
More formatting fixes in MUC
Sam Whited
2014-11-09
1
-1
/
+5
*
Format contact names in MUC properly
Sam Whited
2014-11-09
2
-24
/
+27
*
Fix JID parsing error
Sam Whited
2014-11-09
1
-1
/
+1
*
It builds again!
Sam Whited
2014-11-09
4
-19
/
+14
*
Add a packet JID place I missed...
Sam Whited
2014-11-09
1
-1
/
+1
*
Update more files to use JID objects
Sam Whited
2014-11-09
14
-54
/
+102
*
Update another chunk of stuff to use JID objects
Sam Whited
2014-11-09
9
-83
/
+104
*
Update more files to use JID objects
Sam Whited
2014-11-09
12
-115
/
+179
*
Move a chunk of classes over to using JID objects
Sam Whited
2014-11-09
22
-475
/
+526
*
Use factories to generate JIDs
Sam Whited
2014-11-09
1
-18
/
+22
*
Improve JID error handling
Sam Whited
2014-11-09
2
-9
/
+57
*
Add first attempt at JID class
Sam Whited
2014-11-09
1
-0
/
+151
*
version bump to 0.8.3 + changelog
iNPUTmice
2014-11-09
1
-1
/
+1
*
fixed #634
iNPUTmice
2014-11-09
1
-2
/
+2
*
got rid of MTM and mRandom variable in favor of using a reference to service
iNPUTmice
2014-11-09
1
-12
/
+7
*
check if socket was null before doing ssl connect
iNPUTmice
2014-11-08
2
-47
/
+42
*
update conversation fragment on every backend connect
iNPUTmice
2014-11-08
1
-2
/
+3
*
Merge pull request #549 from emdete/p2
Daniel Gultsch
2014-11-08
1
-3
/
+7
|
\
|
*
adjust api level wrapping
M. Dietrich
2014-11-04
1
-3
/
+7
*
|
bug fixes for the previous ui refactoring
iNPUTmice
2014-11-07
3
-27
/
+20
*
|
UI code refactoring
iNPUTmice
2014-11-07
3
-253
/
+172
*
|
fixed #633
iNPUTmice
2014-11-06
1
-24
/
+26
*
|
don't show avatar on initial account creation
iNPUTmice
2014-11-06
1
-2
/
+4
*
|
version bump to 0.8.2
0.8.2
iNPUTmice
2014-11-06
1
-1
/
+1
*
|
fixed notifications for images
iNPUTmice
2014-11-05
2
-28
/
+35
*
|
fixed #617
iNPUTmice
2014-11-05
1
-26
/
+22
*
|
Merge pull request #626 from SamWhited/issue612
Daniel Gultsch
2014-11-04
2
-14
/
+44
|
\
\
|
*
|
Add last seen info to the database
Sam Whited
2014-11-04
2
-14
/
+44
|
|
/
*
|
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
iNPUTmice
2014-11-04
2
-0
/
+56
|
\
\
|
*
|
Convert about dialog to activity
Sam Whited
2014-11-04
2
-6
/
+29
|
*
|
Move AboutDialog to correct path
Sam Whited
2014-11-04
1
-0
/
+33
|
|
/
*
/
link to account details when touching own avatar
iNPUTmice
2014-11-04
1
-118
/
+124
|
/
*
clear avatar cache after nick name change
iNPUTmice
2014-11-04
1
-4
/
+8
*
Merge pull request #625 from SamWhited/linterfix
Daniel Gultsch
2014-11-04
1
-1
/
+3
|
\
|
*
Make linter ignore properly checked API mismatch
Sam Whited
2014-11-04
1
-1
/
+3
*
|
show avatar in editaccount
iNPUTmice
2014-11-04
1
-1
/
+18
|
/
*
register nfc callback in every activity that provides a proper sharable uri
iNPUTmice
2014-11-04
5
-16
/
+18
*
optimize code abit
M. Dietrich
2014-11-04
1
-29
/
+23
*
implement "correct" ndef parsing
M. Dietrich
2014-11-04
1
-13
/
+25
*
made qr code available from muc and contact details as well
iNPUTmice
2014-11-04
5
-105
/
+167
*
added missing return statement. fixed api bug
iNPUTmice
2014-11-04
1
-3
/
+2
*
be more OO
M. Dietrich
2014-11-04
1
-51
/
+44
*
support pre JELLY_BEAN ndef
M. Dietrich
2014-11-04
1
-16
/
+24
*
fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @em...
iNPUTmice
2014-11-03
3
-165
/
+271
|
\
|
*
basic beam code / untested
iNPUTmice
2014-11-03
3
-127
/
+187
*
|
unfinishd qr code implemenation. thanks to @emdete
iNPUTmice
2014-11-03
2
-11
/
+110
|
/
*
create file explicitly before downloading image
iNPUTmice
2014-11-03
1
-0
/
+2
[next]