aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1655 from adithyaphilip/pgp-fixDaniel Gultsch2016-01-162-2/+5
|\ | | | | Fixes having to choose PGP twice, upgrades openpgp-api to 10
| * fixed PGP having to be selected twiceAdithya Abraham Philip2016-01-161-1/+4
| |
| * upgraded to OpenKeychain api v10Adithya Abraham Philip2016-01-161-1/+1
| |
* | 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
|/
* version bump to 1.9.1Daniel Gultsch2016-01-151-2/+2
|
* 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
|
* version bump to 1.9.0Daniel Gultsch2016-01-141-2/+2
|
* 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
|
* version bump to 1.9.0-beta.3Daniel Gultsch2016-01-131-2/+2
|
* 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
|
* Merge pull request #1649 from dhiru1602/masterDaniel Gultsch2016-01-131-0/+3
|\ | | | | use batch transactions when writing roster
| * use batch transactions when writing rosterDheeraj CVR2016-01-131-0/+3
|/ | | | Fixes https://github.com/siacs/Conversations/issues/1648
* 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
|\
| * Merge pull request #1647 from SamWhited/TorStringFixDaniel Gultsch2016-01-121-2/+2
| |\ | | | | | | s/TOR/Tor/g
| | * s/TOR/Tor/gSam Whited2016-01-121-2/+2
| |/
* / pulled translations from transifexDaniel Gultsch2016-01-1225-75/+117
|/
* version bump to 1.9.0-beta.2Daniel Gultsch2016-01-122-2/+3
|
* move some ssl socket modifiers into a seperate helper classDaniel Gultsch2016-01-122-56/+67
|
* Merge branch 'master' of https://github.com/moparisthebest/Conversations ↵Daniel Gultsch2016-01-122-116/+226
|\ | | | | | | into moparisthebest-master
| * 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
| | | | | | | | This reverts commit 3bea5b25cd5496cd3f14a66c208b34d0c8e48b03.
* | Add additional warnings to OMEMO purge key functionAndreas Straub2016-01-122-2/+28
|/ | | | | | People continue to press the "don't press this" button. Maybe adding some warnings indicating that this button will not fix their problems will help...
* new art rendersDaniel Gultsch2016-01-1125-0/+0
|
* Merge branch 'logo_fixes' of https://github.com/fiaxh/Conversations into ↵Daniel Gultsch2016-01-111-338/+361
|\ | | | | | | logo_fixes
| * Cleaned up logofiaxh2016-01-111-327/+364
| |
* | don't use the word phone in stringsDaniel Gultsch2016-01-111-6/+5
| |
* | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-01-111-19/+33
|\ \
| * | Clean up Conversations logo SVGAndreas Straub2016-01-101-19/+33
| |/ | | | | | | | | | | | | | | | | The previous version of the logo had some wonky alignments and other artifacts in some places on the dashed line. This commit provides a new version of the logo with perfect alignments. It also includes a single path for the dashed line, which can be used to ease further modifications to the logo.
* | pulled translations from transifexDaniel Gultsch2016-01-1125-63/+14
| |
* | add changelog for 1.9.0Daniel Gultsch2016-01-111-1/+6
| |
* | ask to be excluded from battery optimizationDaniel Gultsch2016-01-117-242/+361
|/
* bump version code for betaDaniel Gultsch2016-01-091-2/+2
|
* 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 ↵Daniel Gultsch2016-01-082-1/+3
| | | | always
* 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
|