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
/
res
/
values
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Basic filetransfer http delete implementation; Exceptions for IqPacketError a...
steckbrief
2016-08-22
1
-0
/
+1
*
Merge branch 'master' into introduce_cplus_database_version
steckbrief
2016-04-18
3
-4
/
+12
|
\
|
*
Related to FS#199: fixed merge hickups (message correction setting removed, k...
steckbrief
2016-04-18
1
-2
/
+0
|
*
removed unused string
lookshe
2016-04-17
1
-1
/
+0
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-04-17
3
-2
/
+13
|
|
\
|
|
*
Merge tag '1.11.7' into trz/merge_1.11.7
lookshe
2016-04-17
3
-4
/
+14
|
|
|
\
|
|
|
*
add setting for quick sharing
Daniel Gultsch
2016-04-14
1
-0
/
+4
|
|
|
*
added share uri button to conference details
Daniel Gultsch
2016-04-12
3
-0
/
+4
|
|
|
*
introduced setting to turn of notification led
Daniel Gultsch
2016-04-09
1
-3
/
+5
|
|
|
*
check file owner when attaching files or using them as avatar
Daniel Gultsch
2016-04-07
1
-0
/
+1
|
|
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-04-07
1
-0
/
+1
|
|
|
\
\
|
|
|
/
/
|
|
/
|
|
|
|
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-29
1
-1
/
+13
|
|
|
\
\
*
|
|
|
|
DatabaseBackend updated to serve Conversatiosn Database version and Conversat...
steckbrief
2016-04-17
1
-0
/
+1
|
/
/
/
/
*
|
|
|
Implements FS#187: Add single line copy to logcat view
steckbrief
2016-04-07
1
-0
/
+1
*
|
|
|
conversations->conversations+
lookshe
2016-04-03
1
-14
/
+14
|
|
/
/
|
/
|
|
*
|
|
Implements FS#173: Move access to colors to separate helper class
steckbrief
2016-03-29
1
-1
/
+13
*
|
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-25
1
-0
/
+1
|
\
|
|
|
*
|
FS#169 - Merge Conversations 1.11.2 into Conversations+ dev
lookshe
2016-03-25
1
-0
/
+1
|
|
\
|
|
|
*
allow to delete attachments. fixes #1539
Daniel Gultsch
2016-03-23
1
-0
/
+1
|
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-23
1
-2
/
+2
|
|
\
\
|
|
/
/
|
/
|
|
|
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-20
2
-0
/
+7
|
|
\
\
*
|
|
|
pulled from transifex
lookshe
2016-03-23
1
-2
/
+2
|
|
/
/
|
/
|
|
*
|
|
Fixes FS#143 - Displaying of emoticons too large
lookshe
2016-03-20
2
-0
/
+7
*
|
|
Merge branch 'trz/rebase' (early part) into trz/rename
lookshe
2016-03-20
1
-0
/
+3
|
\
|
|
|
*
|
Merge tag '1.11.1' into trz/merge_1.11.1
lookshe
2016-03-17
1
-0
/
+3
|
|
\
|
|
|
*
reworked sharewith activity to stay open during sharing
Daniel Gultsch
2016-03-16
1
-0
/
+3
|
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-11
1
-13
/
+0
|
|
\
\
|
|
/
/
|
/
|
|
*
|
|
Fixes FS#51: Change toggle in Account Management back to standard
steckbrief
2016-03-11
1
-13
/
+0
*
|
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-08
1
-0
/
+6
|
\
|
|
|
*
|
Merge tag '1.11.0' into trz/merge_1.11.0
lookshe
2016-03-08
1
-0
/
+6
|
|
\
|
|
|
*
warn in conversations when account is disabled
Daniel Gultsch
2016-03-06
1
-0
/
+1
|
|
*
show host in file size checker
Daniel Gultsch
2016-03-04
1
-0
/
+1
|
|
*
don't automatically crop avatar
Daniel Gultsch
2016-03-04
1
-0
/
+1
|
|
*
expert option to treat vibrate as silent mode for XA. fixes #1530
Daniel Gultsch
2016-03-01
1
-0
/
+2
|
|
*
let users confirm each member in a conference even if that contact is already...
Daniel Gultsch
2016-03-01
1
-0
/
+1
*
|
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-06
7
-298
/
+436
|
\
|
|
|
*
|
Fixes FS#147: Disable OMEMO
steckbrief
2016-03-02
2
-0
/
+6
|
*
|
Fixes FS#146: Remove Tor-Support
steckbrief
2016-03-02
1
-3
/
+0
|
*
|
externalized string 'Retry decryption'
trz/merge_1.10.1
steckbrief
2016-02-28
1
-0
/
+1
|
*
|
Merge tag '1.10.1' into trz/merge_1.10.1
steckbrief
2016-02-28
1
-3
/
+5
|
|
\
|
|
|
*
optionally lock conference domains as well and hide known domains in ui
Daniel Gultsch
2016-02-24
1
-0
/
+2
|
|
*
Retry decryption from message menu
fiaxh
2016-02-23
1
-1
/
+0
|
|
*
turned muc errors into enum. added error codes for service shutdown
Daniel Gultsch
2016-02-22
1
-2
/
+3
|
*
|
Fixes FS#89 after merge conflict
steckbrief
2016-02-24
1
-3
/
+6
|
*
|
Removed stupid message correction
steckbrief
2016-02-23
1
-2
/
+0
|
*
|
Removed useless 'button-message' to load more messages. Implementation alread...
steckbrief
2016-02-23
1
-1
/
+0
|
*
|
Merge tag '1.10.0' into trz/merge_1.10.0
lookshe
2016-02-22
1
-15
/
+18
|
|
\
|
|
|
*
made clear that archiving preferences are server side
Daniel Gultsch
2016-02-16
1
-4
/
+4
|
|
*
added setting to opt-out of message correction. renamed preferences and optio...
Daniel Gultsch
2016-02-16
1
-15
/
+17
|
|
*
basic support for XEP-0308: Last Message Correction. fixes #864
Daniel Gultsch
2016-02-15
1
-0
/
+2
[next]