Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | add border to roundedimageview | Christian S | 2016-03-19 | 3 | -4/+6 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-17 | 10 | -60/+104 | |
|\| | ||||||
| * | version bump to 1.11.1 and changelog | 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 | |
| | | ||||||
* | | Update CHANGELOG.md | Christian S | 2016-03-13 | 1 | -0/+2 | |
| | | ||||||
* | | remove old code | Christian S | 2016-03-13 | 1 | -10/+0 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-13 | 9 | -20/+51 | |
|\| | ||||||
| * | 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.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 | Christian S | 2016-03-05 | 1 | -1/+1 | |
| | | ||||||
* | | only resend files smaller than 1 MiB automatically | Christian S | 2016-03-05 | 2 | -2/+4 | |
| | | ||||||
* | | updated changelog | Christian S | 2016-03-05 | 1 | -0/+1 | |
| | | ||||||
* | | resend failed filetransfers automatically | Christian S | 2016-03-05 | 1 | -2/+6 | |
| | | ||||||
* | | show always buttons instead of links for files | Christian S | 2016-03-05 | 1 | -1/+2 | |
| | | ||||||
* | | updated strings | Christian S | 2016-03-05 | 2 | -0/+4 | |
| | | ||||||
* | | reformated code | Christian S | 2016-03-05 | 1 | -64/+64 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-05 | 18 | -98/+177 | |
|\| | ||||||
| * | 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 | |
| | | | ||||||
* | | | allow users to edit settings and accounts | Christian S | 2016-03-04 | 1 | -2/+2 | |
| | | | ||||||
* | | | updated strings | Christian S | 2016-03-04 | 1 | -2/+6 | |
| | | | ||||||
* | | | Merge branch 'development' of https://github.com/kriztan/Pix-Art-Messenger ↵ | Christian S | 2016-03-04 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | | | | | into development | |||||
| * | | | Update CHANGELOG.md | Christian S | 2016-02-28 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'siacs/master' into development | Christian S | 2016-03-04 | 30 | -292/+546 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | 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 | |
| | | |