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
/
services
/
XmppConnectionService.java
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)
trz/merge_1.12.4
lookshe
2016-05-26
1
-15
/
+99
|
\
|
*
update ui after affiliation changes
Daniel Gultsch
2016-05-21
1
-0
/
+3
|
*
also save form elements in disco storage
Daniel Gultsch
2016-05-19
1
-2
/
+2
|
*
refactored muc item parsing to also parse muc status messages
Daniel Gultsch
2016-05-17
1
-14
/
+4
|
*
change affiliation for in memory users that are currently not joined in a con...
Daniel Gultsch
2016-05-16
1
-0
/
+1
|
*
keep conference members in memory and show them in conference details
Daniel Gultsch
2016-05-16
1
-5
/
+21
|
*
send caps hash in muc join
Daniel Gultsch
2016-05-15
1
-6
/
+1
|
*
show presence of other resources as template
Daniel Gultsch
2016-05-13
1
-0
/
+10
|
*
reset attempt count when reconnecting because of timeout
Daniel Gultsch
2016-05-12
1
-0
/
+3
|
*
use 'phone' or 'tablet' as default resource
Daniel Gultsch
2016-05-12
1
-1
/
+1
|
*
add lock domain and magic create domain to known hosts
Daniel Gultsch
2016-05-10
1
-0
/
+6
|
*
do not show last-seen metric in UI
Daniel Gultsch
2016-05-10
1
-4
/
+2
|
*
republish pgp signature when changing status
Daniel Gultsch
2016-05-05
1
-5
/
+5
|
*
refactor captcha response handling to avoid network on main thread exception
Daniel Gultsch
2016-05-05
1
-2
/
+3
|
*
spelling fixes
klemens
2016-05-04
1
-1
/
+1
|
*
ping all accounts at the same time
Daniel Gultsch
2016-05-02
1
-5
/
+17
|
*
prevent user from accidentally changing password after using magic create
Daniel Gultsch
2016-04-26
1
-0
/
+1
|
*
don't create templates for empty status messages
Daniel Gultsch
2016-04-23
1
-2
/
+6
|
*
expert setting to manually change presence
Daniel Gultsch
2016-04-22
1
-2
/
+38
|
*
added magic create welcome screen
Daniel Gultsch
2016-04-19
1
-0
/
+12
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-05-09
1
-84
/
+8
|
\
\
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-04-23
1
-45
/
+3
|
\
|
|
*
|
|
Merge tag '1.11.7' into trz/merge_1.11.7
lookshe
2016-04-17
1
-12
/
+13
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
removed unnecessary call to stopSelf() after logging out
Daniel Gultsch
2016-04-14
1
-5
/
+11
|
*
|
removed unused call to cancel events
Daniel Gultsch
2016-04-14
1
-1
/
+0
|
*
|
hacky workaround to determine if uri points to private file on < lolipop
Daniel Gultsch
2016-04-13
1
-2
/
+2
|
*
|
minor code cleanup
Daniel Gultsch
2016-04-12
1
-3
/
+1
|
*
|
republish avatar if server offers non-persistent pep :-(
Daniel Gultsch
2016-04-11
1
-25
/
+79
|
*
|
check file owner when attaching files or using them as avatar
Daniel Gultsch
2016-04-07
1
-0
/
+10
|
*
|
better detect broken pep
Daniel Gultsch
2016-04-05
1
-0
/
+1
|
*
|
removed unnecessary wait for disconnect
Daniel Gultsch
2016-04-04
1
-6
/
+0
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-04-06
1
-64
/
+32
|
\
\
\
|
|
|
/
|
|
/
|
*
|
|
Merge tag '1.11.3' into trz/rebase
lookshe
2016-04-05
1
-9
/
+11
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
check max http file size when attaching files
Daniel Gultsch
2016-04-01
1
-4
/
+7
|
*
|
add methods to check max file size for http upload
Daniel Gultsch
2016-03-31
1
-2
/
+1
|
*
|
save otr fingerprint in message
Daniel Gultsch
2016-03-31
1
-2
/
+2
|
*
|
Update ShortcutBadger to version 1.1.4
Christian S
2016-03-27
1
-2
/
+2
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-30
1
-0
/
+1
|
\
\
\
|
|
|
/
|
|
/
|
*
|
|
FS#169 - Merge Conversations 1.11.2 into Conversations+ dev
lookshe
2016-03-25
1
-1
/
+2
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
Typo `attempt`
licaon-kter
2016-03-22
1
-1
/
+1
|
*
|
be more careful to avoid creating multiple connections
Daniel Gultsch
2016-03-20
1
-0
/
+1
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-22
1
-1
/
+5
|
\
\
\
|
|
|
/
|
|
/
|
*
|
|
fixed merge errors
lookshe
2016-03-20
1
-1
/
+1
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-12
1
-3
/
+2
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-11
1
-25
/
+15
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-10
1
-19
/
+21
|
\
|
|
*
|
|
Merge tag '1.11.0' into trz/merge_1.11.0
lookshe
2016-03-08
1
-19
/
+63
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
moved avatarfetcher reset code to bind
Daniel Gultsch
2016-03-03
1
-8
/
+8
|
*
|
avoid unnecessary disconnect. prevent NetworkOnMainThreadException
Daniel Gultsch
2016-03-03
1
-3
/
+3
|
*
|
expert option to treat vibrate as silent mode for XA. fixes #1530
Daniel Gultsch
2016-03-01
1
-1
/
+9
[next]