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
/
generator
/
MessageGenerator.java
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
add explicit encryption hints to outgoing messages
Daniel Gultsch
2017-01-26
1
-0
/
+7
*
add password to direct muc invite
Daniel Gultsch
2016-10-09
1
-0
/
+4
*
include pgp and omemo fallback message only when unencrypted is enabled
Daniel Gultsch
2016-07-14
1
-2
/
+5
*
actually do add fall back message for omemo
Daniel Gultsch
2016-06-12
1
-1
/
+1
*
avoid npe when sending omemo messages to group
Daniel Gultsch
2016-05-29
1
-1
/
+3
*
sending warning to receiving client if that client doesn't support omemo.
Daniel Gultsch
2016-05-25
1
-1
/
+13
*
basic support for XEP-0308: Last Message Correction. fixes #864
Daniel Gultsch
2016-02-15
1
-0
/
+3
*
add obb url to unencrypted messages
Daniel Gultsch
2016-01-03
1
-0
/
+1
*
removed xhtml body. fixes #1594
Daniel Gultsch
2016-01-01
1
-12
/
+0
*
add 'store' message hint to displayed chat markers
Daniel Gultsch
2015-12-17
1
-0
/
+1
*
renamed pretty-please-store message hint to store
Daniel Gultsch
2015-12-10
1
-1
/
+1
*
combine multiple message receipts into single message
Daniel Gultsch
2015-12-01
1
-6
/
+8
*
removed oob element from file messages
Daniel Gultsch
2015-10-08
1
-1
/
+0
*
add xhtml image tag to unencrypted image urls. add oob tag to all files that ...
Daniel Gultsch
2015-10-07
1
-2
/
+18
*
use same method to add message hints to otr message everywhere it is needed
Daniel Gultsch
2015-09-01
1
-5
/
+9
*
tag axolotl messages with pretty-please-store
Daniel Gultsch
2015-09-01
1
-0
/
+1
*
Refactor axolotl message processing workflow
Andreas Straub
2015-07-31
1
-1
/
+1
*
add no-store to chat states
Daniel Gultsch
2015-07-22
1
-0
/
+2
*
use type=chat more often to go along with new, simple carbon and mam rules
Daniel Gultsch
2015-07-22
1
-6
/
+5
*
made image file format configurable by Config.java
Daniel Gultsch
2015-07-21
1
-4
/
+0
*
bugfix: also add no-permanent-storage to message hints
Daniel Gultsch
2015-07-21
1
-0
/
+1
*
Refactor axolotl send processing/caching flow
Andreas Straub
2015-07-20
1
-4
/
+1
*
attempt to fix the delay problem
Daniel Gultsch
2015-07-20
1
-27
/
+7
*
Optimize imports
Andreas Straub
2015-07-20
1
-4
/
+3
*
Clean up logging
Andreas Straub
2015-07-19
1
-1
/
+1
*
Fetch bundles on-demand, encrypt in background
Andreas Straub
2015-07-19
1
-4
/
+6
*
Reformat code to use tabs
Andreas Straub
2015-07-19
1
-11
/
+11
*
Added PEP and message protocol layers
Andreas Straub
2015-07-19
1
-0
/
+21
*
made httpconnection (download) ready all kind of files
feature/http_upload
Daniel Gultsch
2015-06-30
1
-2
/
+2
*
initial http upload support
Daniel Gultsch
2015-06-29
1
-7
/
+15
*
OTR: Fix onContactStatusChanged & dont archive OTR
BrianBlade
2015-04-21
1
-0
/
+1
*
Fix OTR-Error messages
BrianBlade
2015-04-01
1
-2
/
+2
*
respond to unreadable OTR messages with error message. fixed #1021
iNPUTmice
2015-03-21
1
-0
/
+13
*
# add delivery receipts for private muc msgs
BrianBlade
2015-03-18
1
-0
/
+3
*
added typing notifications through XEP-0085. fixed #210
iNPUTmice
2015-02-21
1
-14
/
+6
*
otr4j: update to 0.22
Michael
2015-01-20
1
-1
/
+1
*
Add support for XEP-0191 (Blocking command)
Sam Whited
2014-12-22
1
-5
/
+5
*
brought ad hoc conferences back. fixed #688 fixed #367
iNPUTmice
2014-11-20
1
-2
/
+2
*
Rework `Account.getJid()' to return full JIDs
Sam Whited
2014-11-09
1
-6
/
+6
*
Update another chunk of stuff to use JID objects
Sam Whited
2014-11-09
1
-2
/
+2
*
Move a chunk of classes over to using JID objects
Sam Whited
2014-11-09
1
-8
/
+9
*
Make conversations the root project
Sam Whited
2014-10-22
1
-0
/
+178