Commit Graph

12294 Commits

Author SHA1 Message Date
Morris Jobke 93047f5e4d Merge pull request #777 from nextcloud/ocs_capabilities
Move /cloud/capabilities and /cloud/user to Core
2016-08-10 00:43:13 +02:00
Lukas Reschke 9fbdb0efe8 Merge pull request #529 from nextcloud/vendor-maintenance-downgrade
Allow downgrades of maintenance accross vendors
2016-08-10 00:25:53 +02:00
Roeland Jago Douma e2f54559d6
Remove OC_OCS_Cloud and OC\OCS\Cloud 2016-08-09 20:56:31 +02:00
Roeland Jago Douma 02449c8336
Move getCapabilities over to Core 2016-08-09 20:56:31 +02:00
Roeland Jago Douma 575875e8d0
Allow OCS routes in Core and Settings 2016-08-09 20:56:31 +02:00
Lukas Reschke 5214b62d55 Merge pull request #691 from nextcloud/ocs_allow_all_old_routes
Allow ocs/v2.php/cloud/... routes
2016-08-09 20:52:49 +02:00
Lukas Reschke b4ed4e152e Merge pull request #746 from nextcloud/jail-root
getJailedPath expects $path to have a trailing /
2016-08-09 11:04:11 +02:00
Morris Jobke 4277051442 Merge pull request #660 from gdamjan/custom-config-dir
introduce NEXTCLOUD_CONFIG_DIR env variable (see #300)
2016-08-09 10:58:23 +02:00
Roeland Jago Douma 0032a5c2d1
Hanlde Core and Settings app in AppFramework
'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.
2016-08-08 20:48:16 +02:00
Roeland Jago Douma 63f6d2d558
Allow ocs/v2.php/cloud/... routes
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
2016-08-08 15:01:26 +02:00
Lukas Reschke fa352a81a5 Merge pull request #728 from nextcloud/update-styling
Design fixes for updates
2016-08-08 11:23:31 +02:00
Björn Schießle 727cd6aad0 Merge pull request #711 from nextcloud/password-policy-on-createUser
Apply password policy on user creation
2016-08-08 11:17:07 +02:00
Joas Schilling f37fa6e45c
Move Share backends to PSR-4 instead of using class path (#24941) 2016-08-05 14:13:41 +02:00
Thomas Müller f1cd68d713 Adding test case for getPathById including a jailed cache where root is just empty 2016-08-05 14:06:05 +02:00
Thomas Müller d252d79059 getJailedPath expects $path to have a trailing / - fixes #25464 2016-08-05 14:06:05 +02:00
Joas Schilling 84e6b8d9d0 Merge pull request #737 from nextcloud/blizzz-fix-name-console
Correct name in Console Application.php
2016-08-05 09:17:34 +02:00
Nextcloud bot c44c9a55f4
[tx-robot] updated from transifex 2016-08-05 00:10:09 +00:00
blizzz 329c714a7e Correct name in Console Application.php
see changes :)
2016-08-04 19:17:13 +02:00
Jan-Christoph Borchardt 835dc59d6a reduce info on update screens, introduce button to refresh 2016-08-04 12:48:25 +02:00
michag86 5fb39bd0cb Apply password policy on user creation 2016-08-03 11:52:15 +02:00
Vincent Petry 0c6352e095
Fix RepairUnmergedShares to not skip valid repair cases
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.
2016-08-03 10:16:28 +02:00
Vincent Petry 0c7c9a3b95
Adjust repair version check for unmerged shares 2016-08-03 10:16:28 +02:00
Vincent Petry 67fa6bf9bc
Add repair step for unmerged shares (WIP) 2016-08-03 10:16:28 +02:00
Christoph Wurst e90f00791d add invalidateOldTokens to IProvider interface 2016-08-02 12:08:13 +02:00
Lukas Reschke 8a7d450fb5 Merge pull request #684 from nextcloud/fix_csrf_ocs
Fix OCS CSRF
2016-08-01 11:52:56 +02:00
Nextcloud bot 8ef5fcec1d
[tx-robot] updated from transifex 2016-08-01 08:53:07 +00:00
Roeland Jago Douma 5c718b13b8
We should properly check for 'true' instaed of the bool 2016-08-01 08:52:50 +02:00
Nextcloud bot 50c8367041
[tx-robot] updated from transifex 2016-08-01 00:10:15 +00:00
Nextcloud bot 2a2526e1d1
[tx-robot] updated from transifex 2016-07-31 00:09:54 +00:00
Nextcloud bot 2565a39361
[tx-robot] updated from transifex 2016-07-30 00:11:16 +00:00
Damjan Georgievski 982bdb1823 introduce NEXTCLOUD_CONFIG_DIR env variable (see #300)
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`.
2016-07-29 17:49:14 +02:00
Roeland Jago Douma f7f5216aa3
Dark hackery to not always disable CSRF for OCS controllers 2016-07-29 15:49:27 +02:00
Morris Jobke 54ae8eede3 Merge pull request #556 from nextcloud/nextcloud-version-check
Allow apps to check for a given nextcloud version
2016-07-29 09:26:25 +02:00
Lukas Reschke d6c680051c Merge pull request #612 from nextcloud/improve-xml-loaded-version-handling
libxml - compare against loaded version
2016-07-28 11:26:06 +02:00
blizzz 73311091bf Merge pull request #519 from GitHubUser4234/master
New LDAPProvider for user_ldap
2016-07-28 10:14:34 +02:00
root bd65a17203 Nextcloud license header for new files 2016-07-28 15:13:00 +08:00
Morris Jobke 740349fda3
libxml - compare against loaded version
* 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
2016-07-28 08:30:33 +02:00
Roeland Jago Douma 8bdd0adcee
Support subdir in the OCS v2 endpoint
We should check against the ending substring since people could
run their nextcloud in a subfolder.

* Added test
2016-07-27 15:28:35 +02:00
Björn Schießle 10726dd00d Merge pull request #596 from nextcloud/adjust-mysql-install-error
Fix misleading MySQL DB creation error (#25485)
2016-07-27 14:34:07 +02:00
Joas Schilling 5bdb620af3 Merge pull request #582 from nextcloud/checks-from-js
Generate the checks list in JS
2016-07-27 13:59:03 +02:00
Joas Schilling da97a69148
Allow DI of the workflow manager by the OCP interface 2016-07-27 11:46:09 +02:00
Vincent Petry aeb4011279
Fix misleading MySQL DB creation error (#25485)
Whenever the GRANT ALL failed, it used to display "Database creation
failed" which is incorrect. It's only the privleges setting that failed.

This moves the privilege setting message to DEBUG and makes it more
precise.
2016-07-27 11:45:13 +02:00
Joas Schilling 681eebcfe6
Remove php side of check registration 2016-07-27 10:21:26 +02:00
Joas Schilling 318d68a9a9 Merge pull request #565 from nextcloud/workflowengine
Add workflowengine
2016-07-27 10:07:20 +02:00
Morris Jobke 72ae7520d7 Merge pull request #566 from nextcloud/setup-port
revert to old setup connection logic
2016-07-27 10:02:39 +02:00
root 2719dcabed Merge branch 'master' of https://github.com/nextcloud/server 2016-07-27 15:17:29 +08:00
root 32fb6beac3 final changes 2016-07-27 15:10:35 +08:00
Nextcloud bot 95a0714973
[tx-robot] updated from transifex 2016-07-27 00:09:48 +00:00
Joas Schilling 0fcc39cd8e
Translate the server version for nextcloud 2016-07-26 14:40:18 +02:00
Robin Appelman 0e83f5dbd7 revert to old setup connection logic 2016-07-26 11:44:15 +02:00