summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #774 from nextcloud/di_core_settingsLukas Reschke2016-08-082-1/+58
|\ | | | | Hanlde Core and Settings app in AppFramework
| * Hanlde Core and Settings app in AppFrameworkRoeland Jago Douma2016-08-082-1/+58
| | | | | | | | | | | | 'core' and 'settings' are just apps but we treat them slightly different. Make sure that we construct the correct namespace so we can actually do automatic AppFramework stuff.
* | Merge pull request #764 from nextcloud/fix-tags-iconMarius Blüm2016-08-082-1/+1
|\ \ | |/ |/| Add black version of system tags icon
| * Add black version of system tags iconBugsbane2016-08-082-1/+1
| | | | | | Includes PNG (16x16px) and SVG (scoured) versions in black, to be uniform with the other icon files.
* | Merge pull request #769 from nextcloud/also-cache-fonts-svg-and-gifLukas Reschke2016-08-081-2/+2
|\ \ | | | | | | Also cache WOFF, SVG and GIF
| * | Also cache WOFF, SVG and GIFLukas Reschke2016-08-081-2/+2
| | |
* | | Merge pull request #739 from nextcloud/increment-versions-masterMorris Jobke2016-08-0819-24/+22
|\ \ \ | |/ / |/| | Increment the versions and adjust the capitilization
| * | Fix intergration test for admin_auditRoeland Jago Douma2016-08-081-1/+0
| | |
| * | Disable by defaultJoas Schilling2016-08-081-1/+0
| | |
| * | More casingJoas Schilling2016-08-084-6/+6
| | |
| * | Increment the versions and adjust the capitilizationJoas Schilling2016-08-0814-17/+17
|/ /
* | Merge pull request #445 from nextcloud/ocs_share_to_appframeworkLukas Reschke2016-08-0811-609/+722
|\ \ | | | | | | OCS Share API to appframework
| * | Add OCS-APIREQUEST header to intergration test callsRoeland Jago Douma2016-08-053-3/+29
| | |
| * | Fix testsRoeland Jago Douma2016-08-053-399/+365
| | |
| * | Add OCSShareAPIMiddleware testsRoeland Jago Douma2016-08-052-1/+115
| | |
| * | DataResponse required ['data' => DATA]Roeland Jago Douma2016-08-051-9/+9
| | |
| * | More exceptionsRoeland Jago Douma2016-08-051-57/+24
| | |
| * | Add OCSShareAPIMiddlewareRoeland Jago Douma2016-08-053-75/+86
| | | | | | | | | | | | | | | * This will cleanup the locks after each request * Move check for enabled share api to the middleware
| * | Throw OCSNotFoundExceptionsRoeland Jago Douma2016-08-051-91/+40
| | |
| * | Remove unneeded wrapperRoeland Jago Douma2016-08-051-64/+0
| | |
| * | Convert Share API to use the AppFrameworkRoeland Jago Douma2016-08-053-87/+231
| | |
* | | Merge pull request #752 from nextcloud/disbale_failing_testLukas Reschke2016-08-081-14/+14
|\ \ \ | | | | | | | | Disbale failing intergration test for now
| * | | Disbale failing intergration test for nowRoeland Jago Douma2016-08-051-14/+14
| |/ / | | | | | | | | | | | | | | | I have not been able to reproduce this failure locally yet. But it seems to happen often on CI. So disable for now.
* | | Merge pull request #728 from nextcloud/update-stylingLukas Reschke2016-08-086-19/+27
|\ \ \ | | | | | | | | Design fixes for updates
| * | | reduce info on update screens, introduce button to refreshJan-Christoph Borchardt2016-08-046-16/+19
| | | |
| * | | switch nested containers in update to semibold styleJan-Christoph Borchardt2016-08-032-3/+8
| | | |
* | | | Merge pull request #711 from nextcloud/password-policy-on-createUserBjörn Schießle2016-08-081-0/+2
|\ \ \ \ | |_|_|/ |/| | | Apply password policy on user creation
| * | | Apply password policy on user creationmichag862016-08-031-0/+2
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2016-08-076-16/+16
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2016-08-0626-82/+202
| | | |
* | | | Merge pull request #747 from nextcloud/up_24941Roeland Jago Douma2016-08-056-10/+12
|\ \ \ \ | | | | | | | | | | Move Share backends to PSR-4 instead of using class path (#24941)
| * | | | Move Share backends to PSR-4 instead of using class path (#24941)Joas Schilling2016-08-056-10/+12
| | |_|/ | |/| |
* | | | Merge pull request #732 from nextcloud/fix-shipped.jsonRoeland Jago Douma2016-08-051-6/+4
|\ \ \ \ | |/ / / |/| | | Order alphabetically and deduplicate the shipped.json
| * | | Order alphabetically and deduplicate the shipped.jsonJoas Schilling2016-08-041-6/+4
| | | |
* | | | Merge pull request #737 from nextcloud/blizzz-fix-name-consoleJoas Schilling2016-08-051-3/+3
|\ \ \ \ | | | | | | | | | | Correct name in Console Application.php
| * | | | Correct name in Console Application.phpblizzz2016-08-041-3/+3
| | | | | | | | | | | | | | | see changes :)
* | | | | [tx-robot] updated from transifexNextcloud bot2016-08-0530-30/+232
| | | | |
* | | | | Merge pull request #465 from nextcloud/fix_smb_attributesMorris Jobke2016-08-041-0/+13
|\ \ \ \ \ | |/ / / / |/| | | | Fix file permissions for SMB (read-only folders will be writeable) (#…
| * | | | Fix file permissions for SMB (read-only folders will be writeable) (#25301)Juan Pablo Villafañez2016-07-201-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix file permissions for SMB (read-only folders will be writeable) * Read-only folders won't be deletable * Added comment for the read-only behaviour for folders
* | | | | Merge pull request #729 from nextcloud/fix-724Joas Schilling2016-08-041-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Fix #724 by using step instead of job
| * | | | fix #724 by using step instead of jobBernhard Posselt2016-08-041-2/+2
| | | | |
* | | | | Merge pull request #730 from nextcloud/add-new-apps-as-officialLukas Reschke2016-08-041-1/+6
|\ \ \ \ \ | |/ / / / |/| | | | [master] Add new apps as official
| * | | | [master] Add new apps as officialLukas Reschke2016-08-041-1/+6
|/ / / /
* | | | Merge pull request #718 from jurgenhaas/patch-1Joas Schilling2016-08-041-1/+1
|\ \ \ \ | | | | | | | | | | Exit from upgrade without reporting error
| * | | | Exit from upgrade without reporting errorJürgen Haas2016-08-031-1/+1
| | |_|/ | |/| | | | | | As reported at https://help.nextcloud.com/t/silent-mode-for-occ-upgrade/2120 we should exit with a return value of 0 (zero) if the current instance is already up to date so that automatic deployment tools don't recognize that as an error.
* | | | [tx-robot] updated from transifexNextcloud bot2016-08-0416-50/+52
| | | |
* | | | Merge pull request #717 from nextcloud/mark-apps-as-shippedJoas Schilling2016-08-031-0/+2
|\ \ \ \ | |/ / / |/| | | Add access control and automated tagging as shipped
| * | | Add access control and automated tagging as shippedJoas Schilling2016-08-031-0/+2
|/ / /
* | | Merge pull request #611 from nextcloud/add-more-checksJoas Schilling2016-08-0326-33/+2207
|\ \ \ | |_|/ |/| | Add more checks
| * | OoopsJoas Schilling2016-08-021-1/+0
| | |