aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Update ShortcutBadger to version 1.1.4Christian S2016-03-271-2/+2
| |
* | fixed crashes during updates on Android 6Christian S2016-03-302-35/+57
| |
* | fixed bug in ShortcutBadgerChristian S2016-03-271-2/+2
| |
* | Merge remote-tracking branch 'refs/remotes/origin/patch-2' into developmentChristian S2016-03-271-2/+2
|\ \
| * | Update ShortcutBadger to version 1.1.4Christian S2016-03-271-2/+2
| |/
* | Merge branch 'siacs/master' into developmentChristian S2016-03-268-39/+63
|\|
| * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-236-30/+41
| |
| * only add image files to media scannerDaniel Gultsch2016-03-236-13/+26
| |
| * Typo `attempt`licaon-kter2016-03-221-1/+1
| |
* | Merge pull request #80 from siacs/masterChristian S2016-03-206-12/+19
|\| | | | | copy commits
| * show room nick for /me command in sent muc messages. fixes #1773Daniel Gultsch2016-03-201-4/+5
| |
| * be less strict when sharing EXTRA_TEXT intentsDaniel Gultsch2016-03-201-1/+1
| |
| * be more careful to avoid creating multiple connectionsDaniel Gultsch2016-03-202-3/+8
| |
| * don't show v\omemo keys as such if not enabledDaniel Gultsch2016-03-202-4/+5
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-03-176-54/+92
|\|
| * made it possible to share text filesDaniel Gultsch2016-03-161-7/+8
| |
| * reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-162-30/+66
| | | | | | | | closing the activity prematuraly caused uri permissions to be revoked
| * Check if path for URI is accessiblefiaxh2016-03-151-1/+10
| | | | | | | | | | The path extracted from the Cursor might not be accessible for Conversations. FileUtils accesses URI information through the ContentProvider, so this wouldn't be noticed. Fixes sharing from open-keychain's TemporaryContentProvider
| * simplified getUsers(max) codeDaniel Gultsch2016-03-131-11/+2
| |
| * added logging in case fragment wasn't attachedDaniel Gultsch2016-03-131-0/+5
| |
| * fixed recursive call instead of call to super in PublishProfileActivityDaniel Gultsch2016-03-131-5/+1
| |
* | remove old codeChristian S2016-03-131-10/+0
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-03-136-8/+36
|\|
| * log reason for bind failureDaniel Gultsch2016-03-111-2/+2
| |
| * close cursor in caps db queryDaniel Gultsch2016-03-111-1/+3
| |
| * don't show opt-out of battery optimization dialog when push is enabledDaniel Gultsch2016-03-063-4/+17
| |
| * warn in conversations when account is disabledDaniel Gultsch2016-03-061-1/+14
| |
* | only resend files smaller than 1 MiB automaticallyChristian S2016-03-052-2/+4
| |
* | resend failed filetransfers automaticallyChristian S2016-03-051-2/+6
| |
* | show always buttons instead of links for filesChristian S2016-03-051-1/+2
| |
* | reformated codeChristian S2016-03-051-64/+64
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-03-0510-96/+165
|\|
| * Merge branch 'Mess' of https://github.com/tarun018/Conversations into ↵Daniel Gultsch2016-03-041-0/+10
| |\ | | | | | | | | | tarun018-Mess
| | * Fix Issue #1634 : Shows XMPP URI as links.Tarun2016-02-291-0/+10
| | | | | | | | | | | | Shows XMPP URI as links, other than Web URL's and Email Addresses. Also performs respective actions on clicking XMPP URI.
| * | show host in file size checkerDaniel Gultsch2016-03-041-1/+14
| | |
| * | mark oob messages and always display download buttonDaniel Gultsch2016-03-044-6/+30
| | |
| * | don't automatically crop avatarDaniel Gultsch2016-03-041-22/+40
| | |
| * | add a few more know file extensionsDaniel Gultsch2016-03-044-10/+13
| | |
| * | allow to copy original url even while downloading. fixes #1743Daniel Gultsch2016-03-041-6/+9
| | |
* | | allow users to edit settings and accountsChristian S2016-03-041-2/+2
| | |
* | | Merge branch 'siacs/master' into developmentChristian S2016-03-0422-214/+490
|\| |
| * | moved avatarfetcher reset code to bindDaniel Gultsch2016-03-031-8/+8
| | |
| * | avoid unnecessary disconnect. prevent NetworkOnMainThreadExceptionDaniel Gultsch2016-03-031-3/+3
| | |
| * | don't break with srcoll events on empty message listsDaniel Gultsch2016-03-031-2/+7
| | |
| * | expert option to treat vibrate as silent mode for XA. fixes #1530Daniel Gultsch2016-03-012-7/+18
| | |
| * | removed unused config variableDaniel Gultsch2016-03-011-4/+0
| | |
| * | properly persist accepted crypto targetsDaniel Gultsch2016-03-011-5/+1
| | |
| * | let users confirm each member in a conference even if that contact is ↵Daniel Gultsch2016-03-014-26/+102
| | | | | | | | | | | | already trusted
| * | use correct jid when leaving a conference. fixes #1732Daniel Gultsch2016-02-292-6/+6
| | |
| * | refactored omemo to take multiple recipientsDaniel Gultsch2016-02-2910-147/+286
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 22:33:19 +0000