Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Theming: Add OCA.Theming Js for app interaction | Julius Haertl | 2016-08-10 | 4 | -0/+107 |
| | |||||
* | Add css classes to allow app developers using the theming colors | Julius Haertl | 2016-08-09 | 2 | -0/+19 |
| | |||||
* | Merge pull request #691 from nextcloud/ocs_allow_all_old_routes | Lukas Reschke | 2016-08-09 | 3 | -9/+15 |
|\ | | | | | Allow ocs/v2.php/cloud/... routes | ||||
| * | Allow ocs/v2.php/cloud/... routes | Roeland Jago Douma | 2016-08-08 | 3 | -9/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #781 from nextcloud/personal_licence_title | Björn Schießle | 2016-08-09 | 1 | -2/+4 |
|\ \ | | | | | | | Remove AGPL title | ||||
| * | | Remove AGPL title | Roeland Jago Douma | 2016-08-09 | 1 | -2/+4 |
| | | | |||||
* | | | Merge pull request #780 from nextcloud/copy_fed_cloud_id | Roeland Jago Douma | 2016-08-09 | 3 | -1/+41 |
|\ \ \ | | | | | | | | | Add clipboard action to Personal Settings Fed Cloud Id | ||||
| * | | | Add clipboard action to Personal Settings Fed Cloud Id | Roeland Jago Douma | 2016-08-09 | 3 | -1/+41 |
| |/ / | |||||
* | | | Merge pull request #789 from nextcloud/padding_federation | Marius Blüm | 2016-08-09 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | Padding of federated servers | ||||
| * | | | Padding of federated server | Roeland Jago Douma | 2016-08-09 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge pull request #786 from nextcloud/fix-backgroundjob-logs | Roeland Jago Douma | 2016-08-09 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | log class name, ID only is hard to debug | ||||
| * | | | | log class name, ID only is hard to debug | Jörn Friedrich Dreyer | 2016-08-09 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge pull request #767 from nextcloud/federation-error-messages | Marius Blüm | 2016-08-09 | 4 | -15/+20 |
|\ \ \ \ | |/ / / |/| | | | improve federation error messages | ||||
| * | | | improve federation error messages | Bjoern Schiessle | 2016-08-09 | 4 | -15/+20 |
| | | | | |||||
* | | | | Merge pull request #779 from nextcloud/slideup_addtowebsite | Björn Schießle | 2016-08-09 | 1 | -1/+5 |
|\ \ \ \ | | | | | | | | | | | Make 'Add to your website' toggleable | ||||
| * | | | | Make 'Add to your website' toggleable | Roeland Jago Douma | 2016-08-09 | 1 | -1/+5 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #750 from nextcloud/workflow-cleanup | Lukas Reschke | 2016-08-09 | 2 | -3/+14 |
|\ \ \ \ | | | | | | | | | | | Workflow cleanup | ||||
| * | | | | Allow a description for workflow sections | Joas Schilling | 2016-08-05 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Add placeholder to the name field | Joas Schilling | 2016-08-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Rename operations and checks | Joas Schilling | 2016-08-05 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Highlight the check row on hover | Joas Schilling | 2016-08-05 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Add some space between the rule groups | Joas Schilling | 2016-08-05 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge pull request #746 from nextcloud/jail-root | Lukas Reschke | 2016-08-09 | 2 | -2/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | 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 | 2 | -3/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -4/+6 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | introduce NEXTCLOUD_CONFIG_DIR env variable (see #300) | ||||
| * | | | | | SetupController should use \OC::$configDir too | Damjan Georgievski | 2016-08-02 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | introduce NEXTCLOUD_CONFIG_DIR env variable (see #300) | Damjan Georgievski | 2016-07-29 | 3 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`. | ||||
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-08-09 | 174 | -526/+150 |
| | | | | | | |||||
* | | | | | | Merge pull request #774 from nextcloud/di_core_settings | Lukas Reschke | 2016-08-08 | 2 | -1/+58 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Hanlde Core and Settings app in AppFramework | ||||
| * | | | | | | Hanlde Core and Settings app in AppFramework | Roeland Jago Douma | 2016-08-08 | 2 | -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-icon | Marius Blüm | 2016-08-08 | 2 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Add black version of system tags icon | ||||
| * | | | | | | Add black version of system tags icon | Bugsbane | 2016-08-08 | 2 | -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-gif | Lukas Reschke | 2016-08-08 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Also cache WOFF, SVG and GIF | ||||
| * | | | | | | | Also cache WOFF, SVG and GIF | Lukas Reschke | 2016-08-08 | 1 | -2/+2 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #739 from nextcloud/increment-versions-master | Morris Jobke | 2016-08-08 | 19 | -24/+22 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Increment the versions and adjust the capitilization | ||||
| * | | | | | | Fix intergration test for admin_audit | Roeland Jago Douma | 2016-08-08 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Disable by default | Joas Schilling | 2016-08-08 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | More casing | Joas Schilling | 2016-08-08 | 4 | -6/+6 |
| | | | | | | | |||||
| * | | | | | | Increment the versions and adjust the capitilization | Joas Schilling | 2016-08-08 | 14 | -17/+17 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #445 from nextcloud/ocs_share_to_appframework | Lukas Reschke | 2016-08-08 | 11 | -609/+722 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | OCS Share API to appframework | ||||
| * | | | | | Add OCS-APIREQUEST header to intergration test calls | Roeland Jago Douma | 2016-08-05 | 3 | -3/+29 |
| | | | | | | |||||
| * | | | | | Fix tests | Roeland Jago Douma | 2016-08-05 | 3 | -399/+365 |
| | | | | | | |||||
| * | | | | | Add OCSShareAPIMiddleware tests | Roeland Jago Douma | 2016-08-05 | 2 | -1/+115 |
| | | | | | | |||||
| * | | | | | DataResponse required ['data' => DATA] | Roeland Jago Douma | 2016-08-05 | 1 | -9/+9 |
| | | | | | | |||||
| * | | | | | More exceptions | Roeland Jago Douma | 2016-08-05 | 1 | -57/+24 |
| | | | | | | |||||
| * | | | | | Add OCSShareAPIMiddleware | Roeland Jago Douma | 2016-08-05 | 3 | -75/+86 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This will cleanup the locks after each request * Move check for enabled share api to the middleware | ||||
| * | | | | | Throw OCSNotFoundExceptions | Roeland Jago Douma | 2016-08-05 | 1 | -91/+40 |
| | | | | | | |||||
| * | | | | | Remove unneeded wrapper | Roeland Jago Douma | 2016-08-05 | 1 | -64/+0 |
| | | | | | | |||||
| * | | | | | Convert Share API to use the AppFramework | Roeland Jago Douma | 2016-08-05 | 3 | -87/+231 |
| | |_|/ / | |/| | | |