upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 18:50:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
31221 commits 1051 branches 1221 tags 8.4 GiB
Commit graph

31221 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
9a1688db7c Merge pull request #24278 from owncloud/stable9-more-sanity 
[stable9] Don't write empty RewriteBase
 2016-04-26 20:16:23 +02:00
Lukas Reschke
7ee7d091f2
Don't write empty RewriteBase 
ownCloud may be configured to live at the root folder without a
trailing slash being specified. In this case manually set the
rewrite base to `/`
 2016-04-26 20:13:20 +02:00
Thomas Müller
1087385cae Merge pull request #24259 from owncloud/stable9-mount-unique 
[stable9] don't get the config for the same mount multiple times
 2016-04-26 14:35:12 +02:00
Thomas Müller
80a31b7565 Merge pull request #24242 from owncloud/stable9-backport-24052 
[stable9] Fix LDAP race conditions
 2016-04-26 14:34:57 +02:00
Thomas Müller
6c861f71eb Merge pull request #24202 from owncloud/backport-stable9-23972 
[9.0] Call private cache methods only for `OC\Files\Cache\Cache`
 2016-04-25 23:10:51 +02:00
Thomas Müller
bec8465902 Merge pull request #24250 from owncloud/scanner-locking-9 
[9.0] add locks in the scanner to prevent multiple scanners running on the …
 2016-04-25 23:03:20 +02:00
Thomas Müller
b425a0e307 Merge pull request #24236 from owncloud/backport-24214-stable9 
[stable9] on clone Connection, do not take over the existing LDAP resource
 2016-04-25 23:03:05 +02:00
Robin Appelman
b375086c47
add test 2016-04-25 17:43:52 +02:00
Robin Appelman
d436326e19
don't get the config for the same mount multiple times 2016-04-25 17:43:40 +02:00
Robin Appelman
51f5edd749 add locks in the scanner to prevent multiple scanners running on the same files 2016-04-25 15:46:04 +02:00
Daniel Jagszent
1aa8765177
[9.0] Call private cache methods only for OC\Files\Cache\Cache 2016-04-25 14:55:05 +02:00
Thomas Müller
5925ab99f8 Merge pull request #24241 from owncloud/backport-24240-add-missing-use-statement 
Add missing use statement
 2016-04-25 14:45:58 +02:00
Joas Schilling
dd415b62f5
Add missing use statement 2016-04-25 13:34:20 +02:00
Morris Jobke
5b126cde48
Fix LDAP race conditions 
* getFromCache is wrapped in isCached
* inbetween the two calls the cache entry hits it's TTL
* getFromCache returns null
* this fix only checkes if the returned value is null and
  return only non-null values
 2016-04-25 13:32:40 +02:00
Arthur Schiwon
8ebde1e74d
on clone Connection, do not take over the existing LDAP resource 
For one, it solves potential conflicts when using the resource. For the
other, one on the login check (the only place where a clone happens
currently) we do not need to rebind after confirming the user's login
was successful.
 2016-04-25 12:41:52 +02:00
Thomas Müller
57b9ae18f0 Merge pull request #24196 from owncloud/backport-24183-change-background-job-sort-order 
[9.0] Change the sort order of background jobs to be DESC instead of ASC
 2016-04-22 17:26:26 +02:00
Thomas Müller
98431b490e Merge pull request #24195 from owncloud/stable9-fs-initmountpoint-nulluser 
[stable9] Throw NoUserException when attempting to init mount point for null user
 2016-04-22 17:26:06 +02:00
Thomas Müller
a6164472a3 Merge pull request #24180 from owncloud/backport-24145-limit-background-job-runtime-9.0 
[9.0] Make sure that CLI cron doesn't run for ever, but makes use of the ne…
 2016-04-22 17:23:53 +02:00
Thomas Müller
d2b4bf7682 Merge pull request #24158 from owncloud/encryped-size-progation-9 
[9.0] dont do optimized size propagation for encrypted files
 2016-04-22 15:24:38 +02:00
Thomas Müller
bbc720d2d3 Merge pull request #24192 from owncloud/create-personal-calendar-stable9 
Personal calendar should be generated even if the birthday calendar a…
 2016-04-22 14:23:09 +02:00
Joas Schilling
3e1dc64737
Change the sort order of background jobs to be DESC instead of ASC 
In theory, if your instance ever creates more jobs then your system cron can
handle, the default background jobs get never executed anymore. Because
everytime when the joblist returns the next job it looks for the next ID,
however there is always a new next ID, so it will never wrap back to execute
the low IDs. But when we change the sort order to be DESC, we make sure that
these low IDs are always executed, before the system jumps back up to
execute the new IDs.
 2016-04-22 14:11:26 +02:00
Vincent Petry
27d12f7a99
Throw NoUserException when attempting to init mount point for null user 
In some scenarios initMountPoints is called with an empty user, and
also there is no user in the session.

In such cases, it is unsafe to let the code move on with an empty user.
 2016-04-22 14:02:55 +02:00
Thomas Müller
711641e4a9
Personal calendar should be generated even if the birthday calendar already exists - fixes #24082 2016-04-22 13:03:31 +02:00
Thomas Müller
27d6852b3e Merge pull request #24131 from owncloud/dont-transfer-files-to-not-ready-user-stable9 
[9.0] Introduce isReadyForUser and verify in file transfer ownership
 2016-04-22 10:33:18 +02:00
