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
*
catch another exception in fingerprint generation
Daniel Gultsch
2014-12-25
1
-1
/
+1
*
Merge pull request #810 from kriztan/patch-2
Daniel Gultsch
2014-12-25
1
-0
/
+20
|
\
|
*
Update german translations
kriztan
2014-12-25
1
-0
/
+20
*
|
Show server info option when blocking is unavailable
pulser
2014-12-24
1
-2
/
+4
|
/
*
Don't allow user to register domain only jids
Sam Whited
2014-12-23
1
-0
/
+5
*
Don't show menu on create account screen
Sam Whited
2014-12-23
1
-0
/
+3
*
Remove old JID validator
Sam Whited
2014-12-23
3
-105
/
+77
*
Add more server compatibility info.
Sam Whited
2014-12-23
4
-6
/
+150
*
made method private that is no longer required to be public
iNPUTmice
2014-12-23
1
-1
/
+1
*
Simplify roster handling code
Sam Whited
2014-12-22
3
-121
/
+97
*
Fix NPEs in blocking code
Sam Whited
2014-12-22
2
-2
/
+4
*
Add support for XEP-0191 (Blocking command)
Sam Whited
2014-12-22
42
-903
/
+1481
*
get rid of special self presence object and incorporate that into roster
iNPUTmice
2014-12-20
3
-75
/
+46
*
more null checks for otr fingerprints
iNPUTmice
2014-12-20
1
-1
/
+1
*
don't include empty fingerprints in list of otrfingerprints
iNPUTmice
2014-12-20
1
-4
/
+6
*
fixed another break continue bug
iNPUTmice
2014-12-20
1
-3
/
+2
*
inject ui callback into running mam query
iNPUTmice
2014-12-20
3
-4
/
+6
*
Merge pull request #794 from svetlemodry/development
Daniel Gultsch
2014-12-20
1
-2
/
+2
|
\
|
*
Czech image transfer string fix
Jaroslav Lichtblau
2014-12-19
1
-2
/
+2
*
|
Update spanish translations
kruks23
2014-12-20
1
-4
/
+12
*
|
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
iNPUTmice
2014-12-19
2
-0
/
+16
|
\
|
|
*
Czech translation updated
Jaroslav Lichtblau
2014-12-18
1
-0
/
+8
|
*
Update german translations
kriztan
2014-12-18
1
-0
/
+8
*
|
fixed #755
iNPUTmice
2014-12-19
1
-1
/
+1
|
/
*
clean up conversation history after swtiching to a different conversation
iNPUTmice
2014-12-17
3
-4
/
+12
*
show error if jid couldn't be parsed in new contact dialog
iNPUTmice
2014-12-17
1
-15
/
+10
*
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
iNPUTmice
2014-12-17
3
-18
/
+19
|
\
|
*
Merge pull request #783 from SamWhited/quiet-hours
Daniel Gultsch
2014-12-17
3
-18
/
+19
|
|
\
|
|
*
Handle time comparisons using longs
Sam Whited
2014-12-16
2
-13
/
+8
|
|
*
Update summary in TimePreference change listener
Sam Whited
2014-12-15
1
-5
/
+11
*
|
|
made scroling smoother + bug fixes for history loading
iNPUTmice
2014-12-17
4
-21
/
+48
*
|
|
smoothed out scrolling a bit
iNPUTmice
2014-12-17
3
-23
/
+45
|
/
/
*
|
properly detect images in share with
iNPUTmice
2014-12-17
1
-6
/
+6
*
|
Merge branch 'issue756' of https://github.com/SamWhited/Conversations into Sa...
iNPUTmice
2014-12-17
2
-25
/
+37
|
\
\
|
*
|
Allow sending of any filetype via intent
Sam Whited
2014-12-15
2
-25
/
+37
|
|
/
*
/
properly count mam messages
iNPUTmice
2014-12-17
2
-4
/
+13
|
/
*
go through mam history page by page. load mam dynamically on scroll
iNPUTmice
2014-12-15
5
-43
/
+108
*
Merge pull request #782 from SamWhited/quiet-hours
Daniel Gultsch
2014-12-15
1
-3
/
+3
|
\
|
*
Make some magic number constants final
Sam Whited
2014-12-15
1
-3
/
+3
*
|
fixed crashing on unparsed jids
iNPUTmice
2014-12-15
1
-4
/
+4
*
|
Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into...
iNPUTmice
2014-12-15
1
-68
/
+64
|
\
|
|
*
Make silent notification when quiet hours are on
Sam Whited
2014-12-15
1
-68
/
+64
*
|
migrated more jid parsing to use getAttributeAsJid. added error logging
iNPUTmice
2014-12-15
4
-32
/
+8
*
|
Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into...
iNPUTmice
2014-12-15
4
-29
/
+176
|
\
|
|
*
Add quiet hours feature
Sam Whited
2014-12-14
4
-29
/
+176
*
|
fixed history deletion. fixed #780
iNPUTmice
2014-12-15
2
-1
/
+11
*
|
Merge pull request #775 from kruks23/translation1
Daniel Gultsch
2014-12-15
1
-33
/
+33
|
\
\
|
*
|
Update spanish translations.
kruks23
2014-12-13
1
-33
/
+33
*
|
|
Merge pull request #781 from drizzt/patch-1
Daniel Gultsch
2014-12-15
1
-1
/
+1
|
\
\
\
|
*
|
|
fixed typo in italian translation
drizzt
2014-12-15
1
-1
/
+1
[next]