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
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
blizzz
329c714a7e
Correct name in Console Application.php
...
see changes :)
2016-08-04 19:17:13 +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
Roeland Jago Douma
5c718b13b8
We should properly check for 'true' instaed of the bool
2016-08-01 08:52:50 +02: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
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
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
root
2719dcabed
Merge branch 'master' of https://github.com/nextcloud/server
2016-07-27 15:17:29 +08: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
William Bargent
352e24e703
Merge pull request #292 from nextcloud/recent-files
...
Add "Recent" file listing
2016-07-25 15:25:02 +01:00
Morris Jobke
e51afa1684
Merge pull request #509 from nextcloud/appframework_magic_allow_default_vars
...
AppFramework add default values (ApiController) as parameters
2016-07-25 13:18:53 +02:00
Morris Jobke
88cbde6a66
Merge pull request #550 from nextcloud/ldap-integration-test-autoloader
...
fix autoloading in LPAP integration tests, resolves #544
2016-07-25 12:54:50 +02:00
Joas Schilling
4ad0c383ad
Merge pull request #523 from Faldon/master
...
Renamed file logging
2016-07-25 11:41:24 +02:00
Arthur Schiwon
686cb599b6
fix autoloading in LPAP integration tests, resolves #544
2016-07-25 11:05:59 +02:00
root
1fb080df2b
Merge branch 'master' of https://github.com/nextcloud/server
2016-07-25 16:56:14 +08:00
Morris Jobke
de4236bc4a
Merge pull request #530 from nextcloud/fix-theme-loading
...
Make sure we try to autoload the class
2016-07-25 08:37:13 +02:00
Robin Appelman
681ac9f19f
Check if an app provide two-factor-auth providers before we try to use them
2016-07-23 13:26:57 +02:00
Joas Schilling
8cea95390d
Make sure we try to autoload the class
2016-07-22 16:49:33 +02:00
Robin Appelman
81e103074e
use limit instead of since when listing recent files
2016-07-22 15:20:55 +02:00
Joas Schilling
5c34346479
Allow downgrades of maintenance accross vendors
2016-07-22 14:51:43 +02:00
Thomas Pulzer
b058639a8a
Changed code style and made use of '===' comparison.
2016-07-22 14:45:33 +02:00
Robin Appelman
e321ecd592
add recent files to node api
2016-07-22 14:39:32 +02:00
Thomas Pulzer
32f5073f9f
Reverted the default syslog tag to avoid breaking existing systems.
2016-07-22 14:38:44 +02:00
Robin Appelman
d499f68fd7
Fix storage id with storage jail
2016-07-22 14:34:59 +02:00
Roeland Jago Douma
b543fd8d30
Set proper status code in OCS AppFramework Middleware
2016-07-22 12:53:47 +02:00