summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Some more PHPDoc fixesLukas Reschke2014-04-2127-123/+237
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-211-1/+3
|
* Merge pull request #7988 from owncloud/routing-cache-webrootAndreas Fischer2014-04-201-1/+2
|\ | | | | | | | | | | | | | | | | Keep cached urls with different hostnames or baseurls seperate * owncloud/routing-cache-webroot: Sort parameters and cast to int add delimiter between host and baseurl Keep cached urls with different hostnames or baseurls seperate
| * Sort parameters and cast to intRobin Appelman2014-04-151-1/+2
| |
| * add delimiter between host and baseurlRobin Appelman2014-04-071-1/+1
| |
| * Merge branch 'master' into routing-cache-webrootRobin Appelman2014-04-0736-105/+162
| |\
| * | Keep cached urls with different hostnames or baseurls seperateRobin Appelman2014-04-011-1/+1
| | |
* | | Merge pull request #8203 from owncloud/correct-linkAndreas Fischer2014-04-201-3/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use direct link instead of JS * owncloud/correct-link: Link to previous directory Use direct link instead of JS
| * | | Link to previous directoryLukas Reschke2014-04-161-2/+2
| | | |
| * | | Use direct link instead of JSLukas Reschke2014-04-141-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to our CSP policy this link won’t work as it it considered as inline Javascript. This commit replaces the link with a static link to the files app. Reimplementation of #8067 - fixes #7742
* | | | Add type hintingLukas Reschke2014-04-201-11/+11
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-191-1/+1
| | | |
* | | | Merge pull request #8205 from owncloud/fix-8202Morris Jobke2014-04-171-1/+1
|\ \ \ \ | | | | | | | | | | Add one more LOWER.
| * | | | remove unneeded LOWER. Fixes #8202Victor Dubiniuk2014-04-141-1/+1
| | | | |
* | | | | Merge pull request #8222 from owncloud/type-hintingMorris Jobke2014-04-1714-18/+55
|\ \ \ \ \ | | | | | | | | | | | | Type hinting fixes
| * | | | | Fix PHPdoc in lib/publicBart Visscher2014-04-153-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | using scrutinizer patch
| * | | | | Fix PHPdoc in lib/privateBart Visscher2014-04-1511-17/+42
| | | | | | | | | | | | | | | | | | | | | | | | using scrutinizer patch
* | | | | | Merge pull request #8189 from Xenopathic/misc_fixesRobin McCorkell2014-04-171-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Various fixes
| * | | | | | Prevent error from cache update on deleted filesRobin McCorkell2014-04-131-1/+5
| | | | | | |
* | | | | | | Merge pull request #8240 from owncloud/thumbnail-on-short-videos-masterJörn Friedrich Dreyer2014-04-171-7/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | videos which are shorter then 5 seconds will now get a proper thumbnail ...
| * | | | | | | escape $second + update PHPDocThomas Müller2014-04-161-7/+7
| | | | | | | |
| * | | | | | | videos which are shorter then 5 seconds will now get a proper thumbnail at 1 ↵Thomas Müller2014-04-161-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | second
* | | | | | | | Merge pull request #8183 from owncloud/move-security-headersMorris Jobke2014-04-164-26/+29
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Move security headers
| * | | | | | | Fix typoLukas Reschke2014-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Thanks @DeepDiver1975
| * | | | | | | Typo + Line breaksLukas Reschke2014-04-131-5/+3
| | | | | | | |
| * | | | | | | Remove uneeded usages of nosniffLukas Reschke2014-04-132-3/+0
| | | | | | | |
| * | | | | | | Fix indentationLukas Reschke2014-04-131-1/+2
| | | | | | | |
| * | | | | | | Move security headers to base.phpLukas Reschke2014-04-132-25/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some headers were currently only added to the templates but not to other components (e.g. SabreDAV / JSON / etc...) The migration to base.php ensures that the headers are served to all requests passing base.php
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-161-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #8104 from owncloud/lukepolo-masterThomas Müller2014-04-151-0/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added the ability to Drag and Drop folders [chrome]
| * \ \ \ \ \ \ \ Merge branch 'master' into lukepolo-masterThomas Müller2014-04-0910-15/+64
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js
| * | | | | | | | | fixing mkdir code to respect external file systems as wellThomas Müller2014-04-071-3/+3
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-masterThomas Müller2014-04-071-0/+11
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js
| | * | | | | | | | | Feature Added : Ability to drag and drop in ChromeLuke Policinski2014-02-191-5/+5
| | | | | | | | | | |
| | * | | | | | | | | Feature Added : Ability to drag and drop in ChromeLuke Policinski2014-02-191-0/+11
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #8210 from owncloud/enhance-assets-management-masterLukas Reschke2014-04-151-1/+30
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | adding checks and log messages regarding the assets folder
| * | | | | | | | | | | adding checks and log messages regarding the assets folderThomas Müller2014-04-151-1/+30
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #8197 from owncloud/secure_mimetypesLukas Reschke2014-04-154-112/+158
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | White-list known secure mime types. Refs. #8184
| * | | | | | | | | | | | Added explanation to mimetypes.list.php to avoid future confusion.Thomas Tanghus2014-04-141-0/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | White-list known secure mime types. Refs. #8184Thomas Tanghus2014-04-144-112/+154
| | | | | | | | | | | | |
* | | | | | | | | | | | | Remove limit and offset manipulation when getting users or groups, because ↵Arthur Schiwon2014-04-153-32/+0
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it does not work when more than one user or group backend. Fixing it would be too costly performancewise, so we switch back to the model used in OC 5: limit and offset are effective per backend, and not a general constraint
* | | | | | | | | | | | introduce new function to force a languageThomas Müller2014-04-151-0/+8
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #7780 from owncloud/share-file-existsBjörn Schießle2014-04-151-0/+10
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | Verify that a file exists before we share it
| * | | | | | | | | | Verify that a file exists before we share itRobin Appelman2014-04-021-0/+10
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #8059 from owncloud/countUsersInGroupLukas Reschke2014-04-144-0/+47
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | add optional countUsersInGroup method to group backends
| * | | | | | | | | | | ask implementsAction instead of checking method_exists for easier testingArthur Schiwon2014-04-081-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | add optional countUsersInGroup method to group backendsArthur Schiwon2014-04-084-0/+47
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #8178 from owncloud/fix-request-parametersLukas Reschke2014-04-142-50/+46
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | Correctly process request parameters other than GET or POST, dont use gl...
| * | | | | | | | | | | default to GET request when no method is set to fix unittests, also set ↵Bernhard Posselt2014-04-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parsed json parameters on the post attribute
| * | | | | | | | | | | Correctly process request parameters other than GET or POST, dont use ↵Bernhard Posselt2014-04-122-50/+39
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | globals in the class but inject it