summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move registration of background job to install/updateJoas Schilling2015-09-024-5/+24
|
* Move registration of LDAP background jobs to the install and updateJoas Schilling2015-09-024-4/+7
|
* Merge pull request #18773 from owncloud/fix-useless-deletesRobin McCorkell2015-09-021-0/+4
|\ | | | | Soft fail when deleting and no entry found
| * Soft fail when deleting and no entry foundRobin McCorkell2015-09-021-0/+4
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-09-026-0/+218
|
* Merge pull request #18632 from owncloud/sidebad-image-previewJan-Christoph Borchardt2015-09-026-13/+154
|\ | | | | larger preview for images in the sidebar
| * larger preview for images in the sidebarRobin Appelman2015-09-024-7/+81
| |
| * allow handling thumbnail errorsRobin Appelman2015-09-021-1/+4
| |
| * Allow creating previewss that cover the specified dimensionsRobin Appelman2015-09-022-6/+70
| |
* | Merge pull request #18752 from owncloud/proper-setup-checkMorris Jobke2015-09-022-1/+29
|\ \ | |/ |/| use config.php value instead of version string for appstore detection
| * use config.php value instead of version stringMorris Jobke2015-09-022-1/+29
| |
* | Merge pull request #18744 from owncloud/fix-ocs-routerMorris Jobke2015-09-021-2/+3
|\ \ | |/ |/| Delay adding OCS prefix to route collection until all is loaded
| * Delay adding OCS prefix to route collection until all is loadedRobin McCorkell2015-09-011-2/+3
| | | | | | | | | | ->addPrefix() iterates over all registered routes, so must be run after all apps have had a chance to load their OCS routes.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-09-0134-2/+248
| |
* | Merge pull request #18707 from owncloud/autotest-xdebugRobin McCorkell2015-09-012-0/+12
|\ \ | | | | | | Allow easy XDEBUG debugging with autotest
| * | Allow easy XDEBUG debugging with autotestRobin McCorkell2015-08-312-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debugging scripts needs the environment variable XDEBUG_CONFIG to be set, which initiates a connection to a listening debugger. But if that env is set and one of the PHP setup steps occurs (e.g. occ install), the debugging session is 'completed' and the debugger no longer listens during the actual tests. This saves the XDEBUG_CONFIG env so it only applies during the PHPUnit execution, so only the real tests trigger the debugging.
* | | Merge pull request #18743 from owncloud/autoloader-check-log-pathRobin Appelman2015-09-011-1/+1
|\ \ \ | | | | | | | | Show the path as part of the exception for not allowed autoloading paths
| * | | Show the path as part of the exception for not allowed autoloading pathsRobin Appelman2015-09-011-1/+1
| | | |
* | | | Merge pull request #18234 from owncloud/ocs_api_for_sharees_listBjörn Schießle2015-09-013-0/+1417
|\ \ \ \ | |_|_|/ |/| | | Add OCS API for sharees list
| * | | Bring the coverage back to 100%Joas Schilling2015-08-262-25/+169
| | | |
| * | | Adjust testsJoas Schilling2015-08-262-403/+348
| | | |
| * | | Fix performance issues of the sharees apiJoas Schilling2015-08-262-179/+151
| | | |
| * | | Manually query for the last idJoas Schilling2015-08-261-1/+11
| | | |
| * | | Fix wrong value for datetime fieldJoas Schilling2015-08-261-1/+2
| | | |
| * | | Rename file to match the class nameJoas Schilling2015-08-261-0/+0
| | | |
| * | | Add tests for "getShareesForShareIds()"Joas Schilling2015-08-261-0/+93
| | | |
| * | | Do not return the current user himselfJoas Schilling2015-08-262-5/+44
| | | |
| * | | Take a list of share IDs instead of the user and group namesJoas Schilling2015-08-263-67/+118
| | | |
| * | | Inject the logger as wellJoas Schilling2015-08-263-31/+44
| | | |
| * | | Add all possible links next, prev, first and lastJoas Schilling2015-08-262-16/+88
| | | |
| * | | Make shareType an arrayJoas Schilling2015-08-262-58/+144
| | | |
| * | | Add tests for "search()"Joas Schilling2015-08-262-7/+156
| | | |
| * | | Do not use deprecated method in new codeJoas Schilling2015-08-263-12/+11
| | | |
| * | | Split logic and global usage and add tests for "searchSharees()"Joas Schilling2015-08-262-44/+217
| | | |
| * | | Filter the sharees with the existing sharesJoas Schilling2015-08-261-30/+64
| | | |
| * | | Use SearchResultSorterJoas Schilling2015-08-261-16/+4
| | | |
| * | | Add tests for "getRemote()"Joas Schilling2015-08-261-1/+84
| | | |
| * | | Add tests for "getGroups()"Joas Schilling2015-08-262-11/+82
| | | |
| * | | Add tests for "getUsers()"Joas Schilling2015-08-262-25/+206
| | | |
| * | | Move test file to subdirJoas Schilling2015-08-262-1/+1
| | | |
| * | | Empty skeleton for testsRoeland Jago Douma2015-08-261-0/+50
| | | |
| * | | Sort shareesRoeland Jago Douma2015-08-261-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To ensure that pagination is working properly we need to make sure the shares are always in the same order. Sorting is first done by label (catches most instances) If there is a user and a group with the same label we sort by shareType If there are multiple users with the same label we sort those by shareWith
| * | | Start of OCS Share API sharees endpointRoeland Jago Douma2015-08-262-0/+245
| | | |
* | | | Merge pull request #18730 from owncloud/appframework_proper_304Vincent Petry2015-09-012-1/+9
|\ \ \ \ | |_|/ / |/| | | Properly return 304 in AppFramework
| * | | Properly return 304Roeland Jago Douma2015-09-012-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ETag set in the IF_NONE_MODIFIED header is wraped in quotes ("). However the ETag that is set in response is not (yet). Also we need to cast the ETag to a string. * Added unit test
* | | | Merge pull request #18396 from owncloud/autoloader-check-pathLukas Reschke2015-09-015-42/+86
|\ \ \ \ | | | | | | | | | | verify the path in the autoloader
| * | | | verify the path in the autoloaderRobin Appelman2015-09-015-42/+86
| | | | |
* | | | | Merge pull request #12088 from AdamWill/google-opendir-rootVincent Petry2015-09-011-2/+0
|\ \ \ \ \ | |/ / / / |/| | | | [WIP] google: drop duplicate path trim from opendir()
| * | | | google: drop duplicate path trim from opendir()Adam Williamson2014-11-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | opendir() trims the path passed then calls getDriveFile() - which immediately does the same trim operation. This breaks opendir() on the root directory, which causes the failure of the testStat() test when it checks the ctime of the root dir.
* | | | | Merge pull request #18631 from owncloud/more_ocs_share_dataVincent Petry2015-09-012-22/+120
|\ \ \ \ \ | | | | | | | | | | | | Return permissions and expiration on create share responses