summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Cron has to be executed with the correct user - fixes 13912 and othersThomas Müller2015-04-011-0/+16
* Merge pull request #15295 from owncloud/add-more-spacing-dialogMorris Jobke2015-03-302-2/+2
|\
| * Add more spacing to the file picker dialogLukas Reschke2015-03-282-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-3026-0/+62
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2956-18/+74
|/
* Merge pull request #15289 from owncloud/min-upload-limitVincent Petry2015-03-281-3/+7
|\
| * Require minimum 1 MiB upload limitRobin McCorkell2015-03-271-3/+7
* | Merge pull request #15288 from owncloud/check-datadir-relativeVincent Petry2015-03-282-5/+30
|\ \
| * | Check for relative datadirectory pathRobin McCorkell2015-03-272-5/+30
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2015-03-28116-40/+240
|/
* Merge pull request #15284 from owncloud/revert-master-breakageMorris Jobke2015-03-274-129/+6
|\
| * Revert "Deprecated \OCP\IAppConfig - add missing methods to IConfig"Vincent Petry2015-03-274-129/+6
|/
* Merge pull request #15155 from owncloud/share-donotreturntrashedfilesMorris Jobke2015-03-272-11/+88
|\
| * Add logout in share test to avoid nasty side effectsVincent Petry2015-03-271-0/+1
| * Do not return shares for files outside "files"Vincent Petry2015-03-272-11/+87
* | Merge pull request #13938 from owncloud/deprecate-iappconfigThomas Müller2015-03-277-18/+155
|\ \
| * | migrate share helper method to IConfigMorris Jobke2015-03-181-3/+5
| * | fix unit testsMorris Jobke2015-03-171-5/+15
| * | fix failing unit testMorris Jobke2015-03-171-4/+6
| * | Deprecated \OCP\IAppConfig - add missing methods to IConfigMorris Jobke2015-03-174-6/+129
* | | Merge pull request #15240 from owncloud/storage-wrapper-priorityThomas Müller2015-03-274-10/+47
|\ \ \
| * | | add priority to storage wrappersRobin Appelman2015-03-264-10/+47
* | | | Merge pull request #15261 from owncloud/fix-14268-masterThomas Müller2015-03-273-47/+10
|\ \ \ \
| * | | | use StreamResponse to download the log file - fixes #14268Thomas Müller2015-03-273-47/+10
* | | | | Merge pull request #15265 from owncloud/enc2_fixesThomas Müller2015-03-276-6/+63
|\ \ \ \ \
| * | | | | add deleteAllFileKeys to public interface and add "uid" as parameter for theBjoern Schiessle2015-03-273-2/+11
| * | | | | fix check if a file is excluded from encryption or notBjoern Schiessle2015-03-273-4/+52
* | | | | | Merge pull request #15247 from owncloud/fix_group_share_master_backportMorris Jobke2015-03-271-4/+5
|\ \ \ \ \ \
| * | | | | | also call generateTarget for group share to add the correct prefix if share_f...Bjoern Schiessle2015-03-261-4/+5
* | | | | | | Merge pull request #15254 from owncloud/fix-14853-masterThomas Müller2015-03-272-11/+60
|\ \ \ \ \ \ \
| * | | | | | | Adding a pending indicator to the files summary - fixes #14853Thomas Müller2015-03-272-11/+60
* | | | | | | | Merge pull request #15259 from owncloud/fix-change-password-ie8Vincent Petry2015-03-272-1/+15
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Show label for password change in IE8Morris Jobke2015-03-272-1/+15
* | | | | | | | Merge pull request #15227 from owncloud/ocetag-headerVincent Petry2015-03-273-0/+90
|\ \ \ \ \ \ \ \
| * | | | | | | | Copy Etag header to OC-Etag for sabre callsVincent Petry2015-03-263-0/+90
* | | | | | | | | Merge pull request #15260 from owncloud/adjust-controls-bar-widthMorris Jobke2015-03-272-1/+61
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | fix scrutinizer issuesJan-Christoph Borchardt2015-03-271-6/+9
| * | | | | | | | adjust controls bar width to not overlay scrollbarJan-Christoph Borchardt2015-03-272-1/+58
* | | | | | | | | Merge pull request #15258 from owncloud/users-addtofilteredgroupMorris Jobke2015-03-271-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't append user in a filtered list if groups don't matchVincent Petry2015-03-271-0/+4
* | | | | | | | | | Merge pull request #15225 from owncloud/make-setups-for-users-that-tend-to-us...Morris Jobke2015-03-275-24/+38
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Add some generic default headers as well via PHPLukas Reschke2015-03-265-24/+38
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-27632-1626/+358
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #15252 from owncloud/prevent-directory-characters-in-tempo...Thomas Müller2015-03-272-0/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Filter potential dangerous characters in path nameLukas Reschke2015-03-262-0/+18
* | | | | | | | | | Merge pull request #15256 from owncloud/emptycontent-messagesThomas Müller2015-03-275-7/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | adjust shade of empty content icons, fix files icon shadeJan-Christoph Borchardt2015-03-263-5/+5
| * | | | | | | | | | adjust emptycontent messages for files and files_externalJan-Christoph Borchardt2015-03-262-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #15255 from owncloud/test-namespacesforrepairtestsMorris Jobke2015-03-274-4/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix namespace for repair step testsVincent Petry2015-03-264-4/+7
| | |_|/ / / / / / | |/| | | | | | |