aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* add option to only allow one account and set it to trueChristian S2016-04-042-5/+4
* Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-0317-54/+184
|\
| * don't ask for resource when server uses http upload v0.1Daniel Gultsch2016-04-023-6/+8
| * check max http file size when attaching filesDaniel Gultsch2016-04-016-12/+83
| * add methods to check max file size for http uploadDaniel Gultsch2016-03-315-12/+41
| * save otr fingerprint in messageDaniel Gultsch2016-03-316-12/+15
| * include form fields into caps hash calculationDaniel Gultsch2016-03-312-6/+25
| * closed some cursors under error conditionsDaniel Gultsch2016-03-311-3/+13
| * made setting aes keys in DownloadableFile more readableDaniel Gultsch2016-03-311-12/+8
| * 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
|\|
| * 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
| * Check if path for URI is accessiblefiaxh2016-03-151-1/+10
| * 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 tarun01...Daniel Gultsch2016-03-041-0/+10
| |\
| | * Fix Issue #1634 : Shows XMPP URI as links.Tarun2016-02-291-0/+10
| * | 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
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 03:39:13 +0000