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
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
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
73311091bf
Merge pull request #519 from GitHubUser4234/master
...
New LDAPProvider for user_ldap
2016-07-28 10:14:34 +02:00
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
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
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
da97a69148
Allow DI of the workflow manager by the OCP interface
2016-07-27 11:46:09 +02:00
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
2719dcabed
Merge branch 'master' of https://github.com/nextcloud/server
2016-07-27 15:17:29 +08:00
0fcc39cd8e
Translate the server version for nextcloud
2016-07-26 14:40:18 +02:00
0e83f5dbd7
revert to old setup connection logic
2016-07-26 11:44:15 +02:00
352e24e703
Merge pull request #292 from nextcloud/recent-files
...
Add "Recent" file listing
2016-07-25 15:25:02 +01:00
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
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
4ad0c383ad
Merge pull request #523 from Faldon/master
...
Renamed file logging
2016-07-25 11:41:24 +02:00
686cb599b6
fix autoloading in LPAP integration tests, resolves #544
2016-07-25 11:05:59 +02:00
1fb080df2b
Merge branch 'master' of https://github.com/nextcloud/server
2016-07-25 16:56:14 +08:00
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
681ac9f19f
Check if an app provide two-factor-auth providers before we try to use them
2016-07-23 13:26:57 +02:00
8cea95390d
Make sure we try to autoload the class
2016-07-22 16:49:33 +02:00
81e103074e
use limit instead of since when listing recent files
2016-07-22 15:20:55 +02:00
b058639a8a
Changed code style and made use of '===' comparison.
2016-07-22 14:45:33 +02:00
e321ecd592
add recent files to node api
2016-07-22 14:39:32 +02:00
32f5073f9f
Reverted the default syslog tag to avoid breaking existing systems.
2016-07-22 14:38:44 +02:00
d499f68fd7
Fix storage id with storage jail
2016-07-22 14:34:59 +02:00
b543fd8d30
Set proper status code in OCS AppFramework Middleware
2016-07-22 12:53:47 +02:00
ba3f4f118e
Changed logtype to file instead of owncloud.
...
- Updated the config sample to point to log_type='file'
- Renamed the Class for logfile logging to File in namespace 'OC\Log\'.
Changed the occurrences of 'OC\Log\Owncloud' to 'OC\Log\File'.
- Renamed the Class for log:file command to File in namespace 'OC\Core\Command\Log\File'.
Changed registration of the command to use 'OC\Core\Command\Log\File'.
- Changed default Syslog tag to Nextcloud
- Retained backwards compatibility for configs with 'logtype' => 'owncloud'
- Adjusted tests for the new file log.
Closes #490 .
2016-07-22 11:44:19 +02:00
02ec8b1726
New LDAPProvider for user_ldap
2016-07-22 16:46:29 +08:00
1b73a63041
Inject parameters
2016-07-22 10:12:26 +02:00
8c7d7d7746
Merge pull request #507 from nextcloud/run-le-script
...
Update emails and license headers with latest changes
2016-07-21 23:27:15 +02:00
562e63cf69
Merge pull request #480 from nextcloud/fix_ocs_response_format
...
AppFramework default response for OCS is xml
2016-07-21 19:52:17 +02:00
0215b004da
Update with robin
2016-07-21 18:13:58 +02:00
ba87db3fcc
Fix others
2016-07-21 18:13:57 +02:00
4f42c3d725
Revert "Remove "Help" link from personal sidebar"
...
This reverts commit deef15a3c7
2016-07-21 02:25:00 +02:00
a9f2789df5
Fix typo
2016-07-21 02:23:42 +02:00
7c6896f091
Link to proper clients
2016-07-21 01:56:47 +02:00
19f770d0db
Port 2d373416d8 to master
2016-07-21 01:43:32 +02:00
977db0a162
Use proper certificates
...
Ports bcf693539b
2016-07-21 01:34:11 +02:00
9a1ff29351
Use proper documentation links
...
Since it is just faking the 10 we need to hardcode this here...
2016-07-21 00:36:52 +02:00
c385423d10
Merge pull request #479 from nextcloud/add-bruteforce-throttler
...
Implement brute force protection
2016-07-21 00:31:02 +02:00
c1589f163c
Mitigate race condition
2016-07-20 23:09:27 +02:00
adf67fac96
JSON encode the values
2016-07-20 22:47:33 +02:00
ba4f12baa0
Implement brute force protection
...
Class Throttler implements the bruteforce protection for security actions in
Nextcloud.
It is working by logging invalid login attempts to the database and slowing
down all login attempts from the same subnet. The max delay is 30 seconds and
the starting delay are 200 milliseconds. (after the first failed login)
2016-07-20 22:08:56 +02:00
e42f2f2650
AppFramework do not get default response
...
The OCSResponse differs from other responses in that it defaults to
XML. However we fell back to json by default.
This makes sure that if nothing is set we don't pass anything.
Which defaults then to the controllers default (which is often 'json')
but in the case of the OCSResponse 'xml'.
2016-07-20 22:05:43 +02:00
020a2a6958
Merge pull request #476 from nextcloud/port-same-site-cookies
...
[master] Port Same-Site Cookies to master
2016-07-20 21:35:02 +02:00
a17ba2f488
Merge pull request #466 from nextcloud/escape-special-characters
...
Escape special characters (#25429 )
2016-07-20 21:24:19 +02:00
ea47974a08
Add OCSMiddleware to catch OCS exceptions
...
* OCSException
* OCSBadRequestException
* OCSForbiddenException
* OCSNotFoundException
2016-07-20 20:03:49 +02:00
a299fa38a9
[master] Port Same-Site Cookies to master
...
Fixes https://github.com/nextcloud/server/issues/50
2016-07-20 18:37:57 +02:00
e9c85e02ac
Merge pull request #462 from nextcloud/master-explode
...
[master] Use explode() instead of split()
2016-07-20 18:31:11 +02:00
Damjan Georgievski
Morris Jobke
Lukas Reschke
blizzz
Roeland Jago Douma
Björn Schießle
Joas Schilling
Vincent Petry
root
Robin Appelman
William Bargent
Thomas Pulzer
root