summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10067 from owncloud/fix-#9119Morris Jobke2014-08-011-1/+1
|\
| * Quick fix for #9119. Increase preview to keep empty message more centered and...Remco Brenninkmeijer2014-07-301-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-011-3/+3
* | Merge pull request #10048 from owncloud/fix_search_in_shared_filesJörn Friedrich Dreyer2014-07-312-62/+101
|\ \ | |/ |/|
| * add test for search() in shared cacheJörn Friedrich Dreyer2014-07-311-3/+75
| * traverse folders in php to search in shared filesJörn Friedrich Dreyer2014-07-311-59/+26
* | Merge pull request #10054 from owncloud/dont_preload_videosJan-Christoph Borchardt2014-07-301-1/+1
|\ \
| * | don't preload videos on public sharing, fixes #10042Georg Ehrke2014-07-301-1/+1
| |/
* / Also keep maxY into account when scaling a preview while preserving aspect ratioRobin Appelman2014-07-301-4/+0
|/
* Merge pull request #9983 from owncloud/sharing_add_unshare_to_overviewBjörn Schießle2014-07-291-0/+3
|\
| * update attributes for share with user list, file should always have delete pe...Bjoern Schiessle2014-07-281-0/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-291-3/+3
|/
* Merge pull request #9798 from owncloud/ocs_share_api_add_expire_dateBjörn Schießle2014-07-282-3/+100
|\
| * adjust error codeBjoern Schiessle2014-07-281-2/+2
| * add OCS api call to set expire date for link sharesBjoern Schiessle2014-07-252-2/+99
* | Merge pull request #9585 from owncloud/design-fix-public-footerJan-Christoph Borchardt2014-07-281-16/+0
|\ \
| * | move public page footer rules from sharing app to core so it is used by other...Jan-Christoph Borchardt2014-07-071-16/+0
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-282-1/+9
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-271-0/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-264-6/+15
* | | Merge pull request #9867 from owncloud/fix_sharing_updateBjörn Schießle2014-07-252-2/+5
|\ \ \
| * | | fix sharing update, add proper escapingBjoern Schiessle2014-07-242-2/+5
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-251-2/+6
|/ / /
* | | Merge pull request #9703 from owncloud/files-preview-animateMorris Jobke2014-07-241-1/+0
|\ \ \
| * | | Fix preview animation on uploadingVincent Petry2014-07-171-1/+0
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-241-0/+5
* | | | Fix remote share when remote server is installed at the rootRobin Appelman2014-07-231-2/+7
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-221-0/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-211-0/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-201-1/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-191-0/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-172-1/+36
|/ /
* | Correctly return the owner display name for children of sharesVincent Petry2014-07-162-1/+20
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-1649-49/+4
* | Merge pull request #9596 from owncloud/fixing-9503-masterMorris Jobke2014-07-152-5/+5
|\ \
| * | reduce share action text to the user name onlyThomas Müller2014-07-142-5/+5
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-151-0/+6
|/ /
* | Added mountType attribute and adapted Delete action textVincent Petry2014-07-141-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-141-0/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-131-1/+13
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-124-2/+31
* | Merge pull request #9538 from owncloud/fileactions-cleanupVincent Petry2014-07-102-6/+41
|\ \
| * | Propagate file action changes to the file listsVincent Petry2014-07-092-6/+41
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-104-0/+15
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0974-5/+116
* | Merge pull request #9515 from owncloud/update-sharecleanupfixVincent Petry2014-07-082-10/+24
|\ \
| * | Fix update cleanup to only affect file and foldersVincent Petry2014-07-082-10/+24
* | | Upload abortion is now detected within the OC_Connector_Sabre_File::put()Thomas Müller2014-07-081-1/+0
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0859-111/+62
* | Merge pull request #9499 from owncloud/shares-hidetokenrecipientMorris Jobke2014-07-072-1/+45
|\ \