Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-08-13 | 4 | -4/+30 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-08-12 | 2 | -2/+18 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-08-11 | 2 | -2/+2 |
| | |||||
* | Merge pull request #807 from nextcloud/ocs_dataresponse | Roeland Jago Douma | 2016-08-10 | 1 | -11/+4 |
|\ | | | | | OCSController requires DataResponse | ||||
| * | OCSController requires DataResponse | Roeland Jago Douma | 2016-08-10 | 1 | -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-cachethepropagatorinstance | Lukas Reschke | 2016-08-10 | 1 | -4/+6 |
|\ \ | | | | | | | Store the shared propagator instance | ||||
| * | | Store the shared propagator instance | Vincent Petry | 2016-08-10 | 1 | -4/+6 |
| |/ | | | | | | | This instead of recreating it for every call. | ||||
* | | Merge pull request #820 from nextcloud/shared-storage-lazy-numeric-id | Björn Schießle | 2016-08-10 | 3 | -5/+16 |
|\ \ | |/ |/| | get shared storage storage id without setting up the storage | ||||
| * | get shared storage storage id without setting up the storage | Robin Appelman | 2016-08-09 | 3 | -5/+16 |
| | | |||||
* | | Merge pull request #777 from nextcloud/ocs_capabilities | Morris Jobke | 2016-08-10 | 3 | -83/+5 |
|\ \ | | | | | | | Move /cloud/capabilities and /cloud/user to Core | ||||
| * | | Remove OC_OCS_Cloud and OC\OCS\Cloud | Roeland Jago Douma | 2016-08-09 | 2 | -67/+0 |
| | | | |||||
| * | | Move getCapabilities over to Core | Roeland Jago Douma | 2016-08-09 | 1 | -16/+0 |
| | | | |||||
| * | | Allow OCS routes in Core and Settings | Roeland Jago Douma | 2016-08-09 | 1 | -0/+5 |
| | | | |||||
* | | | Merge pull request #529 from nextcloud/vendor-maintenance-downgrade | Lukas Reschke | 2016-08-10 | 2 | -2/+29 |
|\ \ \ | |/ / |/| | | Allow downgrades of maintenance accross vendors | ||||
| * | | Allow downgrades of maintenance accross vendors | Joas Schilling | 2016-07-22 | 2 | -2/+29 |
| | | | |||||
* | | | Merge pull request #691 from nextcloud/ocs_allow_all_old_routes | Lukas Reschke | 2016-08-09 | 2 | -2/+8 |
|\ \ \ | |_|/ |/| | | Allow ocs/v2.php/cloud/... routes | ||||
| * | | Allow ocs/v2.php/cloud/... routes | Roeland Jago Douma | 2016-08-08 | 2 | -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-root | Lukas Reschke | 2016-08-09 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | getJailedPath expects $path to have a trailing / | ||||
| * | | | Adding test case for getPathById including a jailed cache where root is just ↵ | Thomas Müller | 2016-08-05 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | empty | ||||
| * | | | getJailedPath expects $path to have a trailing / - fixes #25464 | Thomas Müller | 2016-08-05 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #660 from gdamjan/custom-config-dir | Morris Jobke | 2016-08-09 | 2 | -2/+4 |
|\ \ \ \ | | | | | | | | | | | introduce NEXTCLOUD_CONFIG_DIR env variable (see #300) | ||||
| * | | | | introduce NEXTCLOUD_CONFIG_DIR env variable (see #300) | Damjan Georgievski | 2016-07-29 | 2 | -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 AppFramework | Roeland Jago Douma | 2016-08-08 | 1 | -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-styling | Lukas Reschke | 2016-08-08 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Design fixes for updates | ||||
| * | | | | reduce info on update screens, introduce button to refresh | Jan-Christoph Borchardt | 2016-08-04 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #711 from nextcloud/password-policy-on-createUser | Björn Schießle | 2016-08-08 | 1 | -0/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Apply password policy on user creation | ||||
| * | | | | | Apply password policy on user creation | michag86 | 2016-08-03 | 1 | -0/+2 |
| |/ / / / | |||||
* | | / / | Move Share backends to PSR-4 instead of using class path (#24941) | Joas Schilling | 2016-08-05 | 1 | -1/+1 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #737 from nextcloud/blizzz-fix-name-console | Joas Schilling | 2016-08-05 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Correct name in Console Application.php | ||||
| * | | | | Correct name in Console Application.php | blizzz | 2016-08-04 | 1 | -3/+3 |
| |/ / / | | | | | | | | | see changes :) | ||||
* / / / | [tx-robot] updated from transifex | Nextcloud bot | 2016-08-05 | 2 | -0/+30 |
|/ / / | |||||
* | | | Fix RepairUnmergedShares to not skip valid repair cases | Vincent Petry | 2016-08-03 | 1 | -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 shares | Vincent Petry | 2016-08-03 | 1 | -1/+1 |
| | | | |||||
* | | | Add repair step for unmerged shares (WIP) | Vincent Petry | 2016-08-03 | 2 | -0/+330 |
| | | | |||||
* | | | add invalidateOldTokens to IProvider interface | Christoph Wurst | 2016-08-02 | 2 | -3/+7 |
| | | | |||||
* | | | Merge pull request #684 from nextcloud/fix_csrf_ocs | Lukas Reschke | 2016-08-01 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix OCS CSRF | ||||
| * | | | We should properly check for 'true' instaed of the bool | Roeland Jago Douma | 2016-08-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-08-01 | 2 | -0/+44 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-08-01 | 4 | -0/+4 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-31 | 2 | -2/+4 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-30 | 8 | -26/+98 |
| | | | |||||
* | | | Dark hackery to not always disable CSRF for OCS controllers | Roeland Jago Douma | 2016-07-29 | 1 | -2/+10 |
|/ / | |||||
* | | Merge pull request #556 from nextcloud/nextcloud-version-check | Morris Jobke | 2016-07-29 | 1 | -2/+24 |
|\ \ | | | | | | | Allow apps to check for a given nextcloud version | ||||
| * | | Translate the server version for nextcloud | Joas Schilling | 2016-07-26 | 1 | -2/+24 |
| | | | |||||
* | | | Merge pull request #612 from nextcloud/improve-xml-loaded-version-handling | Lukas Reschke | 2016-07-28 | 1 | -2/+8 |
|\ \ \ | | | | | | | | | libxml - compare against loaded version | ||||
| * | | | libxml - compare against loaded version | Morris Jobke | 2016-07-28 | 1 | -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/master | blizzz | 2016-07-28 | 4 | -0/+222 |
|\ \ \ \ | |/ / / |/| | | | New LDAPProvider for user_ldap | ||||
| * | | | Nextcloud license header for new files | root | 2016-07-28 | 3 | -24/+31 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/nextcloud/server | root | 2016-07-27 | 12 | -7/+117 |
| |\ \ \ | |||||
| * | | | | final changes | root | 2016-07-27 | 3 | -13/+10 |
| | | | | |