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
Commit message (
Expand
)
Author
Age
Files
Lines
*
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
*
linked conference
iNPUTmice
2014-11-06
1
-1
/
+1
*
linked conference room
iNPUTmice
2014-11-06
1
-2
/
+3
*
version bump to 0.8.2
0.8.2
iNPUTmice
2014-11-06
3
-3
/
+11
*
fixed notifications for images
iNPUTmice
2014-11-05
2
-28
/
+35
*
fixed #617
iNPUTmice
2014-11-05
1
-26
/
+22
*
reformated license a bit
iNPUTmice
2014-11-04
2
-22
/
+16
*
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
8
-31
/
+156
|
\
\
|
*
\
Merge pull request #616 from SamWhited/license-compliance
Daniel Gultsch
2014-11-04
8
-31
/
+156
|
|
\
\
|
|
|
/
|
|
/
|
|
|
*
Shorten license text and fix height of scrollview
Sam Whited
2014-11-04
2
-20
/
+7
|
|
*
Use normal text size and color
Sam Whited
2014-11-04
1
-1
/
+4
|
|
*
Make links clickable in about text
Sam Whited
2014-11-04
2
-4
/
+7
|
|
*
Convert about dialog to activity
Sam Whited
2014-11-04
8
-47
/
+102
|
|
*
Use real copyright symbol ©
Sam Whited
2014-11-04
1
-3
/
+3
|
|
*
Move AboutDialog to correct path
Sam Whited
2014-11-04
1
-0
/
+0
|
|
*
Add about dialog with license info
Sam Whited
2014-11-04
3
-0
/
+77
|
|
/
*
/
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
3
-5
/
+33
|
/
*
register nfc callback in every activity that provides a proper sharable uri
iNPUTmice
2014-11-04
5
-16
/
+18
*
Merge pull request #622 from emdete/p1
Daniel Gultsch
2014-11-04
1
-33
/
+39
|
\
|
*
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
7
-105
/
+175
*
added missing return statement. fixed api bug
iNPUTmice
2014-11-04
1
-3
/
+2
*
Merge pull request #620 from emdete/p0
Daniel Gultsch
2014-11-04
1
-58
/
+59
|
\
|
*
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
4
-187
/
+291
|
\
|
*
fixed merge error
nfc
iNPUTmice
2014-11-03
1
-1
/
+0
|
*
Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc
iNPUTmice
2014-11-03
1
-0
/
+1
|
|
\
|
|
*
basic beam code / untested
iNPUTmice
2014-11-03
4
-149
/
+207
|
*
|
use different filter for nfc intents
iNPUTmice
2014-11-03
1
-1
/
+1
|
*
|
basic beam code / untested
iNPUTmice
2014-11-03
4
-149
/
+207
*
|
|
unfinishd qr code implemenation. thanks to @emdete
iNPUTmice
2014-11-03
6
-18
/
+132
|
/
/
*
|
create file explicitly before downloading image
iNPUTmice
2014-11-03
1
-0
/
+2
*
|
Merge pull request #614 from SamWhited/spacefixes
Daniel Gultsch
2014-11-03
1
-7
/
+7
|
\
\
|
*
|
Removed the last \t from the README...
Sam Whited
2014-11-03
1
-1
/
+1
|
*
|
Another tab fix.
Sam Whited
2014-11-03
1
-1
/
+1
|
*
|
Fix some space/tab issues in README
Sam Whited
2014-11-03
1
-5
/
+5
*
|
|
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
iNPUTmice
2014-11-03
2
-3
/
+2
|
\
\
\
|
|
_
|
/
|
/
|
|
|
*
|
Merge pull request #615 from SamWhited/issue611
Daniel Gultsch
2014-11-03
1
-2
/
+1
|
|
\
\
|
|
|
/
|
|
/
|
|
|
*
Wrap "last seen" time.
Sam Whited
2014-11-03
1
-2
/
+1
|
|
/
|
*
Merge pull request #605 from emdete/render_gradle_path
Daniel Gultsch
2014-11-03
1
-1
/
+1
|
|
\
[next]