9dea79e341
Merge pull request #11305 from owncloud/ext-updateetagonmount
...
Update etag of parent dir when adding/removing ext storage mount points
2014-10-09 18:18:36 +02:00
c82e310e20
Merge pull request #11495 from owncloud/apps-clearenableappscacheafterloadingauthapp
...
Clear enabled apps cache after loading authentication app
2014-10-09 17:20:05 +02:00
16cd749065
Add support for keys in the info.xml
...
This allows to have links to different doc base URLs
a.
2014-10-09 15:48:30 +02:00
2d03019c91
Urlencode file name before passing it to cURL
...
Large file helper use cURL to determine file sizes. Thus filenames must be
urlencoded in case special symbols like '#' can cause BadRequest errors.
Signed-off-by: Tony Zelenoff <antonz@parallels.com>
2014-10-09 17:15:12 +04:00
36d22825e0
Clear enabled apps cache after loading authentication app
...
Since getEnabledApps() depends on an authentication app to be loaded,
especially in the case of LDAP, the cache from getEnabledApps() is now
cleared to make sure that subsequent calls will properly return apps
that were enabled for groups.
This is because getEnabledApps() uses the inGroups() function from the
group manager provided by LDAP or any other authentication app.
2014-10-09 14:34:41 +02:00
295c46ccb5
[tx-robot] updated from transifex
2014-10-09 01:55:33 -04:00
3427976bb6
strict comparison
2014-10-08 18:49:55 +02:00
aa3ad898a9
fix amazon s3 issues
...
folder size and mtime is always unknown in s3
more s3 fixes
make rescanDelay of root dir configurable, add on the fly update of legacy storage ids, !isset -> empty when checking strings
reduce number of http calls on remove and rmdir
fix typo
2014-10-08 18:49:47 +02:00
12ac3a800d
Expose getAppKeys trough \OCP\IConfig
2014-10-08 14:22:17 +02:00
6585eaa5df
Added failing unit tests for mount config hooks
2014-10-08 14:22:17 +02:00
ca58ac50a2
fix for issue #10880
2014-10-07 16:07:48 +02:00
d7db006315
Revert "fix for issue #10880"
...
This reverts commit 0df070a8e4
2014-10-07 15:54:25 +02:00
0df070a8e4
fix for issue #10880
2014-10-07 14:30:14 +02:00
6323d5fb3a
Merge pull request #11437 from owncloud/add-import-filter
...
Add CssImportFilter. More elegant fix for documents#348
2014-10-07 08:28:08 +02:00
01be0af209
[tx-robot] updated from transifex
2014-10-07 01:54:46 -04:00
b6087ea79b
Add CssImportFilter. More elegant fix for documents#348
2014-10-06 19:39:02 +03:00
a6293a38f2
Merge pull request #11390 from Nemesiz/master
...
Preview large TXT files fix
2014-10-06 14:25:27 +02:00
6e991a53ec
[tx-robot] updated from transifex
2014-10-06 01:54:57 -04:00
b0000800e1
New generic class for Imagemagick conversions
2014-10-04 17:50:12 +02:00
83c2829ca8
Preview large TXT files fix
...
Limit the size of the string generating the preview image for TXT files
2014-10-02 12:47:39 +03:00
553274b28f
[tx-robot] updated from transifex
2014-10-01 06:56:17 -04:00
e762ff2bbd
Merge pull request #11356 from owncloud/redirect-only-to-the-same-domain
...
Redirect only to absolute URL
2014-10-01 12:47:43 +02:00
cbecd62287
Merge pull request #11303 from owncloud/addFilelockToConfig
...
Add flock to config
2014-10-01 10:43:18 +02:00
5beeb923e6
Merge pull request #11365 from owncloud/fix-phpdoc
...
Fix PHPDoc
2014-09-30 16:15:37 +02:00
e881be7926
Merge pull request #11366 from owncloud/invalid-doc
...
Remove invalid PHPDoc
2014-09-30 16:12:58 +02:00
68cf6681e5
Add flock to config
...
This adds a file lock to the config in hope that this prevents race conditions as reported in https://github.com/owncloud/core/issues/11070
Testplan:
- [ ] Delete config.php and make it read-only => Error is thrown that it is not writeable
- [ ] Installation still works
- [ ] Changing config settings works (i.e. using the SMTP config switches in the administration menu)
- [ ] Your PC didn't blow up
- [ ] Installing the news app and the "Disable AppCode checker" app did not destroy your installation
Only skip the main config
Otherwise read only additional configs might not be processed
Test on tmpdir
2014-09-30 15:53:27 +02:00
96d9e0eb5b
Remove uneeded slicing of element
...
The "*/*" provider has been removed. This is therefore not needed anymore and leads to unexpected bugs.
Please notice that this is only relevant for master.
2014-09-30 14:08:43 +02:00
67f8875f47
Remove invalid PHPDoc
...
Despite the documentation this function does not read values from the cookie
2014-09-30 13:46:43 +02:00
b4944ffcc5
Fix PHPDoc
2014-09-30 13:34:50 +02:00
5292a14cdf
[tx-robot] updated from transifex
2014-09-30 01:55:11 -04:00
8c8e5c168e
Merge pull request #10107 from owncloud/sharing_group_shares
...
[sharing] group shares
2014-09-29 20:26:41 +02:00
41374986d3
Remove dead code
2014-09-29 17:20:29 +02:00
6e7365fc17
Redirect only to absolute URL
...
We do not want to redirect to other domains using the "?redirect_url=" feature. Please notice, that the ownCloud project does not consider open redirectors as security issue.
2014-09-29 17:07:43 +02:00
6e7acb8ae0
some small fixed, suggested by scrutinizer
2014-09-29 11:23:18 +02:00
63726ea9e2
[tx-robot] updated from transifex
2014-09-29 01:54:33 -04:00
84923475c0
[tx-robot] updated from transifex
2014-09-28 01:55:09 -04:00
3a16b1bb68
[tx-robot] updated from transifex
2014-09-27 01:54:48 -04:00
2a4da7fe09
on unshare only unshare childrens if there is no other parent available
2014-09-26 16:58:47 +02:00
53f6d74938
Merge pull request #11311 from owncloud/fixing-unhandled-exception-cleanTmp-master
...
catch and log exception in OC_Helper::cleanTmp()
2014-09-26 14:31:31 +02:00
e115a7043f
only create a new share entry, if the user needs a different target name than the group share
2014-09-26 13:19:15 +02:00
ed85055d31
for group shares we don't need a extra db entry of groupTarget equals itemTarget
2014-09-26 13:10:31 +02:00
d242e518f9
for group shares only the parent has the up-to-date permission. Make sure that we always use this permission, except if the user permission is '0' because in this case the user unshared the group share from self
2014-09-26 13:01:54 +02:00
4c08215e66
catch and log exception in OC_Helper::cleanTmp()
2014-09-26 11:36:53 +02:00
e5a111b80e
Merge pull request #11285 from owncloud/dav-permissions-create
...
Fix dav permissions for folders
2014-09-26 09:21:32 +02:00
1631937990
[tx-robot] updated from transifex
2014-09-26 01:54:59 -04:00
6365c57b04
Merge pull request #11282 from owncloud/scanner-memory-stable7
...
Don't keep the full info of all children in memory
2014-09-25 15:53:33 +02:00
9fc23e1967
Merge pull request #10934 from owncloud/datadir-write-setup
...
Don't complain about non-writable datadirs before we're installed
2014-09-25 14:32:32 +02:00
52b6469b0c
call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible
2014-09-25 14:26:31 +02:00
10c350b895
Fix dav permissions for folders without create permissions
2014-09-25 14:01:19 +02:00
ccb4475a8d
Expose creatable permissions trough fileinfo
2014-09-25 14:00:13 +02:00
968152113e
always select permissions, used in getItems()
2014-09-25 12:35:11 +02:00
d5fc011c90
some small fixes
2014-09-25 11:29:57 +02:00
f46e49529f
[tx-robot] updated from transifex
2014-09-25 01:55:32 -04:00
cb002c1f6b
Clarify possible preview providers for type Office
...
a
2014-09-24 21:21:39 +02:00
17f97ea2ca
Merge pull request #11225 from owncloud/showLoginAgainInsteadOfJSON
...
Show login again instead of JSON if CSRF check fails
2014-09-24 17:51:12 +02:00
f88021dbbc
Don't keep the full info of all children in memory
2014-09-24 15:44:56 +02:00
3da6b3b533
Merge pull request #11229 from kofemann/for-upstream
...
user/backed: use pow of two for backed action constants
2014-09-24 15:19:11 +02:00
07d43df713
only add a new row if it isn't a unique share, otherwise update the existing row
2014-09-24 14:02:02 +02:00
a6cc810349
mark exclude list as deprecated. It neither used by the files app nor by the
...
calendar or contacts app. It doesn't make sense to build a exclude list by the
share API, the apps knows best which are valid targets.
2014-09-24 14:02:02 +02:00
9f7b15582a
fix add user to group to work with grouped shares
2014-09-24 14:02:01 +02:00
bd268c35f5
generateTarget() will always find a unique target
2014-09-24 14:02:01 +02:00
5ff5b7386f
[tx-robot] updated from transifex
2014-09-24 01:56:46 -04:00
75e45ac786
Merge pull request #11019 from owncloud/do-not-show-exception-to-enduser
...
Do not show exception to the end-user - use a proper error page instead
2014-09-23 18:36:40 +02:00
89e02e89d4
Merge pull request #7051 from owncloud/postsetupajaxcheck
...
Moved WebDAV check to client side JS
2014-09-23 16:55:16 +02:00
276f50a1ba
user/backed: use pow of two for backed action constants
...
the current implementation limits number of possible backed actions
to 8 as it uses pow of 16 for constants. This change introduces pow
of two and allows up-to 32 actions to be defined.
The old values are preserved for backward compatibility.
2014-09-23 15:18:01 +02:00
4893d2c0ed
Show login again instead of JSON if CSRF check fails
...
Previously a JSON error page was shown to the user in-case the CSRF token was not valid. This was confusing and prevented people from login.
With this at least the login page is shown again and not a JSON error message. I consider this as sufficient since adding a new error page just for this sake would uneededly make lib/base.php even more cluttered and this is a edge-case which optimally should anyways not happen that often.
This can be tested by opening the login page, then clearing the cookies, and trying to login.
2014-09-23 14:55:08 +02:00
c587a4aaa2
Merge pull request #11222 from owncloud/store-users-timezone-master
...
send browsers timezone back tp the server on login
2014-09-23 13:45:21 +02:00
42fe0b9e08
Merge pull request #11241 from owncloud/use-lower-case
...
Use only lower-case letters
2014-09-23 12:16:58 +02:00
5d977f97b0
Merge pull request #11032 from owncloud/harden-redirect
...
Do only follow HTTP and HTTPS redirects
2014-09-23 11:34:44 +02:00
e65ceb08fc
Moved WebDAV and internet checks to client side JS
...
- Added setup checks in JavaScript
- Moved isWebDAVWorking to JS using SetupChecks
- Moved internet connection checks to an ajax call that goes through the
server
2014-09-23 11:16:14 +02:00
fc42a64e6c
Merge pull request #11226 from owncloud/kill-postsetupcheck-master
...
remove post setup check
2014-09-23 10:33:50 +02:00
479e4410c5
[tx-robot] updated from transifex
2014-09-23 02:05:45 -04:00
37a5bff155
Merge pull request #11227 from owncloud/fix-windows-path
...
fixing directory seperators
2014-09-23 07:38:23 +02:00
f970c81b1e
Merge pull request #11215 from owncloud/dav-throwwhendeletefailed
...
WebDAV now throws 403 when deletion did not work
2014-09-23 00:49:30 +02:00
051ed93e24
Merge pull request #11211 from owncloud/previewProviderSwitch
...
Add a configuration switch for enabled preview mimetypes
2014-09-23 00:45:59 +02:00
1565d82b81
Use only lower-case letters
...
Fixes https://github.com/owncloud/core/issues/11239
2014-09-22 21:29:03 +02:00
6eeb905871
Do only follow HTTP and HTTPS redirects
...
We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server)
Get final redirect manually using get_headers()
Migrate to HTTPHelper class and add unit tests
2014-09-22 20:02:32 +02:00
21412559df
remove post setup check
2014-09-22 19:43:55 +02:00
9105e17307
unit tests for grouping of shares pointing to the same source
2014-09-22 17:54:47 +02:00
89c3b650e6
group shares and combine permissions
2014-09-22 17:25:15 +02:00
9e8d2907e2
Merge pull request #11204 from owncloud/fix_oc_stream_seek
...
Fix oc stream seek
2014-09-22 16:25:07 +02:00
db72270acc
fixing directory seperators
2014-09-22 10:13:46 -04:00
ca3447fcde
Add a configuration switch for enabled preview mimetypes
2014-09-22 16:09:08 +02:00
814114ab8e
enhance formatDate function to accept an optional argument containing the time zone
2014-09-22 15:03:28 +02:00
831d34f084
Merge pull request #11210 from owncloud/issue/11209
...
Also match routes without trailing slash for files app
2014-09-22 14:04:20 +02:00
bb18fe1384
send browsers timezone back tp the server on login
2014-09-22 14:01:45 +02:00
470c25eff4
WebDAV now throws 403 when deletion did not work
...
Assume a permission issue whenever a file could not be deleted.
This is because some storages are not able to return permissions, so a
permission denied situation can only be triggered during direct
deletion.
2014-09-22 13:15:17 +02:00
b8a1340538
Merge pull request #9225 from voxsim/fix_displayNamesInGroup
...
fix in displayNamesInGroup
2014-09-22 12:13:15 +02:00
f83689e1be
in quota wrapper use === instead of ! for better readability and as in other wrappers
2014-09-22 11:35:42 +02:00
561a7e47cd
return boolean in Ciose::stream_seek
2014-09-22 11:33:55 +02:00
71bec60b92
Also match routes without trailing slash
...
Fix #11209
2014-09-22 11:22:33 +02:00
b752cb98d8
return boolean in OC::stream_seek
2014-09-22 11:20:15 +02:00
b1d0a0f3bf
Merge pull request #10939 from owncloud/add-port-to-trusted-domain-wizard
...
Append port to trusted domain in case it's not 80 or 443
2014-09-22 10:04:02 +02:00
8abf786af9
Merge pull request #10499 from owncloud/mkcol-headers-afterbind
...
Use afterBind to send fileId header for files and directories
2014-09-22 10:02:03 +02:00
5aaf8dcc01
[tx-robot] updated from transifex
2014-09-22 01:54:36 -04:00
154e848ce2
Merge pull request #11199 from owncloud/delete_bogus_previews
...
Delete bogus cached previews while updating
2014-09-21 22:48:21 +02:00
071e4bfc06
make sure preview prop is instanceof OC_Image before using it in showPreview
2014-09-21 17:30:29 +02:00
ab2554e013
delete old previews
2014-09-21 17:16:21 +02:00
69726d951e
Merge pull request #11196 from owncloud/sqlite-migration-smallint-master
...
adding 'smallint unsigned' to type mapping for sqlite
2014-09-21 11:13:58 +02:00
a1c39f74b7
[tx-robot] updated from transifex
2014-09-21 01:54:29 -04:00
7537d405e3
adding 'smallint unsigned' to type mapping for sqlite
2014-09-20 20:06:44 +02:00
e55c4bb807
[tx-robot] updated from transifex
2014-09-20 01:54:34 -04:00
463dd44d6d
Merge pull request #11178 from owncloud/throw-error-on-preview-instead-in-the-contructor
...
Throw error in showPreview instead the constructor
2014-09-19 21:39:30 +02:00
4c6bad7f71
Merge pull request #11158 from owncloud/fix_basic_auth
...
Move BasicAuth check to isLoggedIn
2014-09-19 13:39:13 +02:00
6869d2e82a
Throw error in showPreview instead the constructor
...
This function is also used in a way such as:
```
$preview = new \OC\Preview(\OC_User::getUser(), 'files');
$info = \OC\Files\Filesystem::getFileInfo($file);
if (!$always and !$preview->isAvailable($info)) {
\OC_Response::setStatus(404);
} else {
$preview->setFile($file);
$preview->setMaxX($maxX);
$preview->setMaxY($maxY);
$preview->setScalingUp($scalingUp);
$preview->setKeepAspect($keepAspect);
}
```
Which won't work anymore since `setFile` is used instead of passing the file in the constructor. Fixes a regression in master.
2014-09-19 13:26:41 +02:00
437f8c3cd5
Merge pull request #11119 from owncloud/removeOldUpgradeRoutines
...
Remove old upgrade routines
2014-09-19 12:23:42 +02:00
f0186d99d2
Merge pull request #11163 from owncloud/check-for-updates-between-major-versions
...
Prevent updates between multiple major versions
2014-09-19 12:20:22 +02:00
33f7af9207
Merge pull request #10958 from owncloud/db-ilike
...
Introduce cross-db ILIKE
2014-09-19 12:07:56 +02:00
786312d0e8
[tx-robot] updated from transifex
2014-09-19 01:55:44 -04:00
a71af58535
Prevent updates between multiple major versions
...
Ref https://github.com/owncloud/core/issues/11078
2014-09-18 17:56:06 +02:00
7a14f94ae5
1. remove sizeof($filteredUsers) > 0 as condition
...
2. use count instead of sizeof. Latter is an alias to first one, practically we stick to count everywhere. Having it consistent helps with readability.
3. move whitespace so we have $groupUsers[] = $filteredUser; instead of $groupUsers []= $filteredUser;
2014-09-18 17:50:19 +02:00
d0d3b7457b
Move BasicAuth check to "isLoggedIn()"
...
Ensures that Basic Auth works properly for APIs and removes the need for some even uglier lines of code.
2014-09-18 16:14:07 +02:00
a543807d85
Merge pull request #11151 from owncloud/removeOverflowingFunction
...
Remove unused and overflowing function
2014-09-18 15:42:36 +02:00
a85f0ae2da
Fix ILIKE without wildcards for oracle
2014-09-18 15:09:57 +02:00
f0bf46b080
Merge pull request #11130 from owncloud/moveBasicAuthCheck
...
Move basic auth check
2014-09-18 14:40:42 +02:00
c8dbdc29d0
Check for writable datadir during setup
2014-09-18 14:15:52 +02:00
23dd7cb51d
Don't complain about non-writable datadirs before we're installed
2014-09-18 13:33:13 +02:00
6fa3280c2a
Inject config into checkserver and cleanup tests
2014-09-18 13:33:13 +02:00
d07d5915c9
Remove unused and overflowing function
...
Resolves https://github.com/owncloud/core/issues/10991 failure 4
2014-09-18 10:21:28 +02:00
c89c6ed21d
Merge pull request #11143 from owncloud/improve-404
...
Make 404 page easier to understand
2014-09-18 09:10:16 +02:00
dd6b0b1319
[tx-robot] updated from transifex
2014-09-18 01:54:39 -04:00
8fc1a9f5a9
Make 404 page easier to understand
...
Fixes https://github.com/owncloud/core/issues/11133
2014-09-17 22:57:32 +02:00
f930b356e6
Error needs to push body-id for new guest layout
2014-09-17 18:02:18 +02:00
ef0a0f5f87
Merge pull request #9554 from owncloud/fix_preview_orientation
...
fix orientation in image-backend, not in preview system itself
2014-09-17 17:05:47 +02:00
0c03b2bdd5
Use ILIKE in cache search
2014-09-17 16:12:54 +02:00
c19bc1917b
Move basic auth check
...
At the previous point not all apps were initialized. Now the basic auth check happens together at the same location as all others.
Fixes https://github.com/owncloud/core/issues/11129
2014-09-17 16:04:12 +02:00
c88d517e88
Merge pull request #10622 from owncloud/recursive-delete-forbidden
...
Fix isDeletable
2014-09-17 15:36:41 +02:00
67b1ec1faf
Implement ILIKE for sqlite
2014-09-17 13:47:55 +02:00
60587e9dcd
Make sqlite LIKE case sensitive on default
2014-09-17 13:47:33 +02:00
c6eab9aaba
fix error message template
2014-09-17 13:25:50 +02:00
6d3757f864
Do not show exception to the end-user
...
Log the error instead of potentially leaking sensitive information
2014-09-17 13:17:52 +02:00
b644e8a5e7
Merge pull request #10932 from owncloud/issue/10926
...
Add a method to get the absolute url for a route
2014-09-17 13:05:26 +02:00
33c0d2f743
Fix mapping of relative paths
2014-09-17 11:38:10 +02:00
2f22e67570
Also check if the file itself is updatable
2014-09-17 11:35:16 +02:00
d25a9a118f
Check if a folder is deletable before we try to recursively delete it
2014-09-17 11:35:16 +02:00
ab79caf29b
Check if the parent is writable to check if a file is deletable
2014-09-17 11:35:16 +02:00
0d37e16499
Merge pull request #11092 from owncloud/conceal_sabredav_version
...
Conceal or display SabreDAV version number.
2014-09-17 10:35:50 +02:00
2cfa07049f
Remove old upgrade routines
...
We do not support updates from 6 to 8 directly, therefore we can remove those upgrade routines.
2014-09-16 20:27:52 +02:00
368391e401
Merge pull request #11009 from owncloud/tobiasKaminsky-route
...
REST API for thumbnails
2014-09-16 19:31:51 +02:00
4ebc11aa8d
Merge pull request #11102 from owncloud/visit1985-issue_108
...
mysql setup: if dbuser exists try a different one (owncloud/core#108 )
2014-09-16 18:54:37 +02:00
d2743e6ad6
Merge pull request #7254 from owncloud/core-sortalgo
...
Fixed JS sort comparator to be consistent between JS and PHP
2014-09-16 17:29:03 +02:00
ba445e85b2
Merge pull request #11082 from owncloud/deduplicateDependencyCheck
...
Deduplicate dependency checks
2014-09-16 16:33:02 +02:00
2f10b60c9e
Merge pull request #10754 from cetra3/master
...
Refactor internal session handler to write directly to $_SESSION
2014-09-16 15:48:19 +02:00
ca35d86c5a
adding ILIKE to AdapterSQLSrv
2014-09-16 15:44:21 +02:00
1771bfc2f2
Introduce cross-db ILIKE
2014-09-16 15:32:34 +02:00
e62d5b7e55
Route for thumbnail generation
...
Thumbnail generation
Removed Log
Added requested changes
Added requested changes.
- Fix code style
- Add exception if file does not exist
- Switch route styling
Replaces https://github.com/owncloud/core/pull/10805
Fix codestyle
Fix codestyle
Migrate to appframework
Fix typo
2014-09-16 15:00:58 +02:00
261d07c95c
Merge pull request #11084 from owncloud/no-migration-for-mssql-master
...
Disable database migrations for MSSQL - scripts have to be applied manua...
2014-09-16 14:00:24 +02:00
f31e4066de
Conceal or display SabreDAV version number in browser and http response headers.
2014-09-16 13:25:44 +02:00
5813cf32dc
Deduplicate dependency checks
...
Some code that I also used for https://github.com/owncloud/administration/pull/11
2014-09-16 13:07:47 +02:00
e6609d0970
simplify mysql user creation flow
...
if dbuser exists try a different one, owncloud/core#108
changed outdated comment
corrected length calculation
changed indentation for else clauses
2014-09-16 11:53:54 +02:00
Vincent Petry
Lukas Reschke
Tony Zelenoff
Jenkins for ownCloud
Jörn Friedrich Dreyer
Robin Appelman
michag86
Morris Jobke
Victor Dubiniuk
Olivier Paroz
Nmz
Bjoern Schiessle
Thomas Müller
Robin Appelman
Tigran Mkrtchyan
Clark Tomlinson
blizzz
Joas Schilling
Georg Ehrke
voxsim
Remco Brenninkmeijer
tobiasKaminsky
scolebrook
Michael Göhler