aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1655 from adithyaphilip/pgp-fixDaniel Gultsch2016-01-161-1/+4
|\
| * fixed PGP having to be selected twiceAdithya Abraham Philip2016-01-161-1/+4
* | make ConversationsActivity more resistent against being restartedDaniel Gultsch2016-01-161-3/+9
* | reuse same xmppconnection for reconnectsDaniel Gultsch2016-01-162-9/+17
* | made constructor private in Account entityDaniel Gultsch2016-01-161-5/+1
* | removed some unused methods from db backendDaniel Gultsch2016-01-161-83/+0
|/
* hide prepare image toasts when attaching multiple imagesDaniel Gultsch2016-01-151-11/+12
* show toast when image cropper get oomDaniel Gultsch2016-01-152-0/+8
* catch exception when reading message id from databaseDaniel Gultsch2016-01-151-8/+12
* nimbuzz.com: don't wait for disco replies to set account to onlineDaniel Gultsch2016-01-152-12/+27
* pulled translations for 1.9.0 release from transifexDaniel Gultsch2016-01-1420-26/+169
* fixed typo when reading battery_op settingDaniel Gultsch2016-01-141-1/+1
* show /me messages in conference notifications without the name of the senderDaniel Gultsch2016-01-131-5/+10
* show key fetch error in activity when there are no keys to be usedDaniel Gultsch2016-01-132-1/+9
* check for file storage permission before selecting avatarDaniel Gultsch2016-01-133-20/+40
* use batch transactions when writing rosterDheeraj CVR2016-01-131-0/+3
* throw security exception instead of going to next srv entryDaniel Gultsch2016-01-121-1/+3
* Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-01-121-2/+2
|\
| * s/TOR/Tor/gSam Whited2016-01-121-2/+2
* | pulled translations from transifexDaniel Gultsch2016-01-1225-75/+117
|/
* move some ssl socket modifiers into a seperate helper classDaniel Gultsch2016-01-122-56/+67
* Merge branch 'master' of https://github.com/moparisthebest/Conversations into...Daniel Gultsch2016-01-122-116/+226
|\
| * Implement XEP-0368: SRV records for XMPP over TLSmoparisthebest2016-01-112-104/+220
| * reworked that loop that iterates over various serversDaniel Gultsch2016-01-111-16/+10
* | use match_parent as height in conversations overviewDaniel Gultsch2016-01-121-2/+2
* | Revert "Add additional warnings to OMEMO purge key function"Daniel Gultsch2016-01-122-28/+2
* | Add additional warnings to OMEMO purge key functionAndreas Straub2016-01-122-2/+28
|/
* new art rendersDaniel Gultsch2016-01-1125-0/+0
* don't use the word phone in stringsDaniel Gultsch2016-01-111-6/+5
* pulled translations from transifexDaniel Gultsch2016-01-1125-63/+14
* ask to be excluded from battery optimizationDaniel Gultsch2016-01-117-242/+361
* let the user decide on whether or not to compress picturesDaniel Gultsch2016-01-094-13/+41
* automatically adjust image compression to keep files under 512MiBDaniel Gultsch2016-01-092-8/+15
* added Config.java variable to change the default notification behaviour to al...Daniel Gultsch2016-01-082-1/+3
* don't show snackbar when notifications are disabled or pausedDaniel Gultsch2016-01-082-11/+0
* show per conference notification settings in details activityDaniel Gultsch2016-01-0812-17/+114
* show icon in conversations overview when notifications are disabledDaniel Gultsch2016-01-0817-76/+109
* Merge pull request #1641 from fiaxh/uuid-fixDaniel Gultsch2016-01-081-1/+1
|\
| * Correct uuid check according to RFC 4122fiaxh2016-01-051-1/+1
* | avoid duplicate messages when sending files to mucs. fixes #1635Daniel Gultsch2016-01-061-2/+10
* | added missing synchronize when pushing messages from mam backlogDaniel Gultsch2016-01-041-1/+3
* | null check in getOriginalPathDaniel Gultsch2016-01-042-1/+3
|/
* Allow entering a JID from 'choose contact'. thanks @singpolymaDaniel Gultsch2016-01-047-63/+230
* only report error after third unsuccesful attempt to connectDaniel Gultsch2016-01-041-1/+1
* properly rotate avatarsDaniel Gultsch2016-01-044-52/+48
* show trust keys activties if own keys are undecidedDaniel Gultsch2016-01-041-4/+5
* add obb url to unencrypted messagesDaniel Gultsch2016-01-031-0/+1
* edit account activity was still showing the omemo key with leading 0x05. fixe...Daniel Gultsch2016-01-031-2/+2
* removed xhtml body. fixes #1594Daniel Gultsch2016-01-011-12/+0
* use actual message timestamp instead of delay when updating last seen. fixes ...Daniel Gultsch2015-12-312-7/+8