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
...
*
|
Merge branch 'development' of github.com:siacs/Conversations into development
iNPUTmice
2014-05-28
2
-4
/
+50
|
\
|
|
*
Merge pull request #147 from kruks23/development
Daniel Gultsch
2014-05-26
1
-2
/
+2
|
|
\
|
|
*
Fix Contact Status width in contact details
kruks23
2014-05-24
1
-2
/
+2
|
*
|
Merge pull request #152 from beriain/development
Daniel Gultsch
2014-05-26
1
-2
/
+48
|
|
\
\
|
|
*
|
Update strings.xml
Aitor Beriain
2014-05-26
1
-13
/
+13
|
|
*
|
Update strings.xml
Aitor Beriain
2014-05-26
1
-2
/
+48
*
|
|
|
possible fix for #149 and #142
iNPUTmice
2014-05-28
1
-1
/
+1
|
/
/
/
*
|
/
fixed #151
iNPUTmice
2014-05-26
5
-2
/
+126
|
|
/
|
/
|
*
|
error msg on offline subscription changes
Daniel Gultsch
2014-05-24
2
-12
/
+30
*
|
Merge pull request #146 from kruks23/development
Daniel Gultsch
2014-05-24
7
-24
/
+54
|
\
\
|
*
|
More harcoded translations + Spanish
kruks23
2014-05-24
7
-24
/
+54
*
|
|
Merge pull request #140 from strb/mucicons
Daniel Gultsch
2014-05-24
1
-108
/
+41
|
\
\
\
|
*
|
|
Refactored unknown contact picture generation
Andreas Straub
2014-05-21
1
-108
/
+41
*
|
|
|
Merge pull request #145 from kruks23/development
Daniel Gultsch
2014-05-23
5
-19
/
+47
|
\
\
\
\
|
|
|
/
/
|
|
/
|
|
|
*
|
|
Title activities translations + contacts translations + update Spanish Transl...
kruks23
2014-05-23
5
-19
/
+47
|
/
/
/
*
|
|
end otr sessions earlier / more often. can lead to unesessary handshakes but ...
Daniel Gultsch
2014-05-23
3
-17
/
+32
*
|
|
fixed possible npe
Daniel Gultsch
2014-05-23
1
-0
/
+6
*
|
|
code cleanup
Daniel Gultsch
2014-05-23
2
-10
/
+0
*
|
|
updated readme
Daniel Gultsch
2014-05-23
1
-1
/
+1
*
|
|
Merge pull request #143 from nachovfranco/mycommits
Daniel Gultsch
2014-05-23
2
-0
/
+195
|
\
\
\
|
*
|
|
Galician translation
nachovfranco
2014-05-22
2
-0
/
+195
*
|
|
|
Merge pull request #144 from kruks23/development
Daniel Gultsch
2014-05-23
3
-19
/
+46
|
\
\
\
\
|
*
|
|
|
Contact details translations + update spanish translations
kruks23
2014-05-22
3
-19
/
+46
|
/
/
/
/
*
|
|
|
offline crud of contacts
Daniel Gultsch
2014-05-22
5
-17
/
+48
*
|
|
|
implementet missing methods on the new roster mgmt
Daniel Gultsch
2014-05-22
2
-3
/
+17
|
/
/
/
*
|
|
fixed #136
Daniel Gultsch
2014-05-22
2
-24
/
+36
*
|
|
write contacts on system shutdown
Daniel Gultsch
2014-05-21
5
-132
/
+198
*
|
|
added missing strings
Daniel Gultsch
2014-05-21
1
-1
/
+1
*
|
|
Merge branch 'development' of github.com:siacs/Conversations into development
Daniel Gultsch
2014-05-21
1
-2
/
+17
|
\
|
|
|
*
|
Merge pull request #138 from strb/highlight
Daniel Gultsch
2014-05-21
1
-2
/
+17
|
|
\
\
|
|
*
|
Fix highlight detection in MUC channels
Andreas Straub
2014-05-21
1
-2
/
+17
|
|
/
/
*
/
/
further improvment trying to deal with large images
Daniel Gultsch
2014-05-21
1
-1
/
+6
|
/
/
*
|
cleaned up shared text
Daniel Gultsch
2014-05-21
6
-26
/
+41
*
|
auto retry image compression with decreasing sample size
Daniel Gultsch
2014-05-21
1
-17
/
+15
*
|
close input stream
Daniel Gultsch
2014-05-20
1
-0
/
+1
*
|
trying to deal with larger images
Daniel Gultsch
2014-05-20
1
-4
/
+17
*
|
Merge pull request #131 from beriain/development
Daniel Gultsch
2014-05-20
1
-80
/
+121
|
\
|
|
*
Update and fix basque translation
Beriain
2014-05-20
1
-80
/
+121
*
|
Merge pull request #133 from kruks23/development
Daniel Gultsch
2014-05-20
5
-14
/
+18
|
\
\
|
*
|
Update Spanish Translations + harcoded just_now
kruks23
2014-05-20
5
-14
/
+18
|
*
|
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
kruks23
2014-05-20
8
-42
/
+33
|
|
\
\
|
|
/
/
|
/
|
|
*
|
|
Merge pull request #128 from kruks23/development
Daniel Gultsch
2014-05-20
1
-3
/
+8
|
\
\
\
*
|
|
|
highlight people in conferences by clicken on their picture
Daniel Gultsch
2014-05-20
1
-14
/
+27
*
|
|
|
fixed ping time out after session resume
Daniel Gultsch
2014-05-20
1
-0
/
+1
*
|
|
|
ported pending subscription support to new roster mgmt
Daniel Gultsch
2014-05-20
3
-28
/
+5
*
|
|
|
added search icon
Daniel Gultsch
2014-05-20
4
-0
/
+0
|
|
*
|
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
kruks23
2014-05-19
3
-41
/
+30
|
|
|
\
\
|
|
_
|
/
/
|
/
|
|
|
*
|
|
|
made roster persistant aka enabled versioning again
Daniel Gultsch
2014-05-19
3
-41
/
+30
|
|
*
|
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
kruks23
2014-05-19
17
-642
/
+385
|
|
/
|
|
|
|
/
/
|
/
|
|
*
|
|
some code cleanup to deal with the roster mgmt changes from earlier
Daniel Gultsch
2014-05-19
3
-77
/
+54
[prev]
[next]
