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
*
spelling fixes
klemens
2016-05-04
6
-9
/
+9
|
*
Merge pull request #1826 from sebastianv89/patch-1
Daniel Gultsch
2016-05-04
1
-6
/
+6
|
\
|
|
|
|
Renaming of variable
|
*
Renaming of variable
Sebastian
2016-05-03
1
-6
/
+6
|
/
|
|
Was probably just a copy/paste typo.
*
Merge branch 'master' of github.com:siacs/Conversations
Daniel Gultsch
2016-05-03
1
-1
/
+1
|
\
|
*
fixed spelling in readme
Daniel Gultsch
2016-05-03
1
-1
/
+1
|
|
*
|
fixed presence template dedup for 'online' status
Daniel Gultsch
2016-05-03
1
-1
/
+2
|
|
*
|
use app name in resource suggestions
Daniel Gultsch
2016-05-03
1
-1
/
+1
|
/
*
update 'create account' faq entry
Daniel Gultsch
2016-05-02
1
-8
/
+1
|
*
ping all accounts at the same time
Daniel Gultsch
2016-05-02
1
-5
/
+17
|
*
version bump to 1.12.0 + changelog
1.12.0
Daniel Gultsch
2016-05-02
2
-2
/
+6
|
*
pulled translations from transifex
Daniel Gultsch
2016-05-02
15
-41
/
+353
|
*
show only username when registering account with magic create
Daniel Gultsch
2016-05-02
2
-13
/
+22
|
*
removed unnecessary logging
Daniel Gultsch
2016-04-30
1
-1
/
+0
|
*
properly cancel avatar tasks
Daniel Gultsch
2016-04-29
3
-5
/
+8
|
*
catch ActivityNotFoundException when requesting battery op
Daniel Gultsch
2016-04-29
3
-2
/
+13
|
*
port all android drop down list items to our own
Daniel Gultsch
2016-04-29
3
-10
/
+9
|
*
catch rare NPE when determining max http size
Daniel Gultsch
2016-04-29
1
-3
/
+3
|
*
synchronize around thumbnail cache to avoid loading images twice
Daniel Gultsch
2016-04-28
1
-12
/
+21
|
*
cancel potential tasks when receiving image preview from cache
Daniel Gultsch
2016-04-28
1
-3
/
+7
|
*
cleaned up captcha dialog
Daniel Gultsch
2016-04-28
3
-53
/
+69
|
*
don't request disco from self
Daniel Gultsch
2016-04-28
2
-3
/
+1
|
*
removed unused config variables
Daniel Gultsch
2016-04-27
10
-64
/
+14
|
*
made it possible to go back to welcome screen from edit account
Daniel Gultsch
2016-04-27
2
-4
/
+7
|
*
renamed welcome header to untranslatable 'Start your Conversations'
Daniel Gultsch
2016-04-27
1
-1
/
+1
|
*
prevent user from accidentally changing password after using magic create
Daniel Gultsch
2016-04-26
7
-23
/
+84
|
*
fixed table creation
Daniel Gultsch
2016-04-25
1
-10
/
+14
|
*
Merge pull request #1821 from kriztan/patch-1
Daniel Gultsch
2016-04-24
1
-10
/
+0
|
\
|
|
|
|
Update build.gradle
|
*
Update build.gradle
Christian S
2016-04-23
1
-10
/
+0
|
|
|
|
|
|
this seems be be never used and could be removed
*
|
don't create templates for empty status messages
Daniel Gultsch
2016-04-23
1
-2
/
+6
|
|
*
|
add change prescence to manage account context menu
Daniel Gultsch
2016-04-23
3
-3
/
+16
|
|
*
|
show status messages in contact details
Daniel Gultsch
2016-04-23
3
-17
/
+56
|
|
*
|
expert setting to manually change presence
Daniel Gultsch
2016-04-22
40
-79
/
+683
|
/
*
put welcome screen in scrollview
Daniel Gultsch
2016-04-22
1
-62
/
+67
|
*
added magic create welcome screen
Daniel Gultsch
2016-04-19
16
-7
/
+349
|
*
version bump to 1.11.7 + changelog
1.11.7
Daniel Gultsch
2016-04-14
2
-2
/
+7
|
*
always notify by default in conferences
Daniel Gultsch
2016-04-14
2
-3
/
+1
|
*
removed unnecessary call to stopSelf() after logging out
Daniel Gultsch
2016-04-14
1
-5
/
+11
|
*
add setting for quick sharing
Daniel Gultsch
2016-04-14
3
-17
/
+51
|
*
removed unused call to cancel events
Daniel Gultsch
2016-04-14
1
-1
/
+0
|
*
create Config varibale to show the disable foreground service button
Daniel Gultsch
2016-04-13
2
-3
/
+6
|
*
hacky workaround to determine if uri points to private file on < lolipop
Daniel Gultsch
2016-04-13
3
-9
/
+25
|
*
return own jid as true counterpart on self messages in muc
Daniel Gultsch
2016-04-13
1
-0
/
+3
|
*
added share uri button to conference details
Daniel Gultsch
2016-04-12
15
-14
/
+43
|
*
reverse order in contact chooser
Daniel Gultsch
2016-04-12
1
-1
/
+1
|
*
minor code cleanup
Daniel Gultsch
2016-04-12
1
-3
/
+1
|
*
republish avatar if server offers non-persistent pep :-(
Daniel Gultsch
2016-04-11
4
-37
/
+144
|
*
version bump to 1.11.6 + changelog
1.11.6
Daniel Gultsch
2016-04-10
2
-2
/
+6
|
*
pulled translations from transifex
Daniel Gultsch
2016-04-10
29
-86
/
+27
|
*
add entries to gitignore
Daniel Gultsch
2016-04-10
1
-0
/
+2
|
*
don't throw IO exception at end of stream
Daniel Gultsch
2016-04-10
1
-1
/
+0
|
[next]