Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1655 from adithyaphilip/pgp-fix | Daniel Gultsch | 2016-01-16 | 2 | -2/+5 |
|\ | | | | | Fixes having to choose PGP twice, upgrades openpgp-api to 10 | ||||
| * | fixed PGP having to be selected twice | Adithya Abraham Philip | 2016-01-16 | 1 | -1/+4 |
| | | |||||
| * | upgraded to OpenKeychain api v10 | Adithya Abraham Philip | 2016-01-16 | 1 | -1/+1 |
| | | |||||
* | | make ConversationsActivity more resistent against being restarted | Daniel Gultsch | 2016-01-16 | 1 | -3/+9 |
| | | |||||
* | | reuse same xmppconnection for reconnects | Daniel Gultsch | 2016-01-16 | 2 | -9/+17 |
| | | |||||
* | | made constructor private in Account entity | Daniel Gultsch | 2016-01-16 | 1 | -5/+1 |
| | | |||||
* | | removed some unused methods from db backend | Daniel Gultsch | 2016-01-16 | 1 | -83/+0 |
|/ | |||||
* | version bump to 1.9.1 | Daniel Gultsch | 2016-01-15 | 1 | -2/+2 |
| | |||||
* | hide prepare image toasts when attaching multiple images | Daniel Gultsch | 2016-01-15 | 1 | -11/+12 |
| | |||||
* | show toast when image cropper get oom | Daniel Gultsch | 2016-01-15 | 2 | -0/+8 |
| | |||||
* | catch exception when reading message id from database | Daniel Gultsch | 2016-01-15 | 1 | -8/+12 |
| | |||||
* | nimbuzz.com: don't wait for disco replies to set account to online | Daniel Gultsch | 2016-01-15 | 2 | -12/+27 |
| | |||||
* | pulled translations for 1.9.0 release from transifex | Daniel Gultsch | 2016-01-14 | 20 | -26/+169 |
| | |||||
* | version bump to 1.9.0 | Daniel Gultsch | 2016-01-14 | 1 | -2/+2 |
| | |||||
* | fixed typo when reading battery_op setting | Daniel Gultsch | 2016-01-14 | 1 | -1/+1 |
| | |||||
* | show /me messages in conference notifications without the name of the sender | Daniel Gultsch | 2016-01-13 | 1 | -5/+10 |
| | |||||
* | version bump to 1.9.0-beta.3 | Daniel Gultsch | 2016-01-13 | 1 | -2/+2 |
| | |||||
* | show key fetch error in activity when there are no keys to be used | Daniel Gultsch | 2016-01-13 | 2 | -1/+9 |
| | |||||
* | check for file storage permission before selecting avatar | Daniel Gultsch | 2016-01-13 | 3 | -20/+40 |
| | |||||
* | Merge pull request #1649 from dhiru1602/master | Daniel Gultsch | 2016-01-13 | 1 | -0/+3 |
|\ | | | | | use batch transactions when writing roster | ||||
| * | use batch transactions when writing roster | Dheeraj CVR | 2016-01-13 | 1 | -0/+3 |
|/ | | | | Fixes https://github.com/siacs/Conversations/issues/1648 | ||||
* | throw security exception instead of going to next srv entry | Daniel Gultsch | 2016-01-12 | 1 | -1/+3 |
| | |||||
* | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2016-01-12 | 1 | -2/+2 |
|\ | |||||
| * | Merge pull request #1647 from SamWhited/TorStringFix | Daniel Gultsch | 2016-01-12 | 1 | -2/+2 |
| |\ | | | | | | | s/TOR/Tor/g | ||||
| | * | s/TOR/Tor/g | Sam Whited | 2016-01-12 | 1 | -2/+2 |
| |/ | |||||
* / | pulled translations from transifex | Daniel Gultsch | 2016-01-12 | 25 | -75/+117 |
|/ | |||||
* | version bump to 1.9.0-beta.2 | Daniel Gultsch | 2016-01-12 | 2 | -2/+3 |
| | |||||
* | move some ssl socket modifiers into a seperate helper class | Daniel Gultsch | 2016-01-12 | 2 | -56/+67 |
| | |||||
* | Merge branch 'master' of https://github.com/moparisthebest/Conversations ↵ | Daniel Gultsch | 2016-01-12 | 2 | -116/+226 |
|\ | | | | | | | into moparisthebest-master | ||||
| * | Implement XEP-0368: SRV records for XMPP over TLS | moparisthebest | 2016-01-11 | 2 | -104/+220 |
| | | |||||
| * | reworked that loop that iterates over various servers | Daniel Gultsch | 2016-01-11 | 1 | -16/+10 |
| | | |||||
* | | use match_parent as height in conversations overview | Daniel Gultsch | 2016-01-12 | 1 | -2/+2 |
| | | |||||
* | | Revert "Add additional warnings to OMEMO purge key function" | Daniel Gultsch | 2016-01-12 | 2 | -28/+2 |
| | | | | | | | | This reverts commit 3bea5b25cd5496cd3f14a66c208b34d0c8e48b03. | ||||
* | | Add additional warnings to OMEMO purge key function | Andreas Straub | 2016-01-12 | 2 | -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 renders | Daniel Gultsch | 2016-01-11 | 25 | -0/+0 |
| | |||||
* | Merge branch 'logo_fixes' of https://github.com/fiaxh/Conversations into ↵ | Daniel Gultsch | 2016-01-11 | 1 | -338/+361 |
|\ | | | | | | | logo_fixes | ||||
| * | Cleaned up logo | fiaxh | 2016-01-11 | 1 | -327/+364 |
| | | |||||
* | | don't use the word phone in strings | Daniel Gultsch | 2016-01-11 | 1 | -6/+5 |
| | | |||||
* | | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2016-01-11 | 1 | -19/+33 |
|\ \ | |||||
| * | | Clean up Conversations logo SVG | Andreas Straub | 2016-01-10 | 1 | -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 transifex | Daniel Gultsch | 2016-01-11 | 25 | -63/+14 |
| | | |||||
* | | add changelog for 1.9.0 | Daniel Gultsch | 2016-01-11 | 1 | -1/+6 |
| | | |||||
* | | ask to be excluded from battery optimization | Daniel Gultsch | 2016-01-11 | 7 | -242/+361 |
|/ | |||||
* | bump version code for beta | Daniel Gultsch | 2016-01-09 | 1 | -2/+2 |
| | |||||
* | let the user decide on whether or not to compress pictures | Daniel Gultsch | 2016-01-09 | 4 | -13/+41 |
| | |||||
* | automatically adjust image compression to keep files under 512MiB | Daniel Gultsch | 2016-01-09 | 2 | -8/+15 |
| | |||||
* | added Config.java variable to change the default notification behaviour to ↵ | Daniel Gultsch | 2016-01-08 | 2 | -1/+3 |
| | | | | always | ||||
* | don't show snackbar when notifications are disabled or paused | Daniel Gultsch | 2016-01-08 | 2 | -11/+0 |
| | |||||
* | show per conference notification settings in details activity | Daniel Gultsch | 2016-01-08 | 12 | -17/+114 |
| | |||||
* | show icon in conversations overview when notifications are disabled | Daniel Gultsch | 2016-01-08 | 17 | -76/+109 |
| |