Commit graph

12610 commits

Author SHA1 Message Date
Nextcloud bot
a086011e00
[tx-robot] updated from transifex 2016-09-25 00:09:40 +00:00
Morris Jobke
bf7cbe32c8
Add repair step to remove .step file after update
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-09-23 13:39:06 +02:00
Nextcloud bot
b30c79b63c
[tx-robot] updated from transifex 2016-09-23 00:09:45 +00:00
Joas Schilling
a0e62f0880 Merge pull request #1455 from nextcloud/use-magic-di
Use magic DI
2016-09-22 12:23:46 +02:00
Joas Schilling
78210c8300
Return 404 on v2.php when the app is disabled
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-09-22 12:18:40 +02:00
Nextcloud bot
6a873acf46
[tx-robot] updated from transifex 2016-09-22 00:11:32 +00:00
Joas Schilling
d9063b6141
Use default value instead of throwing when the service could not be found 2016-09-20 13:26:06 +02:00
Lukas Reschke
09e1218df9 Merge pull request #1454 from nextcloud/morris
Don't check Same-Site attribute for mobile chrome
2016-09-20 11:08:32 +02:00
Nextcloud bot
70660d0d6c
[tx-robot] updated from transifex 2016-09-20 00:09:37 +00:00
Lukas Reschke
9a2511fe9b
Don't check for Same-Site cookie on Chrome Android
Chrome on Android has a bug that it doesn't sent cookies with the
same-site attribute for the download manager. To work around that
all same-site cookies get deleted and recreated directly. Awesome!
FIXME: Remove once Chrome 54 is deployed to end-users
@see https://github.com/nextcloud/server/pull/1454
2016-09-20 01:20:17 +02:00
Nextcloud bot
f4a4578f0d
[tx-robot] updated from transifex 2016-09-19 00:09:33 +00:00
Nextcloud bot
bcc4b5cd0a
[tx-robot] updated from transifex 2016-09-18 00:09:26 +00:00
Roeland Jago Douma
e200eda18d
Optimize sanitizeName 2016-09-16 09:52:52 +02:00
Roeland Jago Douma
7c078a81b4
Add trict CSP to OCS responses
If a repsonse now explicitly has the Empty CSP set then the middleware
won't touch it.
2016-09-15 13:11:36 +02:00
Nextcloud bot
4fdee00c27
[tx-robot] updated from transifex 2016-09-15 00:12:37 +00:00
Lukas Reschke
c5189a93db Merge pull request #1375 from nextcloud/display-that-updating-failed-for-htaccess
Display an error when updating .htaccess failed
2016-09-14 14:26:41 +02:00
Morris Jobke
e39e1bdf4e Merge pull request #1395 from nextcloud/issue-369-htaccess-max-sizes
Make sure memory limit is > post size and upload filesize
2016-09-13 22:39:08 +02:00
Roeland Jago Douma
edb4a680e0 Merge pull request #1348 from karakayasemi/patch-1
Bug fix CachedMountInfo for user home storage
2016-09-13 21:55:14 +02:00
Roeland Jago Douma
b6439da128 Merge pull request #1338 from nextcloud/fix-trashbin-errors
Opening the trashbin causes errors in log for files without preview
2016-09-13 19:23:51 +02:00
Joas Schilling
a3c8534b7b
Make sure memory limit is > post size and upload filesize 2016-09-13 16:50:36 +02:00
Joas Schilling
4b26d7d86a
Update docs 2016-09-13 10:51:48 +02:00
Joas Schilling
1675542df4
Display an error when updating .htaccess failed 2016-09-13 10:51:48 +02:00
Nextcloud bot
feb85981cd
[tx-robot] updated from transifex 2016-09-13 00:11:21 +00:00
Thomas Müller
6eba111e09
Fix failing preview unit tests (#26039) 2016-09-12 16:46:39 +02:00
Joas Schilling
a9c243948b Merge pull request #1373 from nextcloud/upstream-26091
Clean up code coverage
2016-09-12 16:40:22 +02:00
Morris Jobke
cbcb53119a
add updated composer autoloader code 2016-09-12 15:32:22 +02:00
Roeland Jago Douma
959bf0d1a7
Cache the build ControllerName
Often a route.php file will have many N routes but only M controllers.
Where N >= M. Which means that in most cases the ControllerName will be
converted multiple times. This is of course far from ideal.

Note that this is per app so the cache will contain at most N entries.
Which is not to bad.
2016-09-11 13:25:32 +02:00
Semih Serhat Karakaya
cfc1c7cbd2 Update CachedMountInfo for user home storage
In getMountPointNode function rootId is not inside of the userFolder for home storage. We was searching '/user' folder in '/user/files' folder. So, it was return NULL. I moved searching part to parent folder. It solves everything. Also, obviously other storage types not affect then this change.

Related owncloud commit :
https://github.com/owncloud/core/pull/26017
2016-09-09 18:07:21 +03:00
Morris Jobke
f56ae37e8f
Opening the trashbin causes errors in log for files without preview
* put a file without a generated preview in the trashbin
  (e.g. a *.docx file)
* open the trashbin
* following errors will show up in the nextcloud.log:
	- filesize(): stat failed for ...
	- fopen(...): failed to open stream: No such file or directory at ...
	- fread() expects parameter 1 to be resource, boolean given at ...
	- fclose() expects parameter 1 to be resource, boolean given at ...
	- imagecreatefromstring(): Empty string or invalid image at ...

This is because the preview code tries to load an SVG image, which
is obviously only text.

The fix simply handles this before the loading happens and the web UI
keeps showing the default mimetype icon.
2016-09-09 13:53:06 +02:00
Morris Jobke
c16aefcff5 Merge pull request #1317 from nextcloud/add-sharing-disclaimer
Adding a optional disclaimer to the anonymous upload page
2016-09-08 21:18:28 +02:00
Morris Jobke
5ac26d12f0 Merge pull request #1247 from nextcloud/storage-id-global-cache
more efficient querying of numeric storage ids
2016-09-08 21:09:14 +02:00
Morris Jobke
6bb95de1c5
Adding a optional disclaimer to the anonymous upload page 2016-09-08 18:44:27 +02:00
Morris Jobke
d8c4f18c0c Merge pull request #1328 from nextcloud/add-exemption-for-osx
Add exemptions for incompatible UAs
2016-09-08 18:39:33 +02:00
Lukas Reschke
6ac890812f
Add exemptions for incompatible UAs
Some user agents are notorious and don't really properly follow HTTP
 specifications. For those, have an automated opt-out. Since the protection
for remote.php is applied in base.php as starting point we need to opt out
here.
2016-09-08 17:20:46 +02:00
Joas Schilling
0cec06d0c8
Change updater URL 2016-09-08 12:30:17 +02:00
Lukas Reschke
ff691b4d8a Merge pull request #836 from nextcloud/php7.1
Add PHP 7.1 drone tests
2016-09-08 09:19:59 +02:00
Joas Schilling
cdfe538452 Merge pull request #1243 from nextcloud/fix-detection-of-file-types-a-bit
Fix detection of file types a bit
2016-09-08 09:19:33 +02:00
Nextcloud bot
b992bf2142
[tx-robot] updated from transifex 2016-09-08 00:10:21 +00:00
Roeland Jago Douma
fb4850ffa8
Fix intergrity checker
* Set salt length to 0
  See https://tools.ietf.org/html/rfc3447#page-38
* Fix tests for new phpunit
2016-09-07 22:09:29 +02:00
Thomas Müller
1631ef5acc
Initialize array elements properly 2016-09-07 22:09:08 +02:00
Robin Appelman
e8e950a4d2
more efficient querying of numeric storage ids 2016-09-07 17:22:40 +02:00
Morris Jobke
05580f0242
Fix updater URL 2016-09-07 16:51:25 +02:00
Roeland Jago Douma
1d04c9e307 Merge pull request #1287 from nextcloud/correctly-remove-admin-stuff
Correctly remove admin sections and settings
2016-09-07 14:30:08 +02:00
Roeland Jago Douma
240798329d
Set proper content type on OCS responses 2016-09-07 10:55:56 +02:00
Joas Schilling
7c0951244a
Deprecate getEditionString() 2016-09-06 16:05:28 +02:00
Roeland Jago Douma
9854705f63 Merge pull request #1284 from nextcloud/allow-status.php-before-install
Allow status.php before install
2016-09-06 15:10:56 +02:00
Morris Jobke
b6bdf81d55 Merge pull request #1275 from nextcloud/OCS_forward_headers_cleanup
Internal OCS Controller cleanup
2016-09-06 14:46:05 +02:00
Joas Schilling
43ff2f05fd
Correctly remove admin sections and settings 2016-09-06 14:37:09 +02:00
Morris Jobke
45a84f3623 Merge pull request #1235 from nextcloud/issue-1192-move-navigation-entries-without-order-to-the-end
Move navigation entries without order to the end
2016-09-06 14:12:01 +02:00
Joas Schilling
7bfc698ae4
Allow to call status.php before the instance is installed 2016-09-06 13:59:45 +02:00
Roeland Jago Douma
cec213e354
Fix autoloader 2016-09-06 11:58:47 +02:00
Roeland Jago Douma
3c55fe6bab
Split OCS version handling
This cleans up a bit the OCSController/Middleware. Since the 2 versions
of OCS differ a bit. Moved a lot of stuff internal since it is of no
concern to the outside.
2016-09-06 11:57:39 +02:00
Roeland Jago Douma
e8b625b098
Update autoloader 2016-09-05 15:11:46 +02:00
Roeland Jago Douma
777c3ee325
Add FileDisplayResponse
A lazy implementation of the DisplayResponse that only hits the
filesystem if the etag and mtime do not match.
2016-09-05 15:09:54 +02:00
Lukas Reschke
06fa486706 Merge pull request #1158 from nextcloud/cache_avatars
Cache avatars
2016-09-05 15:08:43 +02:00
Joas Schilling
12736a3592 Merge pull request #1271 from nextcloud/fix-docs-for-notifications
Null !== void, those methods are void
2016-09-05 14:16:45 +02:00
Joas Schilling
fb04c56827
Null !== void, those methods are void 2016-09-05 13:00:56 +02:00
Joas Schilling
db6a3367ad Merge pull request #1259 from nextcloud/language_order
ACCEPT_LANGUAGE goes before default_langauge
2016-09-05 12:37:44 +02:00
Marius Blüm
f8eb7be7b1 Merge pull request #1171 from nextcloud/2fa-backup-codes
add 2fa backup codes app
2016-09-05 12:17:29 +02:00
Lukas Reschke
e3a5767a29 Merge pull request #1269 from nextcloud/deprecate_ocs_response
Deprecate OCSRespone
2016-09-05 11:36:03 +02:00
Roeland Jago Douma
3b2beeaa14
Deprecate OCSRespone
The OCSResponse should not be used by apps. They should extend the
OCSController and use normal DataResponses instead.
2016-09-05 10:51:19 +02:00
Roeland Jago Douma
7fb88ec506
Use proper ALTER ROLE syntax
Fixes #1260

See https://www.postgresql.org/docs/9.0/static/sql-alterrole.html
2016-09-05 10:45:11 +02:00
Joas Schilling
24d90a4bb1
Correctly remove the charset from finfo mimetype 2016-09-05 09:48:22 +02:00
Christoph Wurst
8acb734854
add 2fa backup codes app
* add backup codes app unit tests
* add integration tests for the backup codes app
2016-09-05 08:51:13 +02:00
Nextcloud bot
8b484eedf0
[tx-robot] updated from transifex 2016-09-05 00:09:10 +00:00
Roeland Jago Douma
933c892a62
Autoloader update 2016-09-04 13:39:22 +02:00
Roeland Jago Douma
0228bc6e66
ACCEPT_LANGUAGE goes before default_langauge
See https://github.com/nextcloud/server/issues/970

Before we had

1. Users settings in personal settings
2. Admins default language settings
3. Accept-Language settings of the browser

However this is not in line with
https://www.w3.org/International/questions/qa-lang-priorities

So this changes the order to

1. Users settings in personal settings
3. Accept-Language settings of the browser
2. Admins default language settings
2016-09-04 13:19:40 +02:00
Nextcloud bot
fc02c4a980
[tx-robot] updated from transifex 2016-09-04 00:09:21 +00:00
Roeland Jago Douma
7e13db9952 Merge pull request #1225 from nextcloud/allow-to-validate-password-policy
Allow to validate the password_policy app
2016-09-02 21:02:59 +02:00
Joas Schilling
b072c6c943
Move navigation entries without order to the end 2016-09-02 09:11:58 +02:00
Roeland Jago Douma
7f84f05e4d
Cache parsing of info.xml 2016-09-02 09:03:09 +02:00
Morris Jobke
7ffed2deae Merge pull request #1221 from nextcloud/proper_204_304_response
No body or content-length for 204 and 304 responses
2016-09-01 15:04:09 +02:00
Joas Schilling
d3f82356bb Merge pull request #1227 from nextcloud/improve-tests
Improve tests
2016-09-01 14:02:04 +02:00
Morris Jobke
7f8c5ed497
Activate APCu on PHP 7
Fix an issue with APCus inc and dec methods on PHP 7

see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221 for details
2016-09-01 12:30:05 +02:00
Morris Jobke
a3c1d74829
Remove unneeded Windows logic 2016-09-01 10:47:57 +02:00
Joas Schilling
de96c5b17b
Allow to validate the password_policy app 2016-09-01 10:18:00 +02:00
Nextcloud bot
4a5cd74fb2
[tx-robot] updated from transifex 2016-09-01 00:09:24 +00:00
Roeland Jago Douma
21a87d3c2e
No body or content-length for 204 and 304 responses
See: https://tools.ietf.org/html/rfc7230#section-3.3
2016-08-31 23:07:48 +02:00
Joas Schilling
f9cea0b582 Merge pull request #797 from nextcloud/only-match-for-auth-cookie
Match only for actual session cookie
2016-08-31 15:59:16 +02:00
Roeland Jago Douma
a0af513a4a Merge pull request #1201 from nextcloud/usermountcache-orphanedshare
[master] Usermountcache orphanedshare
2016-08-31 15:07:13 +02:00
Joas Schilling
e4311a2ebd Merge pull request #608 from nextcloud/small-encryption-improvement
skip shared files, if files get decrypted only for a specific user we…
2016-08-31 12:30:37 +02:00
Vincent Petry
669b0bc2ae
Prevent error with orphaned shares when updating user mount cache 2016-08-30 19:49:23 +02:00
Lukas Reschke
57f9117843 Merge pull request #1087 from nextcloud/get-delay-twice
dont get bruteforce delay twice
2016-08-30 18:43:01 +02:00
Robin Appelman
acffaa55a1 Short circuit processing of the heartbeat request 2016-08-30 15:44:00 +02:00
Roeland Jago Douma
83490e90ef Merge pull request #1089 from nextcloud/allow-to-prevent-previews
Check if the file isReadable() before sending a (cached) preview
2016-08-30 11:33:48 +02:00
Roeland Jago Douma
14136295b7
Cache avatars properly
* Set proper caching headers for avatars (15 minutes)
* For our own avatar use some extra logic to invalidate when we update
2016-08-30 09:00:16 +02:00
Morris Jobke
4afe4bda26 Merge pull request #891 from nextcloud/us_25810
[OC] Fix unmerged shares repair targetdecision
2016-08-30 08:22:34 +02:00
Roeland Jago Douma
7c7f862712 Merge pull request #1142 from nextcloud/fix-case-sensitive-settings
Fix issues where some user settings cannot be loaded when the user id…
2016-08-29 19:56:35 +02:00
Roeland Jago Douma
39749c0cd4 Merge pull request #1139 from nextcloud/clean-code-image
Some cleanup within OC_Image (#25875)
2016-08-29 19:56:16 +02:00
Joas Schilling
490c219893 Merge pull request #1134 from nextcloud/fix_redirection
Fix redirection taking care of protocol and port
2016-08-29 15:49:25 +02:00
Thomas Müller
82e8762c84
Fix issues where some user settings cannot be loaded when the user id differs in case sensitivity - fixes #25684 (#25686) 2016-08-29 14:33:16 +02:00
Thomas Müller
df1cc94c23
Some cleanup within OC_Image (#25875) 2016-08-29 14:31:59 +02:00
Juan Pablo Villafáñez
b50a03141b
Fix redirection taking care of protocol and port 2016-08-29 14:24:23 +02:00
Jörn Friedrich Dreyer
d5518735c9
always return numeric storage id as int, also check type equality in test asserts 2016-08-29 14:20:51 +02:00
Robin Appelman
6c93fe08f5 dont get bruteforce delay twice 2016-08-29 13:36:49 +02:00
Joas Schilling
f41c8c0089
Check if the file isReadable() before sending a (cached) preview 2016-08-29 10:58:57 +02:00
Lukas Reschke
25f1fdb275 Merge pull request #847 from nextcloud/quota-mount-in-homefolder
fix quota calculation when a filesystem is mounted in a user home
2016-08-28 15:05:46 +02:00
Raghu Nayyar
9dc23592c3 Merge pull request #1105 from nextcloud/usermenu-ordering
fix ordering of user menu entries
2016-08-28 10:30:16 +02:00
Lukas Reschke
4d85ffc27c Merge pull request #1054 from nextcloud/less-cache-hits
Reduce the number of cache operations for dav operations
2016-08-27 22:44:29 +02:00
Jan-Christoph Borchardt
0517f41b3f fix ordering of user menu entries 2016-08-27 22:42:08 +02:00
Lukas Reschke
56367d19ac Merge pull request #1088 from nextcloud/core_tags_cleanup
Tag cleanup
2016-08-26 17:55:30 +02:00
Joas Schilling
89c78bbce4 Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loop
prevent infinite redirect loops if the there is no 2fa provider to pass
2016-08-26 16:03:05 +02:00
Roeland Jago Douma
d3b2e4090e
Autoloader update 2016-08-26 15:46:58 +02:00
Roeland Jago Douma
53725d4d15 Merge pull request #771 from nextcloud/theming-fixes
Theming: Fix missing color usage
2016-08-26 15:02:21 +02:00
Lukas Reschke
de6ab82766 Merge pull request #1080 from nextcloud/always_lazyroot
Always use the LazyRoot
2016-08-26 13:18:01 +02:00
Roeland Jago Douma
f805aff67c
Always use the LazyRoot 2016-08-26 12:13:34 +02:00
Julius Haertl
fdab008231
Remove internal from getThemingDefaults 2016-08-26 12:07:52 +02:00
Roeland Jago Douma
044d7c3bb7 Merge pull request #1026 from nextcloud/theming-extend-defaults
Theming: Add logo and background to ThemingDefaults
2016-08-26 11:53:24 +02:00
Robin Appelman
fb88d66857 optimize getUserFolder for the common case 2016-08-25 17:22:25 +02:00
Robin Appelman
2693ae870e cache user folders 2016-08-25 17:22:25 +02:00
Robin Appelman
b2d365734a cache root id in mountpoint 2016-08-25 17:22:25 +02:00
Joas Schilling
680d7f22bb Merge pull request #1036 from nextcloud/query-logger-stack
add stacktrace to query logger
2016-08-25 16:43:08 +02:00
Robin Appelman
1c3b1e5797 add stacktrace to query logger 2016-08-24 14:37:15 +02:00
Roeland Jago Douma
4e1d501696
Dark autoloader magic for ThemingDefaults 2016-08-24 13:22:21 +02:00
Christoph Wurst
6af2efb679
prevent infinite redirect loops if the there is no 2fa provider to pass
This fixes infinite loops that are caused whenever a user is about to solve a 2FA
challenge, but the provider app is disabled at the same time. Since the session
value usually indicates that the challenge needs to be solved before we grant access
we have to remove that value instead in this special case.
2016-08-24 10:49:23 +02:00
Joas Schilling
c7c53aefb2
Use the lazy root to make tests pass 🙈 2016-08-24 09:52:05 +02:00
Julius Haertl
80fe499707
Theming: Add logo and background to ThemingDefaults 2016-08-24 00:40:22 +02:00
Lukas Reschke
2f1b17d44a Merge pull request #1007 from nextcloud/shared-storage-non-recursive
Fix shared storage recursive setup
2016-08-23 22:15:38 +02:00
Robin Appelman
a0c2342c20 prevent infinite recursion while getting storage from mount 2016-08-23 14:52:18 +02:00
Lukas Reschke
3ed102497e Merge pull request #995 from nextcloud/workflow-section
Workflow section + hidden empty sections
2016-08-23 11:20:43 +02:00
Lukas Reschke
0747e96b9c
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-22 23:49:46 +02:00
Arthur Schiwon
b13092065a
hide parameters of tryLogin when logging 2016-08-22 16:45:07 +02:00
Joas Schilling
94432c089f
Save the container with the app's namespace so we can resolve it 2016-08-22 14:25:43 +02:00
Robin Appelman
e316a7ade7 Allow jail wrappers to lazily initialize the source storage 2016-08-22 12:26:27 +02:00
Robin Appelman
5e44a2d868 Allow storage wrappers to lazily initialize the source storage 2016-08-22 12:23:55 +02:00
Arthur Schiwon
056c1ab035
fix wrong var name 2016-08-22 11:24:48 +02:00
Arthur Schiwon
7972fa5527
enlist only registered sections that also have settings registered to 2016-08-22 08:29:49 +02:00
Lukas Reschke
ede32a558a Merge pull request #969 from nextcloud/allow-to-validate-operations
Allow to validate operations
2016-08-21 20:45:40 +02:00
Lukas Reschke
d50e7ee36c
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-19 14:48:13 +02:00
Joas Schilling
75e058e3f2
update composer list 2016-08-19 14:37:31 +02:00
Joas Schilling
a111181eb3
Validate the operation 2016-08-19 12:23:05 +02:00
Julius Haertl
162b153f22
Fix loading of ThemingDefaults 2016-08-19 11:26:22 +02:00
Morris Jobke
3ccd69707e Merge pull request #865 from nextcloud/ocs_config
Move OCS route /config to proper controller
2016-08-19 09:39:05 +02:00
blizzz
3b6bbf8159 Merge pull request #934 from nextcloud/add-cachebusters
Add cachebusters
2016-08-18 15:45:22 +02:00
blizzz
53d3c8b635 Merge pull request #931 from nextcloud/replace-hardcoded-classname
let the containers resolving capabilities find and instantiate the ri…
2016-08-18 14:03:14 +02:00
Lukas Reschke
3c7d2544b9
Add cache buster to left menu bar 2016-08-18 12:34:55 +02:00
Arthur Schiwon
f86b20776a
let the containers resolving capabilities find and instantiate the right service 2016-08-18 11:56:19 +02:00
Joas Schilling
3dba40db7b
Fix "Undefined index" when the values do not exist 2016-08-18 11:53:26 +02:00
Roeland Jago Douma
c7b4142fee
Update autoloader 2016-08-18 09:38:03 +02:00
Roeland Jago Douma
3a17fabd04
Remove unused private classes 2016-08-18 09:37:11 +02:00
Roeland Jago Douma
c40fa47944 Merge pull request #916 from nextcloud/password_controller_composer
Add ChangePasswordController to autoloader
2016-08-17 20:31:20 +02:00
Lukas Reschke
5aaa065d6d Merge pull request #848 from nextcloud/public-link-quota
fix getting quota for public links with quota_include_external_storage
2016-08-17 20:13:56 +02:00
Roeland Jago Douma
fe80bb1aff Merge pull request #867 from nextcloud/notification-primary-action-always-first
Make sure the primary action is always the first one
2016-08-17 19:31:14 +02:00
Roeland Jago Douma
b57f8747ce
Add ChangePasswordController to autoloader 2016-08-17 19:28:36 +02:00
Lukas Reschke
7cd4874112 Merge pull request #895 from nextcloud/autoloader_checker
Autoloader checker
2016-08-17 16:27:14 +02:00
Vincent Petry
df9b509ed3
Improve regexp to detect duplicate folders when repairing unmerged shares 2016-08-17 15:31:47 +02:00
Vincent Petry
7a2d25fab4
Fix unmerged shares repair with mixed group and direct shares
Whenever a group share is created after a direct share, the stime order
needs to be properly considered in the repair routine, considering that
the direct user share is appended to the $subShares array and breaking
its order.
2016-08-17 15:31:36 +02:00
Vincent Petry
56b94b220d
Improve file_target finding logic when repairing unmerged shares
Pick the most recent subshare that has no parenthesis from duplication
which should match whichever name the user picked last. If all
subshares have duplicate parenthesis names, use the least recent group
share's target instead.
2016-08-17 15:31:35 +02:00
Nextcloud bot
39c180117e
[tx-robot] updated from transifex 2016-08-17 13:30:52 +00:00
Robin Appelman
5a599d5c4e Merge pull request #899 from nextcloud/nfd-default
[us] Disable NFD encoding wrapper by default
2016-08-17 14:46:52 +02:00