Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1780 from licaon-kter/patch-1 | Daniel Gultsch | 2016-03-22 | 1 | -1/+1 |
|\ | | | | | Typo `attempt` | ||||
| * | Typo `attempt` | licaon-kter | 2016-03-22 | 1 | -1/+1 |
|/ | |||||
* | show room nick for /me command in sent muc messages. fixes #1773 | Daniel Gultsch | 2016-03-20 | 1 | -4/+5 |
| | |||||
* | be less strict when sharing EXTRA_TEXT intents | Daniel Gultsch | 2016-03-20 | 1 | -1/+1 |
| | |||||
* | be more careful to avoid creating multiple connections | Daniel Gultsch | 2016-03-20 | 2 | -3/+8 |
| | |||||
* | don't show v\omemo keys as such if not enabled | Daniel Gultsch | 2016-03-20 | 2 | -4/+5 |
| | |||||
* | version bump to 1.11.1 and changelog1.11.1 | Daniel Gultsch | 2016-03-16 | 2 | -2/+5 |
| | |||||
* | made it possible to share text files | Daniel Gultsch | 2016-03-16 | 1 | -7/+8 |
| | |||||
* | reworked sharewith activity to stay open during sharing | Daniel Gultsch | 2016-03-16 | 3 | -30/+69 |
| | | | | closing the activity prematuraly caused uri permissions to be revoked | ||||
* | Merge pull request #1767 from fiaxh/path_file_accessible | Daniel Gultsch | 2016-03-16 | 1 | -1/+10 |
|\ | | | | | Check if path for URI is accessible | ||||
| * | Check if path for URI is accessible | fiaxh | 2016-03-15 | 1 | -1/+10 |
|/ | | | | | The path extracted from the Cursor might not be accessible for Conversations. FileUtils accesses URI information through the ContentProvider, so this wouldn't be noticed. Fixes sharing from open-keychain's TemporaryContentProvider | ||||
* | removed requirement of external component for http upload | Daniel Gultsch | 2016-03-14 | 1 | -3/+2 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2016-03-13 | 5 | -106/+443 |
| | |||||
* | simplified getUsers(max) code | Daniel Gultsch | 2016-03-13 | 1 | -11/+2 |
| | |||||
* | added logging in case fragment wasn't attached | Daniel Gultsch | 2016-03-13 | 1 | -0/+5 |
| | |||||
* | fixed recursive call instead of call to super in PublishProfileActivity | Daniel Gultsch | 2016-03-13 | 1 | -5/+1 |
| | |||||
* | log reason for bind failure | Daniel Gultsch | 2016-03-11 | 1 | -2/+2 |
| | |||||
* | close cursor in caps db query | Daniel Gultsch | 2016-03-11 | 1 | -1/+3 |
| | |||||
* | mention mod_smacks_offline and ejabberds settings in readme | Daniel Gultsch | 2016-03-10 | 1 | -0/+6 |
| | |||||
* | version bump to 1.11.01.11.0 | Daniel Gultsch | 2016-03-07 | 1 | -2/+2 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2016-03-06 | 28 | -82/+272 |
| | |||||
* | don't show opt-out of battery optimization dialog when push is enabled | Daniel Gultsch | 2016-03-06 | 3 | -4/+17 |
| | |||||
* | warn in conversations when account is disabled | Daniel Gultsch | 2016-03-06 | 2 | -1/+15 |
| | |||||
* | version bump to 1.11.0-beta.3 | Daniel Gultsch | 2016-03-05 | 1 | -2/+2 |
| | |||||
* | Merge branch 'Mess' of https://github.com/tarun018/Conversations into ↵ | Daniel Gultsch | 2016-03-04 | 1 | -0/+10 |
|\ | | | | | | | tarun018-Mess | ||||
| * | Fix Issue #1634 : Shows XMPP URI as links. | Tarun | 2016-02-29 | 1 | -0/+10 |
| | | | | | | | | Shows XMPP URI as links, other than Web URL's and Email Addresses. Also performs respective actions on clicking XMPP URI. | ||||
* | | show host in file size checker | Daniel Gultsch | 2016-03-04 | 2 | -1/+15 |
| | | |||||
* | | mark oob messages and always display download button | Daniel Gultsch | 2016-03-04 | 4 | -6/+30 |
| | | |||||
* | | don't automatically crop avatar | Daniel Gultsch | 2016-03-04 | 8 | -22/+49 |
| | | |||||
* | | add a few more know file extensions | Daniel Gultsch | 2016-03-04 | 4 | -10/+13 |
| | | |||||
* | | allow to copy original url even while downloading. fixes #1743 | Daniel Gultsch | 2016-03-04 | 1 | -6/+9 |
| | | |||||
* | | version bump to 1.11.0-beta.2 | Daniel Gultsch | 2016-03-03 | 1 | -2/+2 |
| | | |||||
* | | moved avatarfetcher reset code to bind | Daniel Gultsch | 2016-03-03 | 1 | -8/+8 |
| | | |||||
* | | avoid unnecessary disconnect. prevent NetworkOnMainThreadException | Daniel Gultsch | 2016-03-03 | 1 | -3/+3 |
| | | |||||
* | | don't break with srcoll events on empty message lists | Daniel Gultsch | 2016-03-03 | 1 | -2/+7 |
| | | |||||
* | | expert option to treat vibrate as silent mode for XA. fixes #1530 | Daniel Gultsch | 2016-03-01 | 4 | -7/+26 |
| | | |||||
* | | removed unused config variable | Daniel Gultsch | 2016-03-01 | 1 | -4/+0 |
| | | |||||
* | | properly persist accepted crypto targets | Daniel Gultsch | 2016-03-01 | 1 | -5/+1 |
| | | |||||
* | | version bump to 1.11.0-beta, changelog and updated readme | Daniel Gultsch | 2016-03-01 | 3 | -9/+30 |
| | | |||||
* | | let users confirm each member in a conference even if that contact is ↵ | Daniel Gultsch | 2016-03-01 | 6 | -52/+137 |
| | | | | | | | | already trusted | ||||
* | | use correct jid when leaving a conference. fixes #1732 | Daniel Gultsch | 2016-02-29 | 2 | -6/+6 |
| | | |||||
* | | refactored omemo to take multiple recipients | Daniel Gultsch | 2016-02-29 | 12 | -173/+320 |
| | | |||||
* | | rename purge keys positive button to 'purge keys' | Daniel Gultsch | 2016-02-28 | 1 | -1/+1 |
| | | |||||
* | | made hashtable in roster store jids instead of strings | Daniel Gultsch | 2016-02-28 | 1 | -9/+7 |
| | | |||||
* | | removed unneeded proguard files | Daniel Gultsch | 2016-02-27 | 2 | -47/+0 |
| | | |||||
* | | always search offline contacts as well. fixes #1653 | Daniel Gultsch | 2016-02-27 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2016-02-27 | 3 | -1/+34 |
|\ \ | |||||
| * \ | Merge pull request #1721 from fiaxh/export_logs_storage_permission | Daniel Gultsch | 2016-02-27 | 3 | -1/+34 |
| |\ \ | | | | | | | | | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M | ||||
| | * | | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M | fiaxh | 2016-02-24 | 2 | -0/+33 |
| | | | | |||||
| | * | | No possibility of multiple invocation of log export | fiaxh | 2016-02-24 | 1 | -1/+1 |
| | | | |