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
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge pull request #846 from kruks23/translation4
Daniel Gultsch
2015-01-07
1
-0
/
+5
|
\
|
*
Update affiliation in MUC details and advance mode
kruks23
2015-01-07
1
-0
/
+5
*
|
Merge pull request #843 from svetlemodry/development
Daniel Gultsch
2015-01-06
1
-0
/
+5
|
\
\
|
*
|
Czech translation for - show affiliation instead of role in MucDetails
Jaroslav Lichtblau
2015-01-06
1
-0
/
+5
|
/
/
*
|
fixed bug in new ping strategy
Daniel Gultsch
2015-01-06
1
-3
/
+3
*
|
mark sent images as sent_received instead of sent
Daniel Gultsch
2015-01-06
1
-2
/
+1
*
|
Merge pull request #841 from BenoitBouvarel/patch-2
Daniel Gultsch
2015-01-06
1
-1
/
+86
|
\
\
|
*
|
Update strings.xml
Benoit Bouvarel
2015-01-06
1
-1
/
+1
|
*
|
Update strings.xml
Benoit Bouvarel
2015-01-05
1
-1
/
+86
*
|
|
run invalidateOptionsMenu on uiThread
Daniel Gultsch
2015-01-06
1
-1
/
+1
*
|
|
fixed potential NPEs in ShareWithActivity
Daniel Gultsch
2015-01-06
1
-4
/
+5
|
/
/
*
|
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
Daniel Gultsch
2015-01-05
1
-16
/
+16
|
\
\
|
*
\
Merge pull request #840 from kriztan/patch-1
Daniel Gultsch
2015-01-05
1
-16
/
+16
|
|
\
\
|
|
*
|
corrected German spellings
Christian Schneppe
2015-01-05
1
-16
/
+16
|
|
/
/
*
|
|
added debug info + possible platform bug work arounds to message adapter
Daniel Gultsch
2015-01-05
1
-0
/
+10
*
|
|
reworked ping scheduling strategy. very experimental
Daniel Gultsch
2015-01-05
1
-61
/
+32
*
|
|
avoid requesting blocklist after stream resumption
Daniel Gultsch
2015-01-05
2
-27
/
+24
|
/
/
*
|
prevent QR code parser from crashing fixed #839
Daniel Gultsch
2015-01-05
1
-6
/
+13
*
|
Show affiliation instead of role in MucDetails and offer 'advanced mode' to d...
Daniel Gultsch
2015-01-05
4
-78
/
+130
*
|
Merge pull request #838 from shtrom/pebble-notifications-squash
Daniel Gultsch
2015-01-05
1
-2
/
+28
|
\
\
|
*
|
Send notification to Pebble on new message
Olivier Mehani
2015-01-05
1
-2
/
+28
*
|
|
Merge pull request #836 from kriztan/development
Daniel Gultsch
2015-01-05
14
-416
/
+437
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
Updated languages for higher auto accept file sizes and changed labeling to M...
Christian Schneppe
2015-01-05
14
-416
/
+437
|
/
/
*
|
made checks for valid image extensions case insensitive
Daniel Gultsch
2015-01-04
3
-3
/
+3
*
|
do not run mam queries in findOrCreateConversation() when isn't available
Daniel Gultsch
2015-01-04
1
-5
/
+7
*
|
added higher auto accept file sizes
Daniel Gultsch
2015-01-04
2
-35
/
+39
*
|
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
Daniel Gultsch
2015-01-04
1
-0
/
+7
|
\
\
|
*
\
Merge pull request #833 from SamWhited/travis
Daniel Gultsch
2015-01-04
1
-0
/
+7
|
|
\
\
|
|
*
|
Add travis config
Sam Whited
2015-01-04
1
-0
/
+7
|
|
/
/
*
/
/
added travis build icon to README
Daniel Gultsch
2015-01-04
1
-0
/
+3
|
/
/
*
|
code cleanup + logging of spoofed iq packets
Daniel Gultsch
2015-01-04
1
-35
/
+33
*
|
Merge pull request #823 from SamWhited/issue20
Daniel Gultsch
2015-01-04
10
-116
/
+123
|
\
\
|
*
|
Verify IQ responses
Sam Whited
2015-01-04
4
-18
/
+39
|
*
|
Make IqPacket type an enum
Sam Whited
2015-01-04
9
-99
/
+85
|
/
/
*
|
Merge pull request #832 from svetlemodry/development
Daniel Gultsch
2015-01-04
1
-1
/
+39
|
\
\
|
*
|
Czech translation update
Jaroslav Lichtblau
2015-01-04
1
-1
/
+39
*
|
|
deal with prosodys muc namespace tagging of messages
Daniel Gultsch
2015-01-04
1
-4
/
+5
*
|
|
Use packet callbacks only for IqPackets. Removed unnecessary code
Daniel Gultsch
2015-01-04
2
-71
/
+37
|
/
/
*
|
Merge pull request #829 from kriztan/patch-1
Daniel Gultsch
2015-01-04
1
-1
/
+1
|
\
\
|
*
|
corrected German 'private_message_to'
kriztan
2015-01-04
1
-1
/
+1
*
|
|
Merge pull request #830 from kruks23/translation4
Daniel Gultsch
2015-01-04
1
-1
/
+15
|
\
\
\
|
|
/
/
|
/
|
/
|
|
/
|
*
Update spanish translations
sergio
2015-01-04
1
-1
/
+15
|
/
*
no longer use ConcurrentHashMap in favor of synchronize on a final HashMap
Daniel Gultsch
2015-01-04
1
-19
/
+27
*
Merge branch 'development'
0.10
Daniel Gultsch
2015-01-03
1
-5
/
+11
|
\
|
*
Merge pull request #827 from kriztan/patch-2
Daniel Gultsch
2015-01-03
1
-5
/
+11
|
|
\
|
|
*
Added and modified German translations
kriztan
2015-01-03
1
-5
/
+11
|
|
/
*
/
version bump to 0.10
Daniel Gultsch
2015-01-03
3
-3
/
+13
|
/
*
void messages getting reloaded through mam after clear history
Daniel Gultsch
2015-01-03
1
-0
/
+1
*
record voice and attachment refactor
Daniel Gultsch
2015-01-03
5
-74
/
+73
*
disable / enable all accounts
Daniel Gultsch
2015-01-03
3
-27
/
+103
[next]