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
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
increased padding in create contact/conference dialog
Daniel Gultsch
2016-01-21
2
-15
/
+21
*
add convenience to get an account object from a spinner
Daniel Gultsch
2016-01-21
1
-15
/
+19
*
pulled translations from transifex
Daniel Gultsch
2016-01-20
15
-13
/
+718
*
catch security exception when user prevents access to address book
Daniel Gultsch
2016-01-20
1
-27
/
+45
*
add intent!=null check in onActivityResultin PublishProfilePicture
Daniel Gultsch
2016-01-20
1
-1
/
+1
*
Merge branch 'master' of github.com:siacs/Conversations
Daniel Gultsch
2016-01-16
1
-1
/
+4
|
\
|
*
Merge pull request #1655 from adithyaphilip/pgp-fix
Daniel Gultsch
2016-01-16
1
-1
/
+4
|
|
\
|
|
*
fixed PGP having to be selected twice
Adithya Abraham Philip
2016-01-16
1
-1
/
+4
*
|
|
pulled translations from transifex
Daniel Gultsch
2016-01-16
4
-3
/
+49
|
/
/
*
|
make ConversationsActivity more resistent against being restarted
Daniel Gultsch
2016-01-16
1
-3
/
+9
*
|
reuse same xmppconnection for reconnects
Daniel Gultsch
2016-01-16
2
-9
/
+17
*
|
made constructor private in Account entity
Daniel Gultsch
2016-01-16
1
-5
/
+1
*
|
removed some unused methods from db backend
Daniel Gultsch
2016-01-16
1
-83
/
+0
|
/
*
hide prepare image toasts when attaching multiple images
Daniel Gultsch
2016-01-15
1
-11
/
+12
*
show toast when image cropper get oom
Daniel Gultsch
2016-01-15
2
-0
/
+8
*
catch exception when reading message id from database
Daniel Gultsch
2016-01-15
1
-8
/
+12
*
nimbuzz.com: don't wait for disco replies to set account to online
Daniel Gultsch
2016-01-15
2
-12
/
+27
*
pulled translations for 1.9.0 release from transifex
1.9.0
Daniel Gultsch
2016-01-14
20
-26
/
+169
*
fixed typo when reading battery_op setting
Daniel Gultsch
2016-01-14
1
-1
/
+1
*
show /me messages in conference notifications without the name of the sender
Daniel Gultsch
2016-01-13
1
-5
/
+10
*
show key fetch error in activity when there are no keys to be used
Daniel Gultsch
2016-01-13
2
-1
/
+9
*
check for file storage permission before selecting avatar
Daniel Gultsch
2016-01-13
3
-20
/
+40
*
use batch transactions when writing roster
Dheeraj CVR
2016-01-13
1
-0
/
+3
*
throw security exception instead of going to next srv entry
Daniel Gultsch
2016-01-12
1
-1
/
+3
*
Merge branch 'master' of github.com:siacs/Conversations
Daniel Gultsch
2016-01-12
1
-2
/
+2
|
\
|
*
s/TOR/Tor/g
Sam Whited
2016-01-12
1
-2
/
+2
*
|
pulled translations from transifex
Daniel Gultsch
2016-01-12
25
-75
/
+117
|
/
*
move some ssl socket modifiers into a seperate helper class
Daniel Gultsch
2016-01-12
2
-56
/
+67
*
Merge branch 'master' of https://github.com/moparisthebest/Conversations into...
Daniel Gultsch
2016-01-12
2
-116
/
+226
|
\
|
*
Implement XEP-0368: SRV records for XMPP over TLS
moparisthebest
2016-01-11
2
-104
/
+220
|
*
reworked that loop that iterates over various servers
reworked_host_finder_loop
Daniel Gultsch
2016-01-11
1
-16
/
+10
*
|
use match_parent as height in conversations overview
Daniel Gultsch
2016-01-12
1
-2
/
+2
*
|
Revert "Add additional warnings to OMEMO purge key function"
Daniel Gultsch
2016-01-12
2
-28
/
+2
*
|
Add additional warnings to OMEMO purge key function
Andreas Straub
2016-01-12
2
-2
/
+28
|
/
*
new art renders
Daniel Gultsch
2016-01-11
25
-0
/
+0
*
don't use the word phone in strings
Daniel Gultsch
2016-01-11
1
-6
/
+5
*
pulled translations from transifex
Daniel Gultsch
2016-01-11
25
-63
/
+14
*
ask to be excluded from battery optimization
Daniel Gultsch
2016-01-11
7
-242
/
+361
*
let the user decide on whether or not to compress pictures
Daniel Gultsch
2016-01-09
4
-13
/
+41
*
automatically adjust image compression to keep files under 512MiB
Daniel Gultsch
2016-01-09
2
-8
/
+15
*
added Config.java variable to change the default notification behaviour to al...
Daniel Gultsch
2016-01-08
2
-1
/
+3
*
don't show snackbar when notifications are disabled or paused
Daniel Gultsch
2016-01-08
2
-11
/
+0
*
show per conference notification settings in details activity
Daniel Gultsch
2016-01-08
12
-17
/
+114
*
show icon in conversations overview when notifications are disabled
Daniel Gultsch
2016-01-08
17
-76
/
+109
*
Merge pull request #1641 from fiaxh/uuid-fix
Daniel Gultsch
2016-01-08
1
-1
/
+1
|
\
|
*
Correct uuid check according to RFC 4122
fiaxh
2016-01-05
1
-1
/
+1
*
|
avoid duplicate messages when sending files to mucs. fixes #1635
Daniel Gultsch
2016-01-06
1
-2
/
+10
*
|
added missing synchronize when pushing messages from mam backlog
Daniel Gultsch
2016-01-04
1
-1
/
+3
*
|
null check in getOriginalPath
Daniel Gultsch
2016-01-04
2
-1
/
+3
|
/
*
Allow entering a JID from 'choose contact'. thanks @singpolyma
Daniel Gultsch
2016-01-04
7
-63
/
+230
[next]