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
*
bugfix: accept status code 201 on http upload
Daniel Gultsch
2015-07-19
1
-1
/
+1
*
changed switch widget
Daniel Gultsch
2015-07-18
39
-8
/
+914
*
bump version to 1.5.0
1.5.0
Daniel Gultsch
2015-07-18
1
-2
/
+2
*
pulled translations
Daniel Gultsch
2015-07-18
7
-1
/
+15
*
account for downloaded http files in dup checker
Daniel Gultsch
2015-07-18
1
-8
/
+18
*
code cleanup
Daniel Gultsch
2015-07-17
1
-1
/
+1
*
fixed inactive http download
Daniel Gultsch
2015-07-17
1
-1
/
+1
*
show error message in account details when info has not been edited
Daniel Gultsch
2015-07-17
1
-1
/
+1
*
increased ibb block size
Daniel Gultsch
2015-07-17
2
-4
/
+2
*
version bump to 1.5.0-beta.2
Daniel Gultsch
2015-07-16
2
-3
/
+3
*
even less jumpy
Daniel Gultsch
2015-07-16
1
-1
/
+3
*
fixed some ux glitches in editaccount
Daniel Gultsch
2015-07-16
3
-9
/
+9
*
removed empty translation file
Daniel Gultsch
2015-07-16
1
-2
/
+0
*
Merge branch 'development' of github.com:siacs/Conversations into development
Daniel Gultsch
2015-07-16
1
-3
/
+2
|
\
|
*
Merge pull request #1285 from kriztan/patch-2
Daniel Gultsch
2015-07-16
1
-1
/
+0
|
|
\
|
|
*
fixed another typo
Christian S.
2015-07-16
1
-1
/
+0
|
|
/
|
*
Merge pull request #1283 from Manouchehri/development
Daniel Gultsch
2015-07-16
1
-1
/
+1
|
|
\
|
|
*
Fixed broken URL.
David Manouchehri
2015-07-15
1
-1
/
+1
|
*
|
Merge pull request #1284 from kriztan/patch-1
Daniel Gultsch
2015-07-16
1
-1
/
+1
|
|
\
\
|
|
|
/
|
|
/
|
|
|
*
fixed typo
Christian S.
2015-07-16
1
-1
/
+1
|
|
/
*
|
made 'check image on http host' message more generic. fixed #1281
Daniel Gultsch
2015-07-16
28
-104
/
+334
*
|
fixed some npes
Daniel Gultsch
2015-07-16
1
-4
/
+11
|
/
*
mention http upload component in readme
Daniel Gultsch
2015-07-15
1
-1
/
+5
*
fixed crash on invalid muc bookmarks
Daniel Gultsch
2015-07-15
1
-3
/
+7
*
renamed colors
Daniel Gultsch
2015-07-13
36
-165
/
+162
*
catch exception on broken android phones
Daniel Gultsch
2015-07-12
1
-1
/
+7
*
made lock button reflect encryption status of the next messages instead of th...
Daniel Gultsch
2015-07-12
1
-16
/
+10
*
only try to change affilations for known jids
Daniel Gultsch
2015-07-11
1
-1
/
+1
*
try to catch weird npe in android sdk
Daniel Gultsch
2015-07-11
1
-0
/
+2
*
null check otr fingerprint before display
Daniel Gultsch
2015-07-11
1
-1
/
+3
*
spelling
Daniel Gultsch
2015-07-11
1
-1
/
+1
*
added changelog
Daniel Gultsch
2015-07-10
1
-0
/
+3
*
version bump to 1.5.0-beta
Daniel Gultsch
2015-07-10
1
-2
/
+2
*
renamed HttpConnection to HttpDownloadConnection
Daniel Gultsch
2015-07-10
6
-19
/
+19
*
renamed downloadable to transferable
Daniel Gultsch
2015-07-10
14
-101
/
+87
*
get file upload ready to work with https
Daniel Gultsch
2015-07-10
3
-38
/
+53
*
display toast in ui on failed http download
Daniel Gultsch
2015-07-10
7
-36
/
+105
*
show timestamp on images in mucs
Daniel Gultsch
2015-07-10
1
-1
/
+1
*
added null check in sasl response verifier
Daniel Gultsch
2015-07-10
1
-1
/
+1
*
catch number format exception in server ack
Daniel Gultsch
2015-07-10
1
-10
/
+14
*
print stack trace instead of writing error message to log in case of unknown ...
Daniel Gultsch
2015-07-09
1
-1
/
+1
*
show contacts name in non anonymous mucs. fixes #1213
Daniel Gultsch
2015-07-05
1
-2
/
+6
*
refactored sendMessage and merged with resendMessage
Daniel Gultsch
2015-07-05
2
-148
/
+117
*
version bump to 1.4.7
Daniel Gultsch
2015-07-04
1
-2
/
+2
*
make sure unread count is initialized as 0. fixes #1270
Daniel Gultsch
2015-07-03
1
-1
/
+2
*
avoid very rare npe
Daniel Gultsch
2015-07-03
2
-2
/
+4
*
Merge branch 'master' into development
Daniel Gultsch
2015-07-03
2
-2
/
+3
|
\
|
*
version bump to 1.4.6
1.4.6
Daniel Gultsch
2015-07-03
1
-2
/
+2
|
*
added fallback for non-srv dns queries
Daniel Gultsch
2015-07-03
1
-0
/
+1
*
|
fixed share with activity to account for http file upload
Daniel Gultsch
2015-07-02
2
-43
/
+38
[next]