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
...
*
added XEP number for http file upload
Daniel Gultsch
2015-08-27
8
-8
/
+41
*
use dedicated colors for primary and primary_dark
Daniel Gultsch
2015-08-26
6
-9
/
+10
*
version bump to 1.6.6 and changelog
1.6.6
Daniel Gultsch
2015-08-26
2
-2
/
+5
*
fixed highlight text color for white chat bubbles
Daniel Gultsch
2015-08-26
1
-0
/
+1
*
Fix error handling for announce check retrieval
Andreas Straub
2015-08-26
1
-3
/
+3
*
explictitly handle iq timeouts in bind and session iqs
Daniel Gultsch
2015-08-26
1
-2
/
+7
*
Only announce device after publishing bundle
Andreas Straub
2015-08-26
2
-8
/
+19
*
moved actual iq callback out of synchronized find callback block
Daniel Gultsch
2015-08-26
1
-3
/
+7
*
be more restrictive about marking messages as sent_received in muc parser
Daniel Gultsch
2015-08-26
2
-8
/
+18
*
Revert "improved compatibility with muc components that change the message id"
Daniel Gultsch
2015-08-26
1
-3
/
+2
*
version bump to 1.6.5 + changelog
1.6.5
Daniel Gultsch
2015-08-26
2
-2
/
+5
*
Fix key publishing
Andreas Straub
2015-08-26
1
-72
/
+68
*
version bump to 1.6.4 and changelog
1.6.4
Daniel Gultsch
2015-08-25
2
-2
/
+7
*
Add more logging to pep attemp counter logic
Andreas Straub
2015-08-25
1
-0
/
+1
*
Limit number of PEP publish tries
Andreas Straub
2015-08-25
1
-9
/
+42
*
Merge pull request #1365 from betheg/remove_imports
Daniel Gultsch
2015-08-25
4
-30
/
+1
|
\
|
*
remove unused imports.
Michael
2015-08-25
4
-30
/
+1
*
|
Merge pull request #1364 from betheg/jdk15on
Daniel Gultsch
2015-08-25
1
-1
/
+1
|
\
\
|
|
/
|
/
|
|
*
update bcprov-jdk15on to v1.52
Michael
2015-08-25
1
-1
/
+1
*
|
Pass through device IDs when updating own list
Andreas Straub
2015-08-25
1
-17
/
+17
*
|
cleared up some error messages in axolotl service and execute publishOwnDevic...
Daniel Gultsch
2015-08-25
1
-3
/
+7
*
|
catch some db query exceptions
Daniel Gultsch
2015-08-25
1
-3
/
+5
*
|
additonal null checks in file backend
Daniel Gultsch
2015-08-25
1
-0
/
+3
*
|
fixed session time
Daniel Gultsch
2015-08-25
1
-7
/
+2
|
/
*
Merge pull request #1363 from betheg/minidns
Daniel Gultsch
2015-08-25
1
-1
/
+1
|
\
|
*
update minidns to v0.1.7
Michael
2015-08-25
1
-1
/
+1
|
/
*
Merge pull request #1362 from betheg/roundedimageview
Daniel Gultsch
2015-08-25
1
-1
/
+1
|
\
|
*
update roundedimageview to v2.2.0
Michael
2015-08-25
1
-1
/
+1
|
/
*
Merge branch 'betheg-sdk_version' into development
Daniel Gultsch
2015-08-24
2
-7
/
+7
|
\
|
*
Merge branch 'sdk_version' of https://github.com/betheg/Conversations into be...
Daniel Gultsch
2015-08-24
2
-7
/
+7
|
/
|
|
*
add the the previously deleted build-tools.
Michael
2015-08-24
1
-0
/
+3
|
*
update travis.yml
Michael
2015-08-24
1
-4
/
+2
|
*
update android sdk and support library.
Michael
2015-08-24
1
-6
/
+5
*
|
version bump to 1.7.0-beta
Daniel Gultsch
2015-08-24
1
-2
/
+2
*
|
increased carbon grace period to 90s
Daniel Gultsch
2015-08-24
1
-1
/
+1
*
|
pulled translations from transifex
Daniel Gultsch
2015-08-24
25
-49
/
+18
*
|
renamed plain text to unencrypted. fixes #1331
Daniel Gultsch
2015-08-24
28
-53
/
+53
*
|
fixed regression with mlinks stream managment. fixes #1206
Daniel Gultsch
2015-08-24
1
-1
/
+1
*
|
added setting to allow for white backgrounds in incoming message bubbles
Daniel Gultsch
2015-08-24
27
-36
/
+234
*
|
Merge branch 'master' into development
Daniel Gultsch
2015-08-24
1
-1
/
+1
|
\
\
|
|
/
|
/
|
|
*
catch invalid base64 in axolotl key parsing
Daniel Gultsch
2015-08-24
1
-1
/
+1
*
|
Merge branch 'master' into development
development
Daniel Gultsch
2015-08-23
3
-2
/
+5
|
\
|
|
*
version bump to 1.6.3 and changelog
1.6.3
Daniel Gultsch
2015-08-23
2
-2
/
+5
|
*
open files with capital extensions as well. fixes #1354
Daniel Gultsch
2015-08-23
1
-1
/
+1
*
|
Merge branch 'master' into development
Daniel Gultsch
2015-08-23
2
-3
/
+2
|
\
|
|
*
bugfix: next encryption is now being properly detected
1.6.2
Daniel Gultsch
2015-08-23
2
-3
/
+2
*
|
Merge branch 'master' into development
Daniel Gultsch
2015-08-23
2
-1
/
+4
|
\
|
|
*
version bump to 1.6.2 and changelog
Daniel Gultsch
2015-08-23
2
-2
/
+5
*
|
Merge branch 'master' into development
Daniel Gultsch
2015-08-23
7
-18
/
+16
|
\
|
|
*
introduce special iq type for internal timeouts. always use != result to chec...
Daniel Gultsch
2015-08-23
7
-20
/
+18
[prev]
[next]