summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10290 from owncloud/check_quota_on_new_via_webThomas Müller2014-08-081-0/+23
|\
| * check quota when trying to download a file via new -> webJörn Friedrich Dreyer2014-08-081-0/+23
* | only show "share with others" and "share by link" navigation bar entries if u...Bjoern Schiessle2014-08-081-18/+22
|/
* Merge pull request #10280 from owncloud/lazyloading-earlierMorris Jobke2014-08-081-1/+1
|\
| * trigger lazy loading earlier, fix #9823Jan-Christoph Borchardt2014-08-081-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-0842-79/+1
|/
* Merge pull request #10248 from owncloud/enc_remove_keys_from_sessionMorris Jobke2014-08-074-4/+19
|\
| * add logout hook to remove keys from sessionBjoern Schiessle2014-08-074-4/+19
* | Merge pull request #10261 from owncloud/fix-9829Thomas Müller2014-08-071-1/+1
|\ \
| * | ldap_ prefix will be added in invokeLDAPMethod(), having it would lead to a u...Arthur Schiwon2014-08-071-1/+1
* | | Merge pull request #10238 from owncloud/fix-public-download-with-encryption-m...Thomas Müller2014-08-071-1/+4
|\ \ \
| * | | we can only close the session if encryption is not usedThomas Müller2014-08-071-1/+4
| |/ /
* | | Merge pull request #10184 from owncloud/getbyid-nodeRobin Appelman2014-08-071-19/+5
|\ \ \
| * | | trim leading slashRobin Appelman2014-08-061-1/+1
| * | | Fix SharedCache::getPathByIdRobin Appelman2014-08-061-20/+6
* | | | 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
|\ \ \