aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-3/+26
|\
| * add setting for quick sharingDaniel Gultsch2016-04-141-2/+25
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-061-2/+1
|\ \
* \ \ Merge tag '1.11.3' into trz/rebaselookshe2016-04-051-1/+11
|\ \ \ | | |/ | |/|
| * | don't ask for resource when server uses http upload v0.1Daniel Gultsch2016-04-021-3/+3
| * | check max http file size when attaching filesDaniel Gultsch2016-04-011-1/+10
* | | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-1/+1
|\| |
| * | be less strict when sharing EXTRA_TEXT intentsDaniel Gultsch2016-03-201-1/+1
* | | fixed merge errorslookshe2016-03-201-15/+21
* | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-171-53/+89
|\| |
| * | made it possible to share text filesDaniel Gultsch2016-03-161-7/+8
| * | reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-161-30/+65
* | | Imports organizedsteckbrief2016-02-121-3/+1
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-24/+74
|\| |
| * | use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-221-1/+1
| * | implement direct sharing in android 6.0. fixes #1321Daniel Gultsch2015-12-071-23/+64
| * | check availabiltiy of pgp before sharing filesDaniel Gultsch2015-12-051-0/+4
| * | Ensure uris is empty before onStart adds to itAndreas Straub2015-09-021-0/+1
| * | rely on refreshUi/refreshUiReal and make sure it is being used everywhereDaniel Gultsch2015-07-201-0/+4
| * | Optimize importsAndreas Straub2015-07-201-1/+0
| * | fixed share with activity to account for http file uploadDaniel Gultsch2015-07-021-40/+34
| * | allow sharing multiple images at once. fixes #1090iNPUTmice2015-04-111-19/+35
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-031-29/+34
|\ \ \ | | |/ | |/|
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-222/+0
| |/
* / Merge tag '1.5.2' into trz/rebaselookshe2015-08-111-57/+67
|/
* fixed bug when sharing files from google driveiNPUTmice2015-01-181-7/+11
* fixed potential NPEs in ShareWithActivityDaniel Gultsch2015-01-061-4/+5
* record voice and attachment refactorDaniel Gultsch2015-01-031-3/+10
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-221-2/+2
* properly detect images in share withiNPUTmice2014-12-171-6/+6
* Allow sending of any filetype via intentSam Whited2014-12-151-24/+36
* Update more files to use JID objectsSam Whited2014-11-091-5/+18
* Make conversations the root projectSam Whited2014-10-221-0/+185
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 05:31:05 +0000