summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #10223 from dannosaur/patch-1Jan-Christoph Borchardt2014-08-071-0/+1
|\ \ \ \ \ \ \
| * | | | | | | fix tiny thumbnails in public preview/share modeDan Jones2014-08-061-0/+1
* | | | | | | | Merge pull request #10218 from owncloud/pzy-masterThomas Müller2014-08-071-0/+5
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Update public.phppzy2014-08-071-0/+5
| |/ / / / / /
* | | | | | | Merge pull request #8915 from owncloud/MorrisJobke-travisThomas Müller2014-08-074-3/+62
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Disable encryption migration testsMorris Jobke2014-08-051-0/+8
| * | | | | | mark tests as skipped - TODO travisMorris Jobke2014-08-051-0/+49
| * | | | | | Minor fixesMorris Jobke2014-08-052-3/+5
| | |/ / / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-073-5/+5
| |/ / / / |/| | | |
* | | | | Merge pull request #10186 from owncloud/versioning_fix_pathThomas Müller2014-08-062-2/+36
|\ \ \ \ \
| * | | | | add unit test to make sure getVersions returns the correct resultBjoern Schiessle2014-08-051-0/+34
| * | | | | make sure that the versions array contains the correct pathBjoern Schiessle2014-08-051-2/+2
* | | | | | Merge pull request #10191 from owncloud/sharing_rm_trailing_slashMorris Jobke2014-08-051-1/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | remove unused variableBjoern Schiessle2014-08-051-1/+0
| |/ / / /
* | | | | Merge pull request #10168 from owncloud/parallel-download-on-public-shared-fo...Morris Jobke2014-08-051-0/+1
|\ \ \ \ \
| * | | | | close session right before the download starts - this enables parallel downloadsThomas Müller2014-08-051-0/+1
| |/ / / /
* / / / / Hack to avoid Agent DN + Password being overwritten by some ugly browsers wit...Arthur Schiwon2014-08-052-0/+12
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-051-2/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-041-0/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-025-3/+6
* | | | Merge pull request #9529 from helmutschneider/fix-8326Robin Appelman2014-08-011-17/+12
|\ \ \ \
| * | | | Converted an array to PHP5.3 compatible versionJohan Björk2014-07-091-2/+2
| * | | | Fixes #8326: deletion of directories on S3Johan Björk2014-07-081-17/+12
* | | | | 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 #10051 from owncloud/preview-empty-textThomas Müller2014-07-311-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Use svg mimeicons for empty text filesRobin Appelman2014-07-301-2/+2
| |/ / / / / /
* | / / / / / [tx-robot] updated from transifexJenkins for ownCloud2014-07-3141-1/+48
| |/ / / / / |/| | | | |
* | | | | | 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
| |/ / / / /
* | | | | | Merge pull request #10024 from owncloud/preview-restrict-heightMorris Jobke2014-07-301-4/+0
|\ \ \ \ \ \
| * | | | | | Also keep maxY into account when scaling a preview while preserving aspect ratioRobin Appelman2014-07-301-4/+0
| |/ / / / /
* | | | | | add unit test for rename and copy operationBjoern Schiessle2014-07-304-7/+171
* | | | | | make sure that we always find all versionsBjoern Schiessle2014-07-301-22/+37
* | | | | | make the versions and encryption app aware of the copy operationBjoern Schiessle2014-07-305-14/+65
|/ / / / /
* | | | | Merge pull request #9721 from owncloud/enc_define_type_in_pre_hookBjörn Schießle2014-07-291-4/+7
|\ \ \ \ \
| * | | | | define type in pre hookBjoern Schiessle2014-07-181-4/+7
| | |_|/ / | |/| | |
* | | | | Merge pull request #9951 from owncloud/enc_inproved_error_messagesBjörn Schießle2014-07-293-3/+13
|\ \ \ \ \
| * | | | | show a warning in the personal settings and admin settins if the encyption ke...Bjoern Schiessle2014-07-283-3/+13
* | | | | | 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-294-3/+17
|/ / / / / /
* | | | | | 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
|\ \ \ \ \ \ \