977c49ae6d
Merge pull request #1081 from nextcloud/backport-660-config-path-from-env
...
[stable10] Allow the config dir to be specified via the enviroment
2016-08-26 14:56:31 +02:00
a076a0d17a
SetupController should use \OC::$configDir too
2016-08-26 12:31:57 +02:00
cc8b508987
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-08-26 12:31:43 +02:00
c8d90cca29
Merge pull request #1074 from nextcloud/backport-1050
...
Backport of fix internal links in security & setup warnings #1050
2016-08-26 09:39:46 +02:00
b4b175537d
Backport of fix internal links in security & setup warnings #1050
...
fix internal links in security & setup warnings, resolves #1048
adjust js tests
2016-08-26 00:25:50 +02:00
678fce3c18
Merge pull request #1045 from nextcloud/add-cache-buster-to-icons-css
...
[stable10] Add cachebuster to icons.css
2016-08-25 05:57:41 +02:00
72939ba69e
Merge pull request #1043 from nextcloud/increase-version-to-final
...
Increase version to 10.0 final
2016-08-25 05:45:36 +02:00
24d030a656
Add cachebuster to icons.css
2016-08-24 20:58:52 +02:00
cc35699dcb
Increase version to 10.0 final
2016-08-24 20:30:43 +02:00
43ce8b13c1
Merge pull request #1034 from nextcloud/stable10_1033
...
[Stable10] Fix theming autoloader magic
2016-08-24 14:17:51 +02:00
b59f5fc725
Require a ThemingDefaults class again
2016-08-24 13:25:26 +02:00
a046725321
Dark autoloader magic for ThemingDefaults
2016-08-24 13:25:16 +02:00
95fb14f5b0
Merge pull request #1029 from nextcloud/stable10_1013
...
[Stable10] Do not error on NotFoundException
2016-08-24 09:30:27 +02:00
4528bdabe7
Do not error on NotFoundException
...
Since this exception can be thrown when a shared file is in the
trashbin there is no need to spam the log like crazy.
Fixes #938
2016-08-24 08:17:28 +02:00
2ca5186c94
Merge pull request #993 from nextcloud/stable10-965
...
[stable10] Fix hidden files handling
2016-08-23 22:16:17 +02:00
805fc22276
Merge pull request #1008 from nextcloud/shared-storage-non-recursive-10
...
[10] Fix shared storage recursive setup
2016-08-23 22:15:21 +02:00
e5eff3c244
Merge pull request #1022 from nextcloud/backport-1005
...
[stable10] Do not error on maxUploadChange
2016-08-23 15:44:00 +02:00
fa980af53c
prevent infinite recursion while getting storage from mount
2016-08-23 13:59:01 +02:00
94b84f2d1e
Merge pull request #1021 from nextcloud/stable10-1017
...
Cache registered autoloaders
2016-08-23 12:24:36 +02:00
d2718b38ff
Backport of Do not error on maxUploadChange #1005 to stable10
...
Do not error on maxUploadChange
The new admin page broke the updating of the max upload size. This is
due to very old code there.
* Now update is done in the background using js
* Added proper route+controller to update
Fixes #994
put file handling into a section again
2016-08-23 11:39:44 +02:00
1c01728514
Cache registered autoloaders
...
This saves more than 20ms (!) on every request, the previous problem was that `\OC_App::registerAutoloading` calls `\OC\AppFramework\App::buildAppNamespace` which parses the appinfo.xml. Since that was also called multiple times (e.g. on cloud.nextcloud.com over 200 times) that had a significant performance impact. Also on simple PROPFIND requests.
https://blackfire.io/profiles/compare/65a53e6e-7f35-4974-b559-4c81abd01c3b/graph shows the difference nicely.
2016-08-23 11:21:42 +02:00
f4bb803564
Merge pull request #1009 from nextcloud/backport-995
...
[stable10] Backport Workflow section + hidden empty sections #995 to stabble10
2016-08-23 11:20:13 +02:00
2d3c29c66a
Merge pull request #1019 from nextcloud/stable10_956
...
[Stable10] When using permalinks don't error out if file id can't be found
2016-08-23 11:13:02 +02:00
53a3ec2f18
When requesting a permalink to an invalid file redirect
...
We need to do the redirect to update address bar.
2016-08-23 08:15:05 +02:00
ac9f75e1d9
When using permalinks don't error out if file id can't be found
...
Fixes #952
* Use only the index route (since it went to showFile anyways)
* Fix tests
* Use getUserFolder to force init of users mounts
2016-08-23 08:15:00 +02:00
ff2f5ecbf7
Backport Workflow section + hidden empty sections #995 to stabble10
...
add section to worklfowengine
enlist only registered sections that also have settings registered to
adjust test
Move admin settings to workflow section
fix wrong var name
Save the container with the app's namespace so we can resolve it
2016-08-22 16:37:48 +02:00
18f694b19f
Merge pull request #1012 from nextcloud/hide_tryLogin_params
...
[stable10] hide parameters of tryLogin when logging
2016-08-22 15:59:32 +02:00
e9e54f057a
Merge pull request #1010 from nextcloud/backport-1006
...
[stable10] fixes registering of theming settings where server return OC_Defaults
2016-08-22 15:08:56 +02:00
fa29ba1fce
hide parameters of tryLogin when logging
2016-08-22 14:33:23 +02:00
cc80df9e8e
Merge pull request #1001 from nextcloud/backport-969-allow-to-validate-operations
...
[stable10] Allow to validate operations
2016-08-22 13:43:17 +02:00
0f3513afff
fixes registering of theming settings where server return OC_Defaults instead of ThemingDefaults
2016-08-22 13:24:08 +02:00
58b810a547
handle failed shares
2016-08-22 12:41:16 +02:00
f4e89c15bf
Lazy init shared storage
2016-08-22 12:41:12 +02:00
89d4684ef1
reuse existing root id
2016-08-22 12:41:08 +02:00
a1fd9d275f
Allow jail wrappers to lazily initialize the source storage
2016-08-22 12:41:04 +02:00
2a2f1b9a00
Allow storage wrappers to lazily initialize the source storage
2016-08-22 12:40:16 +02:00
379260732c
Merge pull request #918 from nextcloud/stable10_891
...
[Stable10] [OC] Fix unmerged shares repair targetdecision
2016-08-22 12:09:27 +02:00
7bb91f15b8
Merge pull request #1003 from nextcloud/backport-978-add-feedback-for-password-change
...
[stable10] Add feedback for password change
2016-08-22 12:08:41 +02:00
efc480460b
Merge pull request #1002 from nextcloud/stable10_966
...
[Stable10] Make e-mail icon visible
2016-08-22 11:41:53 +02:00
f05cd64458
25532_issue_password_update_notification_updated ( #25756 )
...
* Password Update Notification
Added an IF ELSE statement to ensure that feedback is provided to the
user on successfully updating a user password in settings.
* Password Update Success Message
Updated the password update success message
2016-08-22 09:51:44 +02:00
f220e499c5
Make e-mail icon visible
...
Fixes #996
* Make mail icon visible
* Opacity to .5
* Add tooltip
2016-08-22 09:15:01 +02:00
4377d99662
Validate the operation
2016-08-22 09:03:47 +02:00
85813c42f9
System tags are not sharing but workflow
2016-08-22 09:01:00 +02:00
a1f1d2c9e8
Fix hidden files handling
...
Hidden files (dot files) are now always rendered in the DOM to make
sure that all file operations and selection still work as expected.
Their visibility is now toggled on CSS level.
2016-08-20 18:48:29 +02:00
d2afda0f04
Merge pull request #981 from nextcloud/stable10-backport-federation-icon
...
[stable10] Update federation and update notification icon
2016-08-19 20:40:32 +02:00
418eec83e0
use simple bell as update notification icon
2016-08-19 14:00:18 +02:00
71fa7a20af
Change federation icon to the share icon
2016-08-19 13:53:14 +02:00
a12ea5197b
Merge pull request #972 from nextcloud/stable10-backport-971
...
[stable10] Fix loading of ThemingDefaults
2016-08-19 13:34:32 +02:00
c41bd47c0d
Merge pull request #973 from nextcloud/stable10-959
...
[stable10] Update mimetypes
2016-08-19 13:13:50 +02:00
1f473c11a1
Merge pull request #966 from nextcloud/stable9-1-link-share
...
[stable10] In cases where the server dictates the link share expirat…
2016-08-19 12:39:17 +02:00
Lukas Reschke
Damjan Georgievski
Arthur Schiwon
Roeland Jago Douma
Roeland Jago Douma
Robin Appelman
Joas Schilling
Marius Blüm
Jack Davis
Vincent Petry
Morris Jobke
Julius Härtl