summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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"
| * Revert "Deprecated \OCP\IAppConfig - add missing methods to IConfig"Vincent Petry2015-03-274-129/+6
|/ | | | This reverts commit 012016d3311a13c3c1e9d60778dc6fbd6be0204e.
* Merge pull request #15155 from owncloud/share-donotreturntrashedfilesMorris Jobke2015-03-272-11/+88
|\ | | | | Do not return shares for files outside "files"
| * 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
|\ \ | | | | | | Deprecated \OCP\IAppConfig - add missing methods to IConfig
| * | 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 wrappers
| * | | 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
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | core improvements for Encryption 2.0
| * | | | | add deleteAllFileKeys to public interface and add "uid" as parameter for theBjoern Schiessle2015-03-273-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | update call
| * | | | | 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 shares
| * | | | | | also call generateTarget for group share to add the correct prefix if ↵Bjoern Schiessle2015-03-261-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | share_folder is defined in config.php
* | | | | | | Merge pull request #15254 from owncloud/fix-14853-masterThomas Müller2015-03-272-11/+60
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Adding a pending indicator to the files summary
| * | | | | | | 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 IE8
| * | | | | | | Show label for password change in IE8Morris Jobke2015-03-272-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #10729
* | | | | | | | Merge pull request #15227 from owncloud/ocetag-headerVincent Petry2015-03-273-0/+90
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Copy Etag header to OC-Etag for sabre calls
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | adjust controls bar width to not overlay scrollbar
| * | | | | | | | 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 match
| * | | | | | | | | Don't append user in a filtered list if groups don't matchVincent Petry2015-03-271-0/+4
| | | | | | | | | |
* | | | | | | | | | Merge pull request #15225 from ↵Morris Jobke2015-03-275-24/+38
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/make-setups-for-users-that-tend-to-use-owncloud-on-not-proper-machines-a-little-bit-more-secure Add some generic default headers as well via PHP
| * | | | | | | | | 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 ↵Thomas Müller2015-03-272-0/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/prevent-directory-characters-in-temporary-path Filter potential dangerous characters in path name
| * | | | | | | | | Filter potential dangerous characters in path nameLukas Reschke2015-03-262-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should not allow / or \ in the postfix here.
* | | | | | | | | | Merge pull request #15256 from owncloud/emptycontent-messagesThomas Müller2015-03-275-7/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | fine-tuning the empty content messages
| * | | | | | | | | | 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 tests
| * | | | | | | | | Fix namespace for repair step testsVincent Petry2015-03-264-4/+7
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #15245 from owncloud/fix-14864-masterThomas Müller2015-03-261-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | More elaborate command description for upgrade
| * | | | | | | | More elaborate command description for upgrade - fixes #14864Thomas Müller2015-03-261-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #13654 from oparoz/tmpfile-with-extensionVincent Petry2015-03-263-9/+16
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Keep the extension in temp files
| * | | | | | | Make the method compatible with all types of extensionsOlivier Paroz2015-03-192-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix existing tests
| * | | | | | | Fix the office classOlivier Paroz2015-03-191-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The office converter already replaces the original extension with '.pdf', so we need to switch the extensions of the tmp file instead of appending '.pdf' to it
| * | | | | | | Keep the extension in temp filesOlivier Paroz2015-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file extension helps some applications like ImageMagick to properly process files
* | | | | | | | Merge pull request #15244 from owncloud/use_default_share_folderMorris Jobke2015-03-263-5/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | always fall back to default share folder
| * | | | | | | | always fall back to default share folderBjoern Schiessle2015-03-263-5/+20
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #14925 from owncloud/ext-mountoptions-uiRobin McCorkell2015-03-269-28/+366
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Mount options GUI for external storage
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-01 23:47:48 +0000