summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Theming: Add OCA.Theming Js for app interactionJulius Haertl2016-08-104-0/+107
|
* Add css classes to allow app developers using the theming colorsJulius Haertl2016-08-092-0/+19
|
* Merge pull request #691 from nextcloud/ocs_allow_all_old_routesLukas Reschke2016-08-093-9/+15
|\ | | | | Allow ocs/v2.php/cloud/... routes
| * Allow ocs/v2.php/cloud/... routesRoeland Jago Douma2016-08-083-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_titleBjörn Schießle2016-08-091-2/+4
|\ \ | | | | | | Remove AGPL title
| * | Remove AGPL titleRoeland Jago Douma2016-08-091-2/+4
| | |
* | | Merge pull request #780 from nextcloud/copy_fed_cloud_idRoeland Jago Douma2016-08-093-1/+41
|\ \ \ | | | | | | | | Add clipboard action to Personal Settings Fed Cloud Id
| * | | Add clipboard action to Personal Settings Fed Cloud IdRoeland Jago Douma2016-08-093-1/+41
| |/ /
* | | Merge pull request #789 from nextcloud/padding_federationMarius Blüm2016-08-091-1/+0
|\ \ \ | | | | | | | | Padding of federated servers
| * | | Padding of federated serverRoeland Jago Douma2016-08-091-1/+0
| | | |
* | | | Merge pull request #786 from nextcloud/fix-backgroundjob-logsRoeland Jago Douma2016-08-091-2/+2
|\ \ \ \ | | | | | | | | | | log class name, ID only is hard to debug
| * | | | log class name, ID only is hard to debugJörn Friedrich Dreyer2016-08-091-2/+2
| |/ / /
* | | | Merge pull request #767 from nextcloud/federation-error-messagesMarius Blüm2016-08-094-15/+20
|\ \ \ \ | |/ / / |/| | | improve federation error messages
| * | | improve federation error messagesBjoern Schiessle2016-08-094-15/+20
| | | |
* | | | Merge pull request #779 from nextcloud/slideup_addtowebsiteBjörn Schießle2016-08-091-1/+5
|\ \ \ \ | | | | | | | | | | Make 'Add to your website' toggleable
| * | | | Make 'Add to your website' toggleableRoeland Jago Douma2016-08-091-1/+5
| | |/ / | |/| |
* | | | Merge pull request #750 from nextcloud/workflow-cleanupLukas Reschke2016-08-092-3/+14
|\ \ \ \ | | | | | | | | | | Workflow cleanup
| * | | | Allow a description for workflow sectionsJoas Schilling2016-08-051-0/+5
| | | | |
| * | | | Add placeholder to the name fieldJoas Schilling2016-08-051-1/+1
| | | | |
| * | | | Rename operations and checksJoas Schilling2016-08-051-2/+2
| | | | |
| * | | | Highlight the check row on hoverJoas Schilling2016-08-051-0/+4
| | | | |
| * | | | Add some space between the rule groupsJoas Schilling2016-08-051-0/+2
| | | | |
* | | | | Merge pull request #746 from nextcloud/jail-rootLukas Reschke2016-08-092-2/+14
|\ \ \ \ \ | | | | | | | | | | | | getJailedPath expects $path to have a trailing /
| * | | | | Adding test case for getPathById including a jailed cache where root is just ↵Thomas Müller2016-08-052-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | 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-094-4/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | introduce NEXTCLOUD_CONFIG_DIR env variable (see #300)
| * | | | | SetupController should use \OC::$configDir tooDamjan Georgievski2016-08-021-1/+1
| | | | | |
| * | | | | introduce NEXTCLOUD_CONFIG_DIR env variable (see #300)Damjan Georgievski2016-07-293-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 transifexNextcloud bot2016-08-09174-526/+150
| | | | | |
* | | | | | 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
| | |_|/ / | |/| | |