summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix 17677Lennart Rosam2015-08-123-5/+1
* Merge pull request #18065 from owncloud/new-trashbin-retentionThomas Müller2015-08-127-44/+428
|\
| * Fix testsVictor Dubiniuk2015-08-101-7/+1
| * Migrate settingsVictor Dubiniuk2015-08-103-20/+93
| * Enhance trashbin expiration settingsVictor Dubiniuk2015-08-106-36/+353
* | Merge pull request #17982 from owncloud/appframework-sanitize-nameThomas Müller2015-08-122-0/+29
|\ \
| * | Sanitize class names before registerService/queryRobin McCorkell2015-07-302-0/+29
* | | Merge pull request #17865 from rullzer/less_static_prov_apiThomas Müller2015-08-128-458/+1128
|\ \ \
| * | | Check for userSession->getUser() === nullRoeland Jago Douma2015-08-113-25/+69
| * | | [provisioning api] Fix grouptestRoeland Jago Douma2015-08-111-1/+1
| * | | [provisioning api] Test for correct displaynameRoeland Jago Douma2015-08-113-1/+4
| * | | Declare fieldsRoeland Jago Douma2015-08-111-0/+9
| * | | [provisioning api] Improve apps test coverageRoeland Jago Douma2015-08-111-0/+6
| * | | Fix groupsRoeland Jago Douma2015-08-111-2/+2
| * | | [provisioning api] improve coverage for groupsRoeland Jago Douma2015-08-111-0/+131
| * | | [provisioning api] Improve test coverage userRoeland Jago Douma2015-08-111-0/+358
| * | | [provisioning api] Move away from OC\Util to OCP\UtilRoeland Jago Douma2015-08-021-2/+2
| * | | [provisioning_api] Move tests to OCPRoeland Jago Douma2015-08-024-199/+202
| * | | [provisioning_api] Move part of apps to OCPRoeland Jago Douma2015-08-023-13/+29
| * | | [provisioning_api] OC_User to IUserSessionRoeland Jago Douma2015-08-025-26/+48
| * | | [provisioning_api] subadmin check for usersRoeland Jago Douma2015-08-021-10/+10
| * | | [provisioning_api] Moved groups away from static stuffRoeland Jago Douma2015-08-023-56/+78
| * | | [provisioning_api] Move users away from static codeRoeland Jago Douma2015-08-023-248/+304
* | | | Merge pull request #18127 from owncloud/dav-request-testsThomas Müller2015-08-1211-77/+543
|\ \ \ \
| * | | | handle single file dav endpointsRobin Appelman2015-08-111-2/+6
| * | | | only add tags plugin when loggedinRobin Appelman2015-08-111-2/+2
| * | | | fix setup/teardownRobin Appelman2015-08-111-11/+18
| * | | | split out creating the sabre dav server to it's own factoryRobin Appelman2015-08-115-106/+145
| * | | | add test framework for doing full request webdav testsRobin Appelman2015-08-117-2/+418
* | | | | Merge pull request #18207 from owncloud/bump-versionRobin McCorkell2015-08-111-1/+1
|\ \ \ \ \
| * | | | | Bump version patch number, fixes #18129Robin McCorkell2015-08-111-1/+1
* | | | | | Merge pull request #18202 from owncloud/revert-route-breaking-changesRobin McCorkell2015-08-114-43/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Revert "make knowledge base url configurable"Joas Schilling2015-08-113-27/+1
| * | | | | Revert "Only load app routes if the app has already been loaded"Joas Schilling2015-08-112-16/+0
* | | | | | Merge pull request #17709 from owncloud/fileactions-dropdownJan-Christoph Borchardt2015-08-1118-581/+1176
|\ \ \ \ \ \
| * | | | | | Fixed file actions menu to close when reclicking triggerVincent Petry2015-08-115-73/+67
| * | | | | | Load backbone when running unit testsVincent Petry2015-08-111-1/+3
| * | | | | | Inline actions using default renderer are now always permanentVincent Petry2015-08-103-6/+5
| * | | | | | fix width of action dropdown and last layout detailsJan-Christoph Borchardt2015-08-102-14/+14
| * | | | | | remove whitespace on right cause of moved delete iconJan-Christoph Borchardt2015-08-101-18/+13
| * | | | | | fix ellipsizing for file namesJan-Christoph Borchardt2015-08-101-24/+4
| * | | | | | fix layout and design of actions dropdownJan-Christoph Borchardt2015-08-103-14/+32
| * | | | | | Remove share action display nameVincent Petry2015-08-101-1/+1
| * | | | | | Added bubble style, applied to file actions menuVincent Petry2015-08-103-2/+12
| * | | | | | Updated unit tests for file actions and actions menuVincent Petry2015-08-105-319/+620
| * | | | | | Make file action menu icon permanentVincent Petry2015-08-101-3/+5
| * | | | | | Implement file actions dropdownVincent Petry2015-08-1010-207/+501
* | | | | | | Merge pull request #17852 from owncloud/register-alias-factoryRobin McCorkell2015-08-115-15/+50
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | add test for factoriesBernhard Posselt2015-07-255-15/+50
* | | | | | | Merge pull request #17868 from owncloud/x-forwarded-forThomas Müller2015-08-116-9/+145
|\ \ \ \ \ \ \