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
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Imports organized
steckbrief
2016-02-12
73
-293
/
+56
*
Fixed parent activity for logoutput activity
steckbrief
2016-02-12
1
-3
/
+3
*
Simplification of DNS requests.
steckbrief
2016-02-12
3
-254
/
+130
*
green bubbles and setting to choose green or white bubbles removed
steckbrief
2016-02-12
24
-67
/
+5
*
Fixed placeholder string for message input box
steckbrief
2016-02-12
2
-2
/
+2
*
Fixed layout issue with emojicon tastatur button
steckbrief
2016-02-12
1
-1
/
+0
*
Fixed NPE while loading messages via MAM
steckbrief
2016-02-12
1
-1
/
+1
*
database error while upgrading from db version 14 fixed
steckbrief
2016-02-12
1
-1
/
+1
*
Compilation errors and merge mixups fixed
steckbrief
2016-02-11
24
-728
/
+358
*
Fixed XML errors after merge
steckbrief
2016-02-11
6
-8
/
+14
*
Merge tag '1.9.3' into trz/merge_1.9.3
lookshe
2016-02-11
270
-5044
/
+18189
|
\
|
*
respect autojoin setting on newly created bookmarks as well
Daniel Gultsch
2016-02-01
1
-1
/
+1
|
*
opt out handling of the autojoin flag. fixes #1666
Daniel Gultsch
2016-02-01
5
-5
/
+20
|
*
made create context menu call in StartConversationsActivity more failsafe
Daniel Gultsch
2016-02-01
1
-1
/
+1
|
*
refactored user handling in conferences. show try again button when conferenc...
Daniel Gultsch
2016-02-01
4
-86
/
+70
|
*
fixed false set of subject in conference with empty body tag
Daniel Gultsch
2016-01-31
1
-1
/
+1
|
*
prefer dns servers from networsk with the default route
Daniel Gultsch
2016-01-29
1
-2
/
+17
|
*
be more careful with resetting the stream id
Daniel Gultsch
2016-01-29
1
-2
/
+1
|
*
try to make in-valid-session detection work for pgp
Daniel Gultsch
2016-01-29
1
-3
/
+10
|
*
show values in formfieldwrappers and allow form to be set to read only
Daniel Gultsch
2016-01-26
6
-7
/
+58
|
*
hide jid row in list item list when jid is null
Daniel Gultsch
2016-01-26
1
-1
/
+2
|
*
expert setting to trigger extended connection options
Daniel Gultsch
2016-01-25
5
-11
/
+48
|
*
changed FileBackend API to allow files instead of messages to be copied and r...
Daniel Gultsch
2016-01-24
1
-33
/
+34
|
*
added FormWrapper and form field validation
Daniel Gultsch
2016-01-23
8
-4
/
+160
|
*
introduced boolean form field wrapper
Daniel Gultsch
2016-01-23
6
-14
/
+76
|
*
added support for field types jid-single and text-private
Daniel Gultsch
2016-01-23
4
-4
/
+59
|
*
reset stanza queue when resetting xmppconnection
Daniel Gultsch
2016-01-23
1
-0
/
+1
|
*
show fetch errors in trust keys activity
Daniel Gultsch
2016-01-23
2
-1
/
+15
|
*
use extract account from intent method and final EXTRA_ACCOUNT variable
Daniel Gultsch
2016-01-22
13
-70
/
+52
|
*
added UI wrapper for (some) form fields
Daniel Gultsch
2016-01-22
6
-1
/
+161
|
*
added convenience method to extract account from intent
Daniel Gultsch
2016-01-22
1
-1
/
+13
|
*
added config variable to allow non-tls connections
Daniel Gultsch
2016-01-22
4
-5
/
+7
|
*
changed spacing in create dialogs and notify user when no accounts are activated
Daniel Gultsch
2016-01-22
5
-23
/
+43
|
*
increased padding in create contact/conference dialog
Daniel Gultsch
2016-01-21
2
-15
/
+21
|
*
add convenience to get an account object from a spinner
Daniel Gultsch
2016-01-21
1
-15
/
+19
|
*
pulled translations from transifex
Daniel Gultsch
2016-01-20
15
-13
/
+718
|
*
catch security exception when user prevents access to address book
Daniel Gultsch
2016-01-20
1
-27
/
+45
|
*
add intent!=null check in onActivityResultin PublishProfilePicture
Daniel Gultsch
2016-01-20
1
-1
/
+1
|
*
Merge branch 'master' of github.com:siacs/Conversations
Daniel Gultsch
2016-01-16
1
-1
/
+4
|
|
\
|
|
*
Merge pull request #1655 from adithyaphilip/pgp-fix
Daniel Gultsch
2016-01-16
1
-1
/
+4
|
|
|
\
|
|
|
*
fixed PGP having to be selected twice
Adithya Abraham Philip
2016-01-16
1
-1
/
+4
|
*
|
|
pulled translations from transifex
Daniel Gultsch
2016-01-16
4
-3
/
+49
|
|
/
/
|
*
|
make ConversationsActivity more resistent against being restarted
Daniel Gultsch
2016-01-16
1
-3
/
+9
|
*
|
reuse same xmppconnection for reconnects
Daniel Gultsch
2016-01-16
2
-9
/
+17
|
*
|
made constructor private in Account entity
Daniel Gultsch
2016-01-16
1
-5
/
+1
|
*
|
removed some unused methods from db backend
Daniel Gultsch
2016-01-16
1
-83
/
+0
|
|
/
|
*
hide prepare image toasts when attaching multiple images
Daniel Gultsch
2016-01-15
1
-11
/
+12
|
*
show toast when image cropper get oom
Daniel Gultsch
2016-01-15
2
-0
/
+8
|
*
catch exception when reading message id from database
Daniel Gultsch
2016-01-15
1
-8
/
+12
|
*
nimbuzz.com: don't wait for disco replies to set account to online
Daniel Gultsch
2016-01-15
2
-12
/
+27
[next]