summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-08-134-4/+30
|
* [tx-robot] updated from transifexNextcloud bot2016-08-122-2/+18
|
* [tx-robot] updated from transifexNextcloud bot2016-08-112-2/+2
|
* Merge pull request #807 from nextcloud/ocs_dataresponseRoeland Jago Douma2016-08-101-11/+4
|\ | | | | OCSController requires DataResponse
| * OCSController requires DataResponseRoeland Jago Douma2016-08-101-11/+4
| | | | | | | | | | | | The OCS Controller requires a DataResponse object to be returned. This means that all error handling will have to be done via exceptions thrown and handling in the middleware.
* | Merge pull request #810 from nextcloud/shared-cachethepropagatorinstanceLukas Reschke2016-08-101-4/+6
|\ \ | | | | | | Store the shared propagator instance
| * | Store the shared propagator instanceVincent Petry2016-08-101-4/+6
| |/ | | | | | | This instead of recreating it for every call.
* | Merge pull request #820 from nextcloud/shared-storage-lazy-numeric-idBjörn Schießle2016-08-103-5/+16
|\ \ | |/ |/| get shared storage storage id without setting up the storage
| * get shared storage storage id without setting up the storageRobin Appelman2016-08-093-5/+16
| |
* | Merge pull request #777 from nextcloud/ocs_capabilitiesMorris Jobke2016-08-103-83/+5
|\ \ | | | | | | Move /cloud/capabilities and /cloud/user to Core
| * | Remove OC_OCS_Cloud and OC\OCS\CloudRoeland Jago Douma2016-08-092-67/+0
| | |
| * | Move getCapabilities over to CoreRoeland Jago Douma2016-08-091-16/+0
| | |
| * | Allow OCS routes in Core and SettingsRoeland Jago Douma2016-08-091-0/+5
| | |
* | | Merge pull request #529 from nextcloud/vendor-maintenance-downgradeLukas Reschke2016-08-102-2/+29
|\ \ \ | |/ / |/| | Allow downgrades of maintenance accross vendors
| * | Allow downgrades of maintenance accross vendorsJoas Schilling2016-07-222-2/+29
| | |
* | | Merge pull request #691 from nextcloud/ocs_allow_all_old_routesLukas Reschke2016-08-092-2/+8
|\ \ \ | |_|/ |/| | Allow ocs/v2.php/cloud/... routes
| * | Allow ocs/v2.php/cloud/... routesRoeland Jago Douma2016-08-082-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the possibilities of the old OCS API is that you can define the url yourself. This PR makes this possible again by adding an optional root elemenet to the route. Routes are thus: .../ocs/v2.php/<root>/<url> By default <root> = apps/<app> This will allow for example the provisioning API etc to be in ../ovs/v2/php/cloud/users
* | | Merge pull request #746 from nextcloud/jail-rootLukas Reschke2016-08-091-0/+3
|\ \ \ | | | | | | | | getJailedPath expects $path to have a trailing /
| * | | Adding test case for getPathById including a jailed cache where root is just ↵Thomas Müller2016-08-051-1/+3
| | | | | | | | | | | | | | | | empty
| * | | getJailedPath expects $path to have a trailing / - fixes #25464Thomas Müller2016-08-051-0/+1
| | | |
* | | | Merge pull request #660 from gdamjan/custom-config-dirMorris Jobke2016-08-092-2/+4
|\ \ \ \ | | | | | | | | | | introduce NEXTCLOUD_CONFIG_DIR env variable (see #300)
| * | | | introduce NEXTCLOUD_CONFIG_DIR env variable (see #300)Damjan Georgievski2016-07-292-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud by default uses the `/config/` directory in the source/application tree for its config file(s). with this commit that directory can be overridden by the `NEXTCLOUD_CONFIG_DIR` environment variable. in uwsgi, you would use the option `--env "NEXTCLOUD_CONFIG_DIR=/tmp/nx-config/"` in apache `SetENV …` and the cli command can be run with: `NEXTCLOUD_CONFIG_DIR=/tmp/nx-config ./occ` (or just use `export` once in the shell). NEXTCLOUD_CONFIG_DIR can be supplied with or without the trailing slash (`/`), but in all cases `$configDir` will have it automatically added if needed. The other changes are several occurrences of `OC::$SERVERROOT . '/config'` to `OC::$configDir`.
* | | | | Hanlde Core and Settings app in AppFrameworkRoeland Jago Douma2016-08-081-1/+7
| |_|/ / |/| | | | | | | | | | | | | | | | | | | '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 #728 from nextcloud/update-stylingLukas Reschke2016-08-081-2/+2
|\ \ \ \ | | | | | | | | | | Design fixes for updates
| * | | | reduce info on update screens, introduce button to refreshJan-Christoph Borchardt2016-08-041-2/+2
| | | | |
* | | | | 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
| |/ / / /
* | | / / Move Share backends to PSR-4 instead of using class path (#24941)Joas Schilling2016-08-051-1/+1
| |_|/ / |/| | |
* | | | 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-052-0/+30
|/ / /
* | | Fix RepairUnmergedShares to not skip valid repair casesVincent Petry2016-08-031-11/+16
| | | | | | | | | | | | | | | | | | The repair step was a bit overeager to skip repairing so it missed the case where a group share exists without subshares but with an additional direct user share.
* | | Adjust repair version check for unmerged sharesVincent Petry2016-08-031-1/+1
| | |
* | | Add repair step for unmerged shares (WIP)Vincent Petry2016-08-032-0/+330
| | |
* | | add invalidateOldTokens to IProvider interfaceChristoph Wurst2016-08-022-3/+7
| | |
* | | Merge pull request #684 from nextcloud/fix_csrf_ocsLukas Reschke2016-08-011-1/+1
|\ \ \ | | | | | | | | Fix OCS CSRF
| * | | We should properly check for 'true' instaed of the boolRoeland Jago Douma2016-08-011-1/+1
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2016-08-012-0/+44
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2016-08-014-0/+4
| | |
* | | [tx-robot] updated from transifexNextcloud bot2016-07-312-2/+4
| | |
* | | [tx-robot] updated from transifexNextcloud bot2016-07-308-26/+98
| | |
* | | Dark hackery to not always disable CSRF for OCS controllersRoeland Jago Douma2016-07-291-2/+10
|/ /
* | Merge pull request #556 from nextcloud/nextcloud-version-checkMorris Jobke2016-07-291-2/+24
|\ \ | | | | | | Allow apps to check for a given nextcloud version
| * | Translate the server version for nextcloudJoas Schilling2016-07-261-2/+24
| | |
* | | Merge pull request #612 from nextcloud/improve-xml-loaded-version-handlingLukas Reschke2016-07-281-2/+8
|\ \ \ | | | | | | | | libxml - compare against loaded version
| * | | libxml - compare against loaded versionMorris Jobke2016-07-281-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * if the compiled in version is older than the loaded version Nextcloud doesn't work * uses the loaded libxml version to check against fixes #205
* | | | Merge pull request #519 from GitHubUser4234/masterblizzz2016-07-284-0/+222
|\ \ \ \ | |/ / / |/| | | New LDAPProvider for user_ldap
| * | | Nextcloud license header for new filesroot2016-07-283-24/+31
| | | |
| * | | Merge branch 'master' of https://github.com/nextcloud/serverroot2016-07-2712-7/+117
| |\ \ \
| * | | | final changesroot2016-07-273-13/+10
| | | | |