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
/
eu
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
...
*
|
Merge branch 'development' of github.com:siacs/Conversations into development
iNPUTmice
2014-09-06
1
-0
/
+8
|
\
\
|
*
|
MUC: set password from invite message.
Michael
2014-09-05
1
-0
/
+8
*
|
|
made otr a little bit more solid when there is no presence subscription
iNPUTmice
2014-09-06
8
-29
/
+55
|
/
/
*
|
warn user if no presence subscription exists
iNPUTmice
2014-09-05
1
-0
/
+34
*
|
improved logging for avatar fetches
iNPUTmice
2014-09-05
1
-21
/
+38
*
|
fixed #342 - otr with facebook and other services without resources
iNPUTmice
2014-09-04
1
-2
/
+6
*
|
reconnect accounts when resource has been changed in settings
iNPUTmice
2014-09-04
1
-3
/
+39
*
|
made muc password dialog hide the password (password field)
iNPUTmice
2014-09-04
2
-10
/
+29
*
|
nick parsing (xep 0172) also enabled for messages and for pep
iNPUTmice
2014-09-04
1
-5
/
+27
*
|
Merge pull request #397 from GZep/development
Daniel Gultsch
2014-09-04
2
-2
/
+12
|
\
\
|
*
|
Contact presenceName property
Gayaz Yusipov
2014-08-31
2
-1
/
+8
|
*
|
XEP-0172
Gayaz Yusipov
2014-08-30
1
-2
/
+5
*
|
|
Merge pull request #417 from emdete/unicode_emoticons
Daniel Gultsch
2014-09-04
1
-16
/
+32
|
\
\
\
|
*
|
|
improve emo mapping
M. Dietrich
2014-09-03
1
-6
/
+9
|
*
|
|
use class, use codepoint
M. Dietrich
2014-09-03
1
-25
/
+26
|
*
|
|
make pattern static
M. Dietrich
2014-09-03
1
-16
/
+20
|
*
|
|
improve regex, implement pattern cache
M. Dietrich
2014-09-03
1
-15
/
+23
*
|
|
|
added support for password protected muc - fixed #203 and fixed #395
iNPUTmice
2014-09-03
3
-17
/
+70
*
|
|
|
changed order of snackbar hints
iNPUTmice
2014-09-03
1
-12
/
+11
*
|
|
|
more openpgp bug fixes
iNPUTmice
2014-09-03
1
-3
/
+7
*
|
|
|
avoiding resource conflicts
iNPUTmice
2014-09-03
1
-2
/
+7
*
|
|
|
fixed pgp signature creation
iNPUTmice
2014-09-03
1
-3
/
+19
*
|
|
|
added ability to disable notifications for specific conversations - fixed #322
iNPUTmice
2014-09-03
4
-0
/
+53
*
|
|
|
made emoticon parsing enableable - default false
iNPUTmice
2014-09-03
3
-2
/
+12
*
|
|
|
fixed #410 by removing that config option
iNPUTmice
2014-09-02
8
-40
/
+14
*
|
|
|
refactored share with activity
iNPUTmice
2014-09-02
6
-226
/
+246
*
|
|
|
fixed #406
iNPUTmice
2014-09-02
1
-12
/
+8
*
|
|
|
rotate avatars
iNPUTmice
2014-09-02
1
-9
/
+16
*
|
|
|
Merge pull request #408 from emdete/unicode_emoticons
Daniel Gultsch
2014-09-02
1
-1
/
+1
|
\
|
|
|
|
*
|
|
add all whitespaces in regex
M. Dietrich
2014-09-02
1
-1
/
+1
*
|
|
|
Merge pull request #380 from emdete/unicode_emoticons
Daniel Gultsch
2014-09-01
3
-2
/
+25
|
\
|
|
|
|
*
|
|
transform ascii to emoticons (on display only)
M. Dietrich
2014-09-01
3
-2
/
+25
*
|
|
|
fixed #403
iNPUTmice
2014-09-01
3
-11
/
+18
*
|
|
|
optimize string operations a bit
M. Dietrich
2014-09-01
12
-26
/
+26
|
/
/
/
*
|
|
deleted unnecessary log
iNPUTmice
2014-08-31
1
-2
/
+0
*
|
|
show merged time and status in message adapter
iNPUTmice
2014-08-31
2
-3
/
+21
*
|
|
improvements for merge conditions
iNPUTmice
2014-08-31
2
-3
/
+9
*
|
|
add missing blank before nick
iNPUTmice
2014-08-31
1
-0
/
+3
*
|
|
Smarter nickname highlight insert in confernces
Bahtiar `kalkin-` Gadimov
2014-08-31
1
-6
/
+3
*
|
|
some code cleanup
iNPUTmice
2014-08-31
75
-1263
/
+1482
*
|
|
Merge pull request #391 from betheg/fix_typo
Daniel Gultsch
2014-08-31
1
-4
/
+4
|
\
\
\
|
*
\
\
Merge remote-tracking branch 'upstream/development' into fix_typo
Michael
2014-08-30
7
-164
/
+354
|
|
\
\
\
|
*
\
\
\
Merge remote-tracking branch 'upstream/development' into fix_typo
Michael
2014-08-29
3
-3
/
+11
|
|
\
\
\
\
|
*
|
|
|
|
fix forgotten spelling.
Michael
2014-08-28
1
-4
/
+4
|
|
|
_
|
/
/
|
|
/
|
|
|
*
|
|
|
|
require encrypted to be the same for messages to get merged
iNPUTmice
2014-08-31
1
-1
/
+3
*
|
|
|
|
experimental message merging
iNPUTmice
2014-08-31
2
-44
/
+107
|
|
_
|
/
/
|
/
|
|
|
*
|
|
|
Merge branch 'sm' into development
iNPUTmice
2014-08-30
3
-146
/
+250
|
\
\
\
\
|
*
|
|
|
reset unsend messages to waiting
iNPUTmice
2014-08-30
2
-2
/
+17
|
*
|
|
|
properly set stanza count on session resume
iNPUTmice
2014-08-30
1
-3
/
+21
|
*
|
|
|
basic message acking
iNPUTmice
2014-08-30
3
-131
/
+200
|
|
|
_
|
/
|
|
/
|
|
[prev]
[next]