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
...
|
*
|
don't throw IO exception at end of stream
Daniel Gultsch
2016-04-10
1
-1
/
+0
|
*
|
fixed 'connecting…' button
Daniel Gultsch
2016-04-10
1
-3
/
+6
|
*
|
moved authentication into seperate method. force close socket before changing...
Daniel Gultsch
2016-04-10
1
-38
/
+44
|
*
|
introduced setting to turn of notification led
Daniel Gultsch
2016-04-09
3
-5
/
+15
|
*
|
use startdate as lower bound when querying archive with after=x
Daniel Gultsch
2016-04-09
1
-13
/
+3
|
*
|
don't show contact details when in conversations with self
Daniel Gultsch
2016-04-09
3
-1
/
+8
|
*
|
use last received message id when querying archive
Daniel Gultsch
2016-04-09
1
-7
/
+17
|
*
|
transform nimbuzz workaround into a more general 'waitForDisco' condition
Daniel Gultsch
2016-04-09
1
-6
/
+11
|
*
|
add required disco#items query to timeout list
Daniel Gultsch
2016-04-08
1
-1
/
+4
|
*
|
removed ernoexception in exchange for a regular exeption to prevent verify er...
Daniel Gultsch
2016-04-08
1
-3
/
+2
|
*
|
pulled translations from transifex
Daniel Gultsch
2016-04-08
2
-3
/
+23
|
*
|
check file owner when attaching files or using them as avatar
Daniel Gultsch
2016-04-07
4
-2
/
+55
|
*
|
prevent null pointer when checking http upload max size
Daniel Gultsch
2016-04-07
1
-6
/
+6
|
*
|
better detect broken pep
Daniel Gultsch
2016-04-05
2
-2
/
+10
|
*
|
switched around info and items query to avoid race condition
Daniel Gultsch
2016-04-04
1
-1
/
+1
|
*
|
pulled translations from transifex
Daniel Gultsch
2016-04-04
12
-26
/
+71
|
*
|
removed unnecessary wait for disconnect
Daniel Gultsch
2016-04-04
1
-6
/
+0
|
*
|
made sure the disco#items query has returned before finalizing the bind
Daniel Gultsch
2016-04-04
1
-12
/
+24
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-04-16
2
-3
/
+8
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
Fixed null pointer exception in case of IOException before uploading file to ...
steckbrief
2016-04-16
1
-2
/
+7
|
*
|
Fixes FS#197: Decrease verbosity of logging of 'skipping duplicate message'
steckbrief
2016-04-07
1
-1
/
+1
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-04-07
4
-6
/
+125
|
\
|
|
|
*
|
Implements FS#187: Add single line copy to logcat view
steckbrief
2016-04-07
4
-6
/
+123
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-04-06
12
-144
/
+135
|
\
|
|
|
*
|
Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferences
steckbrief
2016-04-06
12
-144
/
+134
|
*
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-04-05
17
-53
/
+196
|
|
\
\
|
*
|
|
conversations->conversations+
lookshe
2016-04-03
29
-327
/
+327
|
*
|
|
Pulled translations from transifex
lookshe
2016-04-01
2
-25
/
+31
|
*
|
|
Fixes FS#180: Conference notification icon missing
lookshe
2016-04-01
1
-1
/
+6
*
|
|
|
update to beta-2 and new logo for beta
trz/beta-2
lookshe
2016-04-06
30
-0
/
+0
|
|
/
/
|
/
|
|
*
|
|
Merge tag '1.11.3' into trz/rebase
lookshe
2016-04-05
17
-53
/
+196
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
don't ask for resource when server uses http upload v0.1
Daniel Gultsch
2016-04-02
3
-6
/
+8
|
*
|
check max http file size when attaching files
Daniel Gultsch
2016-04-01
6
-12
/
+83
|
*
|
add methods to check max file size for http upload
Daniel Gultsch
2016-03-31
5
-12
/
+41
|
*
|
save otr fingerprint in message
Daniel Gultsch
2016-03-31
6
-12
/
+15
|
*
|
include form fields into caps hash calculation
Daniel Gultsch
2016-03-31
2
-6
/
+25
|
*
|
closed some cursors under error conditions
Daniel Gultsch
2016-03-31
1
-3
/
+13
|
*
|
made setting aes keys in DownloadableFile more readable
Daniel Gultsch
2016-03-31
1
-12
/
+8
|
*
|
Update ShortcutBadger to version 1.1.4
Christian S
2016-03-27
1
-2
/
+2
*
|
|
fixed installation error "W/PackageManager: Can't install because provider na...
trz/beta-1
lookshe
2016-04-03
3
-3
/
+3
*
|
|
fixed build error
lookshe
2016-04-03
1
-0
/
+2
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-04-01
3
-26
/
+37
|
\
\
\
|
*
|
|
Pulled translations from transifex
lookshe
2016-04-01
2
-25
/
+31
|
*
|
|
Fixes FS#180: Conference notification icon missing
lookshe
2016-04-01
1
-1
/
+6
*
|
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-30
1
-1
/
+3
|
\
\
\
\
|
|
|
_
|
/
|
|
/
|
|
|
*
|
|
Fixes FS#179: Avoid showing always empty list of ressources for mucs
steckbrief
2016-03-30
1
-1
/
+3
|
|
/
/
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-30
4
-1
/
+7
|
\
|
|
|
*
|
no resize of input field when inserting emojicon (FS#175)
lookshe
2016-03-30
1
-1
/
+1
|
*
|
Logging for FS#80 to identify calling method
lookshe
2016-03-30
3
-0
/
+6
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-29
1
-20
/
+9
|
\
|
|
[prev]
[next]