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 (
Collapse
)
Author
Age
Files
Lines
*
Introduction of a TextViewUtil to easily set attributes for TextViews
steckbrief
2016-03-29
6
-69
/
+99
|
*
Implements FS#173: Move access to colors to separate helper class
steckbrief
2016-03-29
17
-102
/
+239
|
*
Merge branch 'master' of repos.thedevstack.de:conversations-plus
steckbrief
2016-03-28
7
-6
/
+68
|
\
|
*
adjusted changelog and corrected wrong version in build.gradle due to merge
lookshe
2016-03-27
2
-3
/
+11
|
|
|
*
Fixes FS#166 - Images cannot be opened since storing in private image folder
lookshe
2016-03-27
5
-3
/
+57
|
|
*
|
Fixes FS#170: Message Details: Status display has different Text color
steckbrief
2016-03-28
2
-4
/
+2
|
|
*
|
Implements FS#176: error logging for httpupload improved
steckbrief
2016-03-28
1
-1
/
+7
|
/
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-25
18
-42
/
+96
|
\
|
*
FS#169 - Merge Conversations 1.11.2 into Conversations+ dev
lookshe
2016-03-25
18
-42
/
+95
|
|
\
|
|
*
version bump to 1.11.2 and changelog
1.11.2
Daniel Gultsch
2016-03-23
2
-2
/
+7
|
|
|
|
|
*
allow to delete attachments. fixes #1539
Daniel Gultsch
2016-03-23
8
-31
/
+46
|
|
|
|
|
*
only add image files to media scanner
Daniel Gultsch
2016-03-23
6
-13
/
+26
|
|
|
|
|
*
update build deps
Daniel Gultsch
2016-03-23
1
-2
/
+2
|
|
|
|
|
*
Merge pull request #1780 from licaon-kter/patch-1
Daniel Gultsch
2016-03-22
1
-1
/
+1
|
|
|
\
|
|
|
|
|
|
|
|
Typo `attempt`
|
|
|
*
Typo `attempt`
licaon-kter
2016-03-22
1
-1
/
+1
|
|
|
/
|
|
*
show room nick for /me command in sent muc messages. fixes #1773
Daniel Gultsch
2016-03-20
1
-4
/
+5
|
|
|
|
|
*
be less strict when sharing EXTRA_TEXT intents
Daniel Gultsch
2016-03-20
1
-1
/
+1
|
|
|
|
|
*
be more careful to avoid creating multiple connections
Daniel Gultsch
2016-03-20
2
-3
/
+8
|
|
|
|
|
*
don't show v\omemo keys as such if not enabled
Daniel Gultsch
2016-03-20
2
-4
/
+5
|
|
|
*
|
|
Merge branch 'trz/rebase' (early part) into trz/rename
lookshe
2016-03-25
0
-0
/
+0
|
\
|
|
|
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-23
1
-0
/
+0
|
|
\
\
|
|
/
/
|
/
|
|
*
|
|
deleted unused library (FS#51)
lookshe
2016-03-23
1
-0
/
+0
|
|
|
|
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-23
32
-317
/
+450
|
|
\
\
|
|
/
/
|
/
|
|
*
|
|
pulled from transifex
lookshe
2016-03-23
32
-317
/
+450
|
|
|
|
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-22
2
-26
/
+42
|
|
\
\
|
|
/
/
|
/
|
|
*
|
|
Correct notifications to user if swiping with disabled or not connected ↵
lookshe
2016-03-22
1
-25
/
+37
|
|
|
|
|
|
|
|
|
|
|
|
account (FS#159)
*
|
|
Fixes FS#87 - Crash on load messages after delete account
lookshe
2016-03-22
1
-1
/
+5
|
|
|
|
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-21
1
-4
/
+19
|
|
\
\
|
|
/
/
|
/
|
|
*
|
|
One more fix in Message.equals() (FS#104)
lookshe
2016-03-21
1
-4
/
+19
|
|
|
|
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-20
1
-1
/
+2
|
|
\
\
|
|
/
/
|
/
|
|
*
|
|
changed configuration to conversations+ project (FS#32)
lookshe
2016-03-20
1
-1
/
+2
|
|
|
|
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-20
1
-1
/
+1
|
|
\
\
|
|
/
/
|
/
|
|
*
|
|
Show file name instead of mime type (FS#102)
lookshe
2016-03-20
1
-1
/
+1
|
|
|
|
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-20
1
-18
/
+14
|
|
\
\
|
|
/
/
|
/
|
|
*
|
|
FS#104 - Fix Message.equals()
lookshe
2016-03-20
1
-18
/
+14
|
|
|
|
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-20
7
-4
/
+15
|
|
\
\
|
|
/
/
|
/
|
|
*
|
|
Fixes FS#143 - Displaying of emoticons too large
lookshe
2016-03-20
7
-4
/
+15
|
|
|
|
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-20
1
-59
/
+83
|
|
\
\
|
|
/
/
|
/
|
|
*
|
|
Fixes FS#168 - Not possible to share more than one picture at once
lookshe
2016-03-20
1
-59
/
+83
|
|
|
|
*
|
Merge branch 'trz/rename' (early part) into trz/rebase
lookshe
2016-03-20
0
-0
/
+0
|
|
\
\
|
|
/
/
|
/
|
|
*
|
|
fixed merge error
lookshe
2016-03-20
1
-1
/
+1
|
|
|
*
|
|
Merge branch 'trz/rebase' (early part) into trz/rename
lookshe
2016-03-20
3
-19
/
+27
|
\
\
\
*
\
\
\
Merge branch 'trz/rebase' (early part) into trz/rename
lookshe
2016-03-20
16
-181
/
+558
|
\
\
\
\
*
\
\
\
\
Merge branch 'trz/rebase' (early part) into trz/rename
lookshe
2016-03-20
0
-0
/
+0
|
\
\
\
\
\
|
|
|
|
*
|
Merge branch 'trz/rebase' into trz/merge_1.11.1
trz/merge_1.11.1
lookshe
2016-03-20
7
-38
/
+96
|
|
|
|
/
|
|
|
|
|
|
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-20
7
-38
/
+96
|
|
|
_
|
/
|
|
|
|
/
|
|
/
/
|
|
|
/
|
|
|
|
/
|
|
|
|
/
|
|
|
|
*
|
|
|
|
Fixes FS#167: Resized images are larger than original images
steckbrief
2016-03-18
1
-2
/
+2
|
|
|
|
|
*
|
|
|
|
Merge branch 'master' of git.fucktheforce.de:conversations-plus
steckbrief
2016-03-18
7
-39
/
+96
|
\
\
\
\
\
|
*
|
|
|
|
Fixes FS#164
lookshe
2016-03-18
1
-8
/
+0
|
|
|
|
|
|
|
*
|
|
|
|
Fixes FS#156 and FS#135 (occured again)
lookshe
2016-03-17
1
-4
/
+10
|
|
|
|
|
|
[next]
