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 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
6
-56
/
+131
|
\
|
|
*
Implements FS#187: Add single line copy to logcat view
steckbrief
2016-04-07
6
-56
/
+129
*
|
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 commit 'remotes/origin/trz/rename~1' into trz/rebase
steckbrief
2016-04-06
0
-0
/
+0
|
\
|
|
*
Merge branch 'trz/rebase' into trz/rename (skip beta logo)
lookshe
2016-04-06
0
-0
/
+0
|
|
\
|
|
/
|
/
|
*
|
update to beta-2 and new logo for beta
trz/beta-2
lookshe
2016-04-06
34
-5
/
+740
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-04-05
21
-54
/
+201
|
|
\
|
|
/
|
/
|
*
|
Merge tag '1.11.3' into trz/rebase
lookshe
2016-04-05
21
-55
/
+202
|
\
\
|
*
|
version bump to 1.11.3 and changelog
1.11.3
Daniel Gultsch
2016-04-02
2
-2
/
+6
|
*
|
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
|
*
|
Merge pull request #1784 from kriztan/patch-2
Daniel Gultsch
2016-03-28
2
-3
/
+3
|
|
\
\
|
|
*
|
Update ShortcutBadger to version 1.1.4
Christian S
2016-03-27
2
-3
/
+3
|
|
/
/
|
|
*
Merge branch 'trz/rebase' (early part) into trz/rename
lookshe
2016-04-05
0
-0
/
+0
|
|
|
\
|
|
_
|
/
|
/
|
|
*
|
|
Merge branch 'trz/rename' into trz/rebase (skip translation)
lookshe
2016-04-03
0
-0
/
+0
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
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
*
|
|
fixed installation error "W/PackageManager: Can't install because provider na...
trz/beta-1
lookshe
2016-04-03
3
-3
/
+3
*
|
|
update build.gradle for beta
lookshe
2016-04-03
1
-2
/
+2
*
|
|
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
9
-32
/
+61
|
\
|
|
|
*
|
no resize of input field when inserting emojicon (FS#175)
lookshe
2016-03-30
1
-1
/
+1
|
*
|
Fixes FS#174: Displaying of ASCII emoticons differs
lookshe
2016-03-30
5
-31
/
+54
|
*
|
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
|
\
|
|
|
*
|
Fixes FS#172: Conversations list not updated on status changes
steckbrief
2016-03-29
1
-20
/
+9
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-29
0
-0
/
+0
|
\
|
|
|
*
|
Removed unnecessary import
steckbrief
2016-03-29
1
-1
/
+0
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-29
6
-70
/
+103
|
\
|
|
|
*
|
Avoid unnecessary text change on activate account button
steckbrief
2016-03-29
1
-2
/
+3
|
*
|
Introduction of a TextViewUtil to easily set attributes for TextViews
steckbrief
2016-03-29
6
-69
/
+99
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-29
17
-102
/
+246
|
\
|
|
|
*
|
Implements FS#173: Move access to colors to separate helper class
steckbrief
2016-03-29
17
-102
/
+239
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-28
3
-5
/
+9
|
\
|
|
|
*
|
Merge branch 'master' of repos.thedevstack.de:conversations-plus
steckbrief
2016-03-28
7
-6
/
+68
|
|
\
\
[next]
