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
*
fixed default autoaccept file size and wrongly marked message
Daniel Gultsch
2014-04-19
2
-3
/
+3
*
cleaned up debug log a little bit
Daniel Gultsch
2014-04-19
7
-91
/
+118
*
fixed concurrent modification of contacts which led to missing presences
Daniel Gultsch
2014-04-18
2
-10
/
+15
*
tried to avoid some more race conditions in jingle
Daniel Gultsch
2014-04-18
3
-38
/
+80
*
Merge branch 'master' into development
Daniel Gultsch
2014-04-18
1
-21
/
+25
|
\
|
*
work around for bug in xmlpullparser
Daniel Gultsch
2014-04-18
1
-21
/
+25
*
|
lot of cleanup in jingle part
Daniel Gultsch
2014-04-18
6
-120
/
+326
*
|
put more string into strings.xml
Daniel Gultsch
2014-04-18
2
-9
/
+9
*
|
fixed destination bug
Daniel Gultsch
2014-04-18
3
-5
/
+15
*
|
fixed #63
Daniel Gultsch
2014-04-18
2
-2
/
+21
*
|
fixed possible race conditions with presences
Daniel Gultsch
2014-04-18
5
-11
/
+23
*
|
added clear history dialog (no funcionality)
Daniel Gultsch
2014-04-18
1
-4
/
+24
*
|
jingle sessions now get terminated proberly on success
Daniel Gultsch
2014-04-16
2
-17
/
+34
*
|
made ui with sending images a little smoother
Daniel Gultsch
2014-04-15
3
-29
/
+56
*
|
added very basic, very untested gui on the receiving side
Daniel Gultsch
2014-04-14
2
-27
/
+59
*
|
tried to fix some race conditions. not adding duplicate candidates. needs mor...
Daniel Gultsch
2014-04-14
4
-20
/
+45
*
|
Fix two typos: assoziated -> associated.
Jelmer Vernooij
2014-04-14
1
-1
/
+1
*
|
Some icon tweaks
Andreas Straub
2014-04-13
1
-14
/
+16
*
|
Added ellipsis tile for large conversations
Andreas Straub
2014-04-13
1
-5
/
+17
*
|
Major Contact Picture code cleanup
Andreas Straub
2014-04-13
7
-55
/
+71
*
|
transmitting files between two conversations works. no error handling and no ...
Daniel Gultsch
2014-04-13
6
-36
/
+136
*
|
some code cleanup. added setting to auto accept files. socks5 connections are...
Daniel Gultsch
2014-04-13
8
-78
/
+215
*
|
more efficant way of calculating the sha1 sum. closing connections
Daniel Gultsch
2014-04-13
10
-109
/
+204
*
|
fixed minor typos
Daniel Gultsch
2014-04-12
2
-3
/
+2
*
|
Merge branch 'development' of https://github.com/strb/Conversations into strb...
Daniel Gultsch
2014-04-12
6
-44
/
+205
|
\
\
|
*
|
Added tiled MUC icons
andy
2014-04-12
1
-16
/
+164
|
*
|
More Contact Picture refactors
andy
2014-04-12
5
-17
/
+40
|
*
|
Refactor UIHelper to use getContactPicture
andy
2014-04-12
2
-14
/
+4
*
|
|
add sha1 sum to file
Daniel Gultsch
2014-04-12
4
-3
/
+50
*
|
|
open latest conversation from notification
Daniel Gultsch
2014-04-11
1
-0
/
+3
|
/
/
*
|
first file transfer between gajim and conversations. still a lot to do though
Daniel Gultsch
2014-04-11
4
-13
/
+94
*
|
socks5 initialisation works. doesn't get activate though
Daniel Gultsch
2014-04-11
9
-38
/
+180
*
|
failed messages get now marked inline
Daniel Gultsch
2014-04-11
4
-42
/
+63
*
|
incomming jingle packets are routed to their connection. added presence choos...
Daniel Gultsch
2014-04-10
8
-160
/
+316
*
|
changed behaviour of expecption handler to check if accounts are working befo...
Daniel Gultsch
2014-04-10
1
-12
/
+15
*
|
disocover stream hosts (xep-0065) cleaned up disco
Daniel Gultsch
2014-04-08
11
-108
/
+211
*
|
fixed npe
Daniel Gultsch
2014-04-08
1
-3
/
+5
*
|
fixed #52. thanks @strb
Daniel Gultsch
2014-04-07
1
-1
/
+11
*
|
jingle connection and manager. able to trigger dialog in gajim
Daniel Gultsch
2014-04-07
8
-79
/
+283
*
|
gui for images
Daniel Gultsch
2014-04-06
6
-41
/
+88
*
|
added button to open images
Daniel Gultsch
2014-04-06
4
-12
/
+117
*
|
added attach file action
Daniel Gultsch
2014-04-06
1
-0
/
+4
|
/
*
renamed [Archive conversation|Leave conference] to End this conversation
Daniel Gultsch
2014-04-06
1
-1
/
+0
*
fixed npe
Daniel Gultsch
2014-04-06
1
-0
/
+9
*
use proper, advertised sm namespace
Daniel Gultsch
2014-04-05
5
-25
/
+24
*
cleaned up log output a little bit
Daniel Gultsch
2014-04-05
2
-7
/
+1
*
Switch to FULL_SYNC to make prosody happy
Rene Treffer
2014-04-05
1
-10
/
+5
*
code cleanup
Daniel Gultsch
2014-04-05
1
-11
/
+5
*
marked incoming carbons as unread
Daniel Gultsch
2014-04-04
1
-5
/
+7
*
notify on incomming received carbon messages
Daniel Gultsch
2014-04-04
2
-4
/
+12
[next]