Joas Schilling
9dc1c6c41f
Make sure that CLI cron doesn't run for ever, but makes use of the next spawn 2016-04-22 09:56:18 +02:00
Thomas Müller
81b5df3236 Merge pull request #24172 from owncloud/stable9-certificate 
[stable9] Ignore certificate file if it starts with file://
 2016-04-22 09:36:32 +02:00
Thomas Müller
6365851672 Merge pull request #24153 from owncloud/stable9-remember-email-when-setting-expiration 
[stable9] remember email when setting expiration date
 2016-04-21 23:22:01 +02:00
Thomas Müller
7a2a6ce609 Merge pull request #24163 from owncloud/fix-birthday_calendar-acl-stable9 
[stable9] Birthday calendar should never have write acl
 2016-04-21 23:21:05 +02:00
Lukas Reschke
830a080f0e
[stable9] Ignore certificate file if it starts with file:// 2016-04-21 19:00:27 +02:00
Thomas Müller
4e50dd87d5
Birthday calendar should never have write acl - fixes #24154 2016-04-21 16:44:06 +02:00
Thomas Müller
ed746a7ec2 Merge pull request #24112 from owncloud/backport-24111-chunking-users-in-background-jobs 
[9.0] Chunk the users correctly in the trashbin and versions background job
 2016-04-21 16:21:12 +02:00
Robin Appelman
74ed0a8aba dont do optimized size propagation for encrypted files 2016-04-21 14:24:53 +02:00
Robin Appelman
440cf335ad Add unit tests for shared size propagation with encryption 2016-04-21 14:24:49 +02:00
Christoph Wurst
e33adcf0df
remember email when setting expiration date 
fixes #22947
 2016-04-21 13:01:17 +02:00
Thomas Müller
68f62ad50a Merge pull request #24129 from owncloud/stable9_24098 
[stable9] When the scanner detects a file is changed clear checksum
 2016-04-21 12:56:04 +02:00
Thomas Müller
80993b245b Merge pull request #24134 from owncloud/fix-problems-caused-by-updater 
[stable9] Add repair step for updater issues
 2016-04-21 12:55:42 +02:00
Thomas Müller
a4a800fe30 Merge pull request #24136 from owncloud/backport-24135 
[stable9] Write .htaccess also from CLI
 2016-04-21 12:51:34 +02:00
Lukas Reschke
572ff9c9fe
Write .htaccess also from CLI 
The new updater as shipped with ownCloud 9.0.x invokes `occ` via `shell_exec`. This means that the `\OC::$CLI` code is used when updating.

This removes the manual `.htaccess` modifications, effectively leading to the fact that URLs without index.php in it stop working. This also affects share URLs which could be considered a rather serious regression.

- User installs 9.0.0 via web
- User shares /s/1234
- User updates to 9.0.1 via ownCloud updater
- Link to /s/1234 is broken, /index.php/s/1234 works
 2016-04-20 22:25:02 +02:00
Lukas Reschke
2d373416d8
Add repair step for updater issues 
The updater as shipped with ownCloud =< 9.0.1 has several bugs leading to a not properly executed update. For example the third-party changes are not copied.

This pull request:

1. Ships the third-party files changed since ownCloud 9.0.1 in the resources folder. On update the files are replaced. (https://github.com/owncloud/updater/issues/316)
2. Adds updater/* and _oc_upgrade/* as an exemption to the code integrity checker since the updater is updating in the wrong order. (https://github.com/owncloud/updater/issues/318)
 2016-04-20 21:40:53 +02:00
Thomas Müller
22f9a12c74 Merge pull request #24108 from owncloud/fix_24032 
Allow setting can edit permissions on federated shares in webUI
 2016-04-20 20:42:03 +02:00
Thomas Müller
fcebd32e37 Merge pull request #24099 from owncloud/fix_23632_9.0 
[stable9] init users mount point before recovery
 2016-04-20 20:41:35 +02:00
Thomas Müller
e2a274fdd3 Merge pull request #23831 from owncloud/backport-23511 
[9.0] sidebar click modification
 2016-04-20 20:41:03 +02:00
Thomas Müller
df544e8dbe Introduce isReadyForUser and verify in file transfer ownership - fixes #23786 2016-04-20 20:25:22 +02:00
Thomas Müller
fdab395925 Merge pull request #23576 from owncloud/background-scan-unscanned-9 
[9.0] handle completely unscanned storages in the background scanner
 2016-04-20 20:22:07 +02:00
Roeland Jago Douma
2296552104
When the scanner detects a file is changed clear checksum 
Fixes #23782 and #23783

If the file scanner detects a changed file we clear the checksum while
we update the cache.

* Unit test added
 2016-04-20 19:09:26 +02:00
Thomas Müller
98647b8fe4 Merge pull request #24119 from owncloud/fix_24095_9.0 
[stable9] preserve information if it is a rename operation or not
 2016-04-20 13:47:19 +02:00
Björn Schießle
ccddb18cab
preserve information if it is a rename operation or not 2016-04-20 12:34:20 +02:00
Roeland Jago Douma
466b7dc05f
Allow setting can edit permissions on federated shares in webUI 
Fixes #24032

Since we have a slightly different UI for the federated shares our
normal logic fails us. This makes sure to add the correct permissions
when it is a federated share.
 2016-04-20 11:14:32 +02:00
Joas Schilling
21970c1b19
Chunk the users correctly in the trashbin and versions background job 2016-04-20 10:39:14 +02:00
Björn Schießle
288b4e21d0
we need to initialize the mount points of the given user before we recover 
access to his files
 2016-04-19 17:17:39 +02:00