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
/
siacs
/
conversations
/
entities
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge tag '1.11.3' into trz/rebase
lookshe
2016-04-05
4
-17
/
+45
|
\
|
*
add methods to check max file size for http upload
Daniel Gultsch
2016-03-31
2
-1
/
+18
|
*
save otr fingerprint in message
Daniel Gultsch
2016-03-31
1
-2
/
+2
|
*
include form fields into caps hash calculation
Daniel Gultsch
2016-03-31
1
-2
/
+17
|
*
made setting aes keys in DownloadableFile more readable
Daniel Gultsch
2016-03-31
1
-12
/
+8
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-29
1
-1
/
+1
|
\
\
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-21
1
-4
/
+19
|
\
|
|
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-20
1
-18
/
+14
|
\
|
|
*
|
|
Merge branch 'trz/rebase' into trz/merge_1.11.1
trz/merge_1.11.1
lookshe
2016-03-20
1
-9
/
+31
|
\
\
\
|
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-20
1
-9
/
+31
|
|
\
|
|
*
|
|
|
Merge tag '1.11.1' into trz/merge_1.11.1
lookshe
2016-03-17
1
-11
/
+2
|
\
\
\
\
|
|
/
/
/
|
/
|
|
/
|
|
|
/
|
|
/
|
|
*
|
simplified getUsers(max) code
Daniel Gultsch
2016-03-13
1
-11
/
+2
*
|
|
small bugfixes
lookshe
2016-03-12
1
-0
/
+3
*
|
|
removed duplicated source
lookshe
2016-03-12
1
-8
/
+5
*
|
|
Added method to get body from message if hasMeCommand and harmonized extracti...
lookshe
2016-03-12
2
-10
/
+23
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-11
2
-106
/
+3
|
\
\
\
|
|
|
/
|
|
/
|
*
|
|
Merge tag '1.11.0' into trz/merge_1.11.0
lookshe
2016-03-08
5
-36
/
+118
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
mark oob messages and always display download button
Daniel Gultsch
2016-03-04
1
-3
/
+15
|
*
|
add a few more know file extensions
Daniel Gultsch
2016-03-04
2
-6
/
+9
|
*
|
let users confirm each member in a conference even if that contact is already...
Daniel Gultsch
2016-03-01
1
-9
/
+63
|
*
|
use correct jid when leaving a conference. fixes #1732
Daniel Gultsch
2016-02-29
1
-1
/
+1
|
*
|
refactored omemo to take multiple recipients
Daniel Gultsch
2016-02-29
2
-8
/
+23
|
*
|
made hashtable in roster store jids instead of strings
Daniel Gultsch
2016-02-28
1
-9
/
+7
*
|
|
Implements: FS#142 - Fix Conference notifications
lookshe
2016-03-06
1
-4
/
+4
*
|
|
Fixes FS#147: Disable OMEMO
steckbrief
2016-03-02
1
-4
/
+12
*
|
|
Fixes FS#146: Remove Tor-Support
steckbrief
2016-03-02
1
-4
/
+0
*
|
|
Merge tag '1.10.1' into trz/merge_1.10.1
steckbrief
2016-02-28
6
-28
/
+61
|
\
|
|
|
*
|
optionally lock conference domains as well and hide known domains in ui
Daniel Gultsch
2016-02-24
3
-5
/
+31
|
*
|
made hard coded choice for encryptions more flexible and disable parsing
Daniel Gultsch
2016-02-24
1
-3
/
+7
|
*
|
Merge pull request #1715 from fiaxh/gpg_decryption_failed
Daniel Gultsch
2016-02-24
1
-0
/
+1
|
|
\
\
|
|
*
|
Retry decryption from message menu
fiaxh
2016-02-23
1
-0
/
+1
|
*
|
|
reset pending subscription request when receiving roster update
Daniel Gultsch
2016-02-23
1
-0
/
+2
|
*
|
|
made presences object final in contact
Daniel Gultsch
2016-02-23
1
-5
/
+1
|
|
/
/
|
*
|
turned muc errors into enum. added error codes for service shutdown
Daniel Gultsch
2016-02-22
1
-15
/
+19
*
|
|
Reviewed commit for FS#34 after merge
steckbrief
2016-02-24
2
-2
/
+2
*
|
|
Removed useless 'button-message' to load more messages. Implementation alread...
steckbrief
2016-02-23
2
-20
/
+0
*
|
|
Merge tag '1.10.0' into trz/merge_1.10.0
lookshe
2016-02-22
4
-21
/
+100
|
\
|
|
|
*
|
some mucs may grant voice to visitors in unmoderated rooms
Daniel Gultsch
2016-02-21
1
-1
/
+3
|
*
|
never parse show in presences as offline
Daniel Gultsch
2016-02-19
1
-11
/
+15
|
*
|
only offer message correction for the very last message
Daniel Gultsch
2016-02-17
2
-4
/
+26
|
*
|
added some OTR logging
Daniel Gultsch
2016-02-16
1
-4
/
+7
|
*
|
basic support for XEP-0308: Last Message Correction. fixes #864
Daniel Gultsch
2016-02-15
2
-5
/
+53
*
|
|
Merge tag '1.9.4' into trz/merge_1.9.4
trz/merge_1.9.4
lookshe
2016-02-16
7
-50
/
+410
|
\
|
|
|
*
|
prepend instead off append mam messages to conversations when going in reverse
Daniel Gultsch
2016-02-04
1
-1
/
+8
|
*
|
prevent previoulsly cleared messages from reloading. fixes #1110
Daniel Gultsch
2016-02-04
2
-0
/
+20
|
*
|
add more fault tolerant checks for messages left on server
Daniel Gultsch
2016-02-04
1
-0
/
+9
|
*
|
cache server caps
Daniel Gultsch
2016-02-03
1
-1
/
+18
|
*
|
refactored disco cache. avoid making duplicate call. check hash
Daniel Gultsch
2016-02-03
3
-16
/
+49
|
*
|
Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into...
Daniel Gultsch
2016-02-02
4
-47
/
+316
|
|
\
\
|
|
*
|
Fetch cached caps result on new presence
Stephen Paul Weber
2016-01-24
1
-1
/
+4
[next]