62c89213f4
Merge pull request #1181 from nextcloud/backport-870-oracle-support
...
[stable10] Fix oracle support of external storage app
2016-08-31 15:15:07 +02:00
5fae9e2bbe
Merge pull request #1207 from nextcloud/backport-1190-addressbook-correctly-handle-multi-values
...
[stable10] Correctly handle multi-values when converting VCards to array
2016-08-31 15:08:18 +02:00
782c3138c9
Merge pull request #1200 from nextcloud/stable9.1-usermountcache-orphanedshare
...
[stable10] Prevent error with orphaned shares when updating user mount cache
2016-08-31 15:07:40 +02:00
e39cf78c52
Merge pull request #1206 from nextcloud/stable9.1-integration_tests_local_external_storage
...
[Stable10] integration tests local external storage
2016-08-31 13:54:24 +02:00
50f40d9889
Merge pull request #1209 from nextcloud/fix-vendor-in-php-warning
...
Fix vendor name in PHP version warning
2016-08-31 13:54:07 +02:00
dcebcbc9c6
Fix vendor name in PHP version warning
2016-08-31 12:28:10 +02:00
1c61e749ab
Add a unit test for all the magic
2016-08-31 12:07:19 +02:00
25e9d67d52
Correctly handle multi-values when converting VCards to array
2016-08-31 12:07:10 +02:00
a5b9dc8c08
Changed enabled/disabled app in provisioning api tests
2016-08-31 11:43:00 +02:00
8293735108
External storage was not enabled and content was not deleted before scenarios
...
Conflicts:
build/integration/features/bootstrap/BasicStructure.php
build/integration/run.sh
2016-08-31 11:41:29 +02:00
0ec695e2d7
Added local_storage folder
2016-08-31 11:41:25 +02:00
bf4415c1f6
Run as current user
...
Conflicts:
build/integration/run.sh
2016-08-31 11:41:18 +02:00
6b9a7d3ad9
Removed extra context added needed option and remove storage after external storage scenarios
...
Conflicts:
build/integration/features/bootstrap/BasicStructure.php
build/integration/run.sh
2016-08-31 11:41:13 +02:00
d318c90ef7
Added feature and context, not working yet, option to allow sharing needs to be added
2016-08-31 11:41:07 +02:00
884c7a6b6b
Creating the folder when the tests run
...
Conflicts:
build/integration/features/bootstrap/BasicStructure.php
build/integration/run.sh
2016-08-31 11:40:28 +02:00
e8a014be34
Add integration test for sharing with group, then user in group
...
Add integration test for the use case where a group share exists and
then the same owner creates a direct share to a user in that group.
2016-08-31 11:40:14 +02:00
c4bfdb3cab
Merge pull request #1183 from nextcloud/backport-529-cross-vendor-up-and-downgrades
...
[stable10] Allow downgrades of maintenance accross vendors
2016-08-30 19:54:20 +02:00
6d1ccefc90
Added closeCursor in SharedMount numeric id
2016-08-30 19:47:16 +02:00
c4f303d19c
Prevent error with orphaned shares when updating user mount cache
2016-08-30 19:45:22 +02:00
fe3e7629e2
Merge pull request #1191 from nextcloud/stable10-share-allowspaceinremote
...
[stable10] Allow space for federated share id search
2016-08-30 15:37:07 +02:00
3d43680d6e
Merge pull request #1184 from nextcloud/backport-1089-allow-to-prevent-previews
...
[stable10] Check if the file isReadable() before sending a (cached) preview
2016-08-30 13:31:07 +02:00
a2a17fc5d7
Merge pull request #1186 from nextcloud/stable10-backport1178
...
[stable10] Theming: Show loading spinner while uploading files
2016-08-30 13:02:14 +02:00
102d4dc1af
Allow space for federated share id search
2016-08-30 12:57:23 +02:00
6ce976e7f0
Theming: Show loading spinner while uploading files
2016-08-30 10:28:57 +02:00
061aad5fe3
Check if the file isReadable() before sending a (cached) preview
2016-08-30 10:24:01 +02:00
7d54d03e40
Allow downgrades of maintenance accross vendors
2016-08-30 10:19:40 +02:00
b4a2f93ec8
Fix oracle support of external storage app
2016-08-30 10:08:49 +02:00
f8a45b9e08
Merge pull request #1174 from nextcloud/backport-1128
...
[stable10] Users page lazy multiselect group dropdowns
2016-08-30 10:04:28 +02:00
f4d4e3f55f
Merge pull request #1179 from nextcloud/stable10_us_25675
...
[stable10] Added integration test (#25675 )
2016-08-30 09:48:17 +02:00
351d01510d
Merge pull request #1176 from nextcloud/backport-1145-10
...
[stable10] DAV: Return data-fingerprint always when asked
2016-08-30 08:41:45 +02:00
bc3c4ebd2d
[stable9.1] Added integration test ( #25675 )
...
* [stable9.1] Added integration test
* A shared storage is never a home storage - fixes #25582
2016-08-30 08:32:12 +02:00
7e2c4b80d2
Merge pull request #1140 from nextcloud/backport-1132-prevent-parse-error-on-editing-an-html-comment
...
[stable10] Prevent parse error on editing an HTML comment
2016-08-30 00:14:34 +02:00
4685ca9154
[master] DAV: Return data-fingerprint always when asked ( #25482 )
...
For owncloud/client#5056
Users can configure arbitrary subfolders for syncing, therefore we should
always return it when asked for.
The sync client makes sure to not always ask for it to save bandwidth.
2016-08-29 23:59:57 +02:00
3a0a84e1ea
Backport of Users page lazy multiselect group dropdowns #1128 to stable10
...
Users page lazy multiselect group dropdowns
Instead of pre-rendering all multiselects with lots of group entries,
the current groups are now displayed as simple labels.
Behind the labels there is a pencil icon like for other fields.
When clicking the pencil icon, the dropdown will be spawned and will
open itself.
Upon closing of the dropdown, the label comes back with the updated
selection and the dropdown is destroyed.
Extra non-available groups also in list
Fix group sorting in user list group selection
2016-08-29 23:46:28 +02:00
dbc860e6f7
Merge pull request #1159 from nextcloud/stable9.1-27a5be96f108d4ab2b91bcd765433e1646ba9bf2
...
[9.1] Before a user is getting scanned the database connection is re-…
2016-08-29 21:39:55 +02:00
0a1b1d57a7
Merge pull request #1157 from nextcloud/stable9.1-init-filesconfig
...
Make sure file list files config always exists
2016-08-29 21:39:44 +02:00
deadbf7567
Merge pull request #1156 from nextcloud/stable9.1-db60e65409e7c6d4f1bde5062af53fbad6e8b412
...
[stable9.1] Fix issues where some user settings cannot be loaded when…
2016-08-29 20:33:10 +02:00
167cea0b09
Merge pull request #1126 from nextcloud/stable10-theming-performance
...
[stable10] theming performance
2016-08-29 15:44:19 +02:00
db420e54a1
[9.1] Before a user is getting scanned the database connection is re-establ…
2016-08-29 15:22:29 +02:00
006e9e8b42
Make sure file list files config always exists
...
Initialize files config with defaults in case none was passed
2016-08-29 15:20:48 +02:00
f6ee9340c2
[stable9.1] Fix issues where some user settings cannot be loaded when the user id differs in case sensitivity - fixes #25684 ( #25686 )
2016-08-29 15:19:00 +02:00
42425bb910
Prevent parse error on editing an HTML comment
2016-08-29 14:26:40 +02:00
49da5267a9
Use temporary file as cache
2016-08-29 12:19:02 +02:00
d4d90a0b84
Increase theming performance
...
1. Set proper caching headers (`Pragma: cache`)
2. Resize image proportionally to a max size of 1920px
3. Store images with progressive mode
This resizes a previous 2.8 MB picture to 300kb and makes it rendering going down from 11 seconds to less than 1 here. And future requests won't have to download the file newly.
2016-08-29 12:18:57 +02:00
af515a615d
Merge pull request #1104 from nextcloud/stable10-backport-dont-read-server-variable
...
[stable10] Remove reading PATH_INFO from server variable
2016-08-28 10:31:51 +02:00
4fb2810add
Remove reading PATH_INFO from server variable
...
Having two code paths for this is unreliable and can lead to bugs. Also, in some cases Apache isn't setting the PATH_INFO variable when mod_rewrite is used.
Fixes https://github.com/nextcloud/server/issues/983
2016-08-27 22:16:30 +02:00
25ed51743a
Merge pull request #902 from nextcloud/stable10-787
...
[stable10] Files external settings polish
2016-08-26 14:58:46 +02:00
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
Roeland Jago Douma
Joas Schilling
Sergio Bertolín
Vincent Petry
Lukas Reschke
Morris Jobke
Julius Haertl
Thomas Müller
blizzz
Markus Goetz
Raghu Nayyar
Damjan Georgievski