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
/
java
/
eu
/
siacs
/
conversations
/
ui
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-10-20
5
-33
/
+76
|
\
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-05-09
3
-9
/
+10
|
\
|
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-04-23
1
-5
/
+5
|
\
|
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-04-18
2
-4
/
+1
|
\
|
*
|
Merge tag '1.11.7' into trz/merge_1.11.7
lookshe
2016-04-17
5
-11
/
+56
|
\
\
|
*
|
add setting for quick sharing
Daniel Gultsch
2016-04-14
1
-2
/
+25
|
*
|
hacky workaround to determine if uri points to private file on < lolipop
Daniel Gultsch
2016-04-13
1
-2
/
+2
|
*
|
added share uri button to conference details
Daniel Gultsch
2016-04-12
1
-0
/
+17
|
*
|
fixed 'connecting…' button
Daniel Gultsch
2016-04-10
1
-3
/
+6
|
*
|
don't show contact details when in conversations with self
Daniel Gultsch
2016-04-09
2
-1
/
+4
|
*
|
check file owner when attaching files or using them as avatar
Daniel Gultsch
2016-04-07
1
-2
/
+11
|
*
|
prevent null pointer when checking http upload max size
Daniel Gultsch
2016-04-07
1
-6
/
+6
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-04-06
8
-78
/
+57
|
\
\
\
|
|
|
/
|
|
/
|
*
|
|
Merge tag '1.11.3' into trz/rebase
lookshe
2016-04-05
6
-10
/
+43
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
don't ask for resource when server uses http upload v0.1
Daniel Gultsch
2016-04-02
2
-5
/
+4
|
*
|
check max http file size when attaching files
Daniel Gultsch
2016-04-01
3
-6
/
+39
|
*
|
add methods to check max file size for http upload
Daniel Gultsch
2016-03-31
1
-1
/
+1
|
*
|
save otr fingerprint in message
Daniel Gultsch
2016-03-31
2
-3
/
+3
*
|
|
fixed installation error "W/PackageManager: Can't install because provider na...
trz/beta-1
lookshe
2016-04-03
1
-1
/
+1
*
|
|
Merge branch 'trz/rename' into trz/rebase
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
|
\
|
|
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-30
1
-0
/
+2
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-29
1
-20
/
+9
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-29
5
-70
/
+28
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-29
10
-84
/
+52
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-28
1
-1
/
+1
|
\
|
|
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-27
1
-2
/
+23
|
\
|
|
*
|
|
FS#169 - Merge Conversations 1.11.2 into Conversations+ dev
lookshe
2016-03-25
5
-13
/
+31
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
allow to delete attachments. fixes #1539
Daniel Gultsch
2016-03-23
1
-7
/
+25
|
*
|
be less strict when sharing EXTRA_TEXT intents
Daniel Gultsch
2016-03-20
1
-1
/
+1
|
*
|
don't show v\omemo keys as such if not enabled
Daniel Gultsch
2016-03-20
2
-4
/
+5
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-22
1
-25
/
+37
|
\
\
\
|
|
|
/
|
|
/
|
*
|
|
Merge branch 'trz/rebase' into trz/merge_1.11.1
trz/merge_1.11.1
lookshe
2016-03-20
1
-1
/
+1
|
\
\
\
|
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-20
1
-1
/
+1
|
|
\
|
|
*
|
|
|
fixed merge errors
lookshe
2016-03-20
2
-19
/
+25
*
|
|
|
Merge tag '1.11.1' into trz/merge_1.11.1
lookshe
2016-03-17
4
-59
/
+100
|
\
\
\
\
|
|
/
/
/
|
/
|
|
/
|
|
|
/
|
|
/
|
|
*
|
made it possible to share text files
Daniel Gultsch
2016-03-16
1
-7
/
+8
|
*
|
reworked sharewith activity to stay open during sharing
Daniel Gultsch
2016-03-16
2
-30
/
+66
|
*
|
added logging in case fragment wasn't attached
Daniel Gultsch
2016-03-13
1
-0
/
+5
|
*
|
fixed recursive call instead of call to super in PublishProfileActivity
Daniel Gultsch
2016-03-13
1
-5
/
+1
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-15
1
-1
/
+1
|
\
\
\
|
|
|
/
|
|
/
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-12
1
-1
/
+1
|
\
|
|
*
|
|
Added method to get body from message if hasMeCommand and harmonized extracti...
lookshe
2016-03-12
1
-3
/
+3
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-11
3
-77
/
+11
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-11
3
-16
/
+7
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-10
1
-2
/
+1
|
\
|
|
*
|
|
Merge branch 'trz/rename' into trz/rebase
trz/1.11.0.1
lookshe
2016-03-08
1
-17
/
+20
|
\
|
|
*
|
|
Fixes FS#153 - Check if url, phone and email are linkified correctly
lookshe
2016-03-08
1
-6
/
+31
*
|
|
Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquare
trz/merge_1.11.0
steckbrief
2016-03-08
1
-1
/
+1
*
|
|
Merge tag '1.11.0' into trz/merge_1.11.0
lookshe
2016-03-08
13
-200
/
+365
|
\
\
\
|
|
|
/
|
|
/
|
[next]