aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/persistance (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-232-2/+102
|\
* \ Merge tag '1.11.3' into trz/rebaselookshe2016-04-051-3/+13
|\ \
| * | don't ask for resource when server uses http upload v0.1Daniel Gultsch2016-04-021-1/+4
| * | check max http file size when attaching filesDaniel Gultsch2016-04-011-0/+22
| * | closed some cursors under error conditionsDaniel Gultsch2016-03-311-3/+13
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-271-1/+1
|\ \ \ | | |/ | |/|
* | | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-0/+31
|\ \ \ | | |/ | |/|
| * | allow to delete attachments. fixes #1539Daniel Gultsch2016-03-231-3/+11
| * | only add image files to media scannerDaniel Gultsch2016-03-231-0/+22
* | | Merge branch 'trz/rebase' into trz/merge_1.11.1lookshe2016-03-201-2/+2
|\ \ \
| * \ \ Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-2/+2
| |\ \ \ | | | |/ | | |/|
* | | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-171-1/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | close cursor in caps db queryDaniel Gultsch2016-03-111-1/+3
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-1/+6
|\| |
| * | mark oob messages and always display download buttonDaniel Gultsch2016-03-041-1/+6
* | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-5/+5
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-1/+13
|\| |
| * | basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-1/+13
* | | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-161-1/+40
|\| |
| * | Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into...Daniel Gultsch2016-02-021-1/+40
| |\ \
| | * | Persisitence and loading for ServiceDiscoveryResultStephen Paul Weber2016-01-231-1/+40
* | | | Imports organizedsteckbrief2016-02-122-8/+0
* | | | database error while upgrading from db version 14 fixedsteckbrief2016-02-121-1/+1
* | | | Compilation errors and merge mixups fixedsteckbrief2016-02-111-144/+33
* | | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-112-149/+852
|\| | |
| * | | changed FileBackend API to allow files instead of messages to be copied and r...Daniel Gultsch2016-01-241-33/+34
| |/ /
| * | removed some unused methods from db backendDaniel Gultsch2016-01-161-83/+0
| * | catch exception when reading message id from databaseDaniel Gultsch2016-01-151-8/+12
| * | use batch transactions when writing rosterDheeraj CVR2016-01-131-0/+3
| * | automatically adjust image compression to keep files under 512MiBDaniel Gultsch2016-01-091-8/+14
| * | null check in getOriginalPathDaniel Gultsch2016-01-041-1/+0
| * | properly rotate avatarsDaniel Gultsch2016-01-041-15/+7
| * | show certificate informationDaniel Gultsch2015-12-231-5/+34
| * | save certificate when verifying with x509Daniel Gultsch2015-12-231-2/+29
| * | get rid of lastMessageTransmitted in favor of db queryDaniel Gultsch2015-12-111-0/+14
| * | ask for contact permissions when first opening StartConversationActivityDaniel Gultsch2015-12-071-2/+6
| * | Unset all PGP signatures oncefiaxh2015-12-021-1/+10
| * | fixed avatar loading for non-file urisDaniel Gultsch2015-12-021-2/+2
| * | users are now able to crop their avatar pictures using the android-cropPhilip Flohr2015-12-021-2/+2
| * | initial tor supportDaniel Gultsch2015-12-011-109/+113
| * | changed method signature of calcSampleSizeDaniel Gultsch2015-11-301-1/+1
| * | pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-10/+14
| * | Move migration 19 before 17Andreas Straub2015-11-061-3/+6
| * | explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-311-2/+3
| * | push CN into nick pep node when uploading certificate. subscribe to nick nodeDaniel Gultsch2015-10-291-1/+5
| * | make unread status and notifications presistent across restartsDaniel Gultsch2015-10-141-1/+5
| * | changed store path for filesDaniel Gultsch2015-10-061-20/+10
| * | properly recycle bitmapsDaniel Gultsch2015-10-021-4/+16
| * | rotate thumbnails. fixes #1438Daniel Gultsch2015-09-291-6/+15
| * | Iterator to go through all messages of a conversationfiaxh2015-09-201-0/+38