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
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge pull request #885 from SamWhited/display-enter-key
Daniel Gultsch
2015-01-14
5
-26
/
+52
|
\
|
*
Add option to swap enter/emoticon key
Sam Whited
2015-01-14
5
-26
/
+52
*
|
handle muc nicks with white spaces. fixed #884
iNPUTmice
2015-01-14
2
-3
/
+4
*
|
Harden the TLS connection cipher suites
Sam Whited
2015-01-14
5
-43
/
+94
|
/
*
Merge pull request #882 from SamWhited/apiandjavafixes
Daniel Gultsch
2015-01-14
1
-15
/
+30
|
\
|
*
Ensure type safety in Pebble notifications
Sam Whited
2015-01-13
1
-15
/
+30
*
|
Fix bottom padding on about page
Sam Whited
2015-01-13
1
-1
/
+1
|
/
*
make use of different dimensions for different screen sizes
Daniel Gultsch
2015-01-13
15
-114
/
+56
*
Merge pull request #872 from Elinvention/development
Daniel Gultsch
2015-01-13
1
-25
/
+104
|
\
|
*
Updated Italian translations
Elia
2015-01-13
1
-25
/
+104
*
|
Merge pull request #873 from SamWhited/about-margin-fix
Daniel Gultsch
2015-01-13
1
-4
/
+4
|
\
\
|
|
/
|
/
|
|
*
Use margin instead of padding in about screen
Sam Whited
2015-01-12
1
-4
/
+4
*
|
Czech translation
Jaroslav Lichtblau
2015-01-12
1
-9
/
+37
|
/
*
catch bug in guessContentType
Daniel Gultsch
2015-01-12
1
-1
/
+6
*
context menu for files and offered files. fixed #848 fixed #849
Daniel Gultsch
2015-01-12
3
-17
/
+24
*
reworked message preview / message meta information (ie file offered, receive...
Daniel Gultsch
2015-01-12
5
-168
/
+171
*
Merge pull request #866 from SamWhited/xep0245
Daniel Gultsch
2015-01-12
4
-159
/
+205
|
\
|
*
Add XEP-0245 (/me command) support
Sam Whited
2015-01-11
4
-159
/
+205
*
|
do not check image file size over http if accepted file size is 0
Daniel Gultsch
2015-01-11
2
-6
/
+11
*
|
keep proper image file extension
Daniel Gultsch
2015-01-11
4
-26
/
+39
|
/
*
shortened some string
Daniel Gultsch
2015-01-11
2
-2
/
+3
*
fixed #860
Daniel Gultsch
2015-01-10
1
-0
/
+1
*
make room persistant when changing subject or other muc options
Daniel Gultsch
2015-01-10
3
-16
/
+26
*
don't crash when selecting a conversation by uuid did not work
Daniel Gultsch
2015-01-10
1
-16
/
+20
*
fixed regression in tablet ui
Daniel Gultsch
2015-01-09
1
-0
/
+2
*
Introduced expert options to control enter-is-send
Daniel Gultsch
2015-01-09
5
-5
/
+27
*
code cleanup for jingle proxy discovery
Daniel Gultsch
2015-01-09
4
-99
/
+72
*
ensure that everyone is member before making a room private
Daniel Gultsch
2015-01-09
3
-6
/
+32
*
make project translatable via transifex
Daniel Gultsch
2015-01-09
16
-475
/
+12
*
added missing drawables
Daniel Gultsch
2015-01-08
4
-0
/
+0
*
allow for very basic muc configuration
Daniel Gultsch
2015-01-08
6
-128
/
+239
*
code cleanup
Daniel Gultsch
2015-01-08
2
-14
/
+15
*
kick after ban
Daniel Gultsch
2015-01-08
4
-1
/
+46
*
fixed german translation
Daniel Gultsch
2015-01-08
1
-2
/
+2
*
some clean ups for affiliation change context menu
Daniel Gultsch
2015-01-08
3
-6
/
+16
*
Merge pull request #851 from kriztan/patch-2
Daniel Gultsch
2015-01-07
1
-9
/
+12
|
\
|
*
Updated German translations for more muc options
Christian S.
2015-01-07
1
-9
/
+12
*
|
Merge pull request #852 from SamWhited/ellipsis
Daniel Gultsch
2015-01-07
1
-2
/
+2
|
\
\
|
*
|
s/.../…/ in CS strings
Sam Whited
2015-01-07
1
-2
/
+2
|
|
/
*
|
Merge pull request #850 from plsng/dutch
Daniel Gultsch
2015-01-07
1
-0
/
+25
|
\
\
|
|
/
|
/
|
|
*
Update Dutch translations
Nathan Follens
2015-01-07
1
-0
/
+25
*
|
more muc options
Daniel Gultsch
2015-01-07
6
-25
/
+99
*
|
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
Daniel Gultsch
2015-01-07
1
-4
/
+15
|
\
\
|
*
\
Merge pull request #847 from kriztan/patch-1
Daniel Gultsch
2015-01-07
1
-4
/
+15
|
|
\
\
|
|
|
/
|
|
/
|
|
|
*
Updated German translations...
Christian S
2015-01-07
1
-4
/
+15
*
|
|
fixed invites
Daniel Gultsch
2015-01-07
1
-37
/
+24
|
/
/
*
|
Merge pull request #845 from SamWhited/material
Daniel Gultsch
2015-01-07
2
-0
/
+15
|
\
\
|
*
|
Add materials theme
Sam Whited
2015-01-06
2
-0
/
+15
*
|
|
basic affiliation changes in muc
Daniel Gultsch
2015-01-07
6
-26
/
+160
|
|
/
|
/
|
*
|
reset next encryption when archiving conversations
Daniel Gultsch
2015-01-07
2
-1
/
+3
[next]