Commit Graph

7609 Commits

Author SHA1 Message Date
Jenkins for ownCloud 3a16b1bb68 [tx-robot] updated from transifex 2014-09-27 01:54:48 -04:00
Bjoern Schiessle 2a4da7fe09 on unshare only unshare childrens if there is no other parent available 2014-09-26 16:58:47 +02:00
Lukas Reschke 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
Bjoern Schiessle 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
Bjoern Schiessle ed85055d31 for group shares we don't need a extra db entry of groupTarget equals itemTarget 2014-09-26 13:10:31 +02:00
Bjoern Schiessle 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
Thomas Müller 4c08215e66 catch and log exception in OC_Helper::cleanTmp() 2014-09-26 11:36:53 +02:00
Thomas Müller e5a111b80e Merge pull request #11285 from owncloud/dav-permissions-create
Fix dav permissions for folders
2014-09-26 09:21:32 +02:00
Jenkins for ownCloud 1631937990 [tx-robot] updated from transifex 2014-09-26 01:54:59 -04:00
Robin Appelman 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
Vincent Petry 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
Bjoern Schiessle 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
Robin Appelman 10c350b895 Fix dav permissions for folders without create permissions 2014-09-25 14:01:19 +02:00
Robin Appelman ccb4475a8d Expose creatable permissions trough fileinfo 2014-09-25 14:00:13 +02:00
Bjoern Schiessle 968152113e always select permissions, used in getItems() 2014-09-25 12:35:11 +02:00
Bjoern Schiessle d5fc011c90 some small fixes 2014-09-25 11:29:57 +02:00
Jenkins for ownCloud f46e49529f [tx-robot] updated from transifex 2014-09-25 01:55:32 -04:00
Lukas Reschke cb002c1f6b Clarify possible preview providers for type Office
a
2014-09-24 21:21:39 +02:00
Thomas Müller 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
Robin Appelman f88021dbbc Don't keep the full info of all children in memory 2014-09-24 15:44:56 +02:00
Lukas Reschke 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
Bjoern Schiessle 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
Bjoern Schiessle 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
Bjoern Schiessle 9f7b15582a fix add user to group to work with grouped shares 2014-09-24 14:02:01 +02:00
Bjoern Schiessle bd268c35f5 generateTarget() will always find a unique target 2014-09-24 14:02:01 +02:00
Jenkins for ownCloud 5ff5b7386f [tx-robot] updated from transifex 2014-09-24 01:56:46 -04:00
Lukas Reschke 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
Vincent Petry 89e02e89d4 Merge pull request #7051 from owncloud/postsetupajaxcheck
Moved WebDAV check to client side JS
2014-09-23 16:55:16 +02:00
Tigran Mkrtchyan 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
Lukas Reschke 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
Thomas Müller 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
Thomas Müller 42fe0b9e08 Merge pull request #11241 from owncloud/use-lower-case
Use only lower-case letters
2014-09-23 12:16:58 +02:00
Lukas Reschke 5d977f97b0 Merge pull request #11032 from owncloud/harden-redirect
Do only follow HTTP and HTTPS redirects
2014-09-23 11:34:44 +02:00
Vincent Petry 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
Vincent Petry fc42a64e6c Merge pull request #11226 from owncloud/kill-postsetupcheck-master
remove post setup check
2014-09-23 10:33:50 +02:00
Jenkins for ownCloud 479e4410c5 [tx-robot] updated from transifex 2014-09-23 02:05:45 -04:00
Thomas Müller 37a5bff155 Merge pull request #11227 from owncloud/fix-windows-path
fixing directory seperators
2014-09-23 07:38:23 +02:00
Morris Jobke 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
Morris Jobke 051ed93e24 Merge pull request #11211 from owncloud/previewProviderSwitch
Add a configuration switch for enabled preview mimetypes
2014-09-23 00:45:59 +02:00
Lukas Reschke 1565d82b81 Use only lower-case letters
Fixes https://github.com/owncloud/core/issues/11239
2014-09-22 21:29:03 +02:00
Lukas Reschke 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
Thomas Müller 21412559df remove post setup check 2014-09-22 19:43:55 +02:00
Bjoern Schiessle 9105e17307 unit tests for grouping of shares pointing to the same source 2014-09-22 17:54:47 +02:00
Bjoern Schiessle 89c3b650e6 group shares and combine permissions 2014-09-22 17:25:15 +02:00
Morris Jobke 9e8d2907e2 Merge pull request #11204 from owncloud/fix_oc_stream_seek
Fix oc stream seek
2014-09-22 16:25:07 +02:00
Clark Tomlinson db72270acc fixing directory seperators 2014-09-22 10:13:46 -04:00
Lukas Reschke ca3447fcde Add a configuration switch for enabled preview mimetypes 2014-09-22 16:09:08 +02:00
Thomas Müller 814114ab8e enhance formatDate function to accept an optional argument containing the time zone 2014-09-22 15:03:28 +02:00
Morris Jobke 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
Thomas Müller bb18fe1384 send browsers timezone back tp the server on login 2014-09-22 14:01:45 +02:00
Vincent Petry 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
blizzz b8a1340538 Merge pull request #9225 from voxsim/fix_displayNamesInGroup
fix in displayNamesInGroup
2014-09-22 12:13:15 +02:00
Jörn Friedrich Dreyer f83689e1be in quota wrapper use === instead of ! for better readability and as in other wrappers 2014-09-22 11:35:42 +02:00
Jörn Friedrich Dreyer 561a7e47cd return boolean in Ciose::stream_seek 2014-09-22 11:33:55 +02:00
Joas Schilling 71bec60b92 Also match routes without trailing slash
Fix #11209
2014-09-22 11:22:33 +02:00
Jörn Friedrich Dreyer b752cb98d8 return boolean in OC::stream_seek 2014-09-22 11:20:15 +02:00
Thomas Müller 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
Thomas Müller 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
Jenkins for ownCloud 5aaf8dcc01 [tx-robot] updated from transifex 2014-09-22 01:54:36 -04:00
Morris Jobke 154e848ce2 Merge pull request #11199 from owncloud/delete_bogus_previews
Delete bogus cached previews while updating
2014-09-21 22:48:21 +02:00
Georg Ehrke 071e4bfc06 make sure preview prop is instanceof OC_Image before using it in showPreview 2014-09-21 17:30:29 +02:00
Georg Ehrke ab2554e013 delete old previews 2014-09-21 17:16:21 +02:00
Morris Jobke 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
Jenkins for ownCloud a1c39f74b7 [tx-robot] updated from transifex 2014-09-21 01:54:29 -04:00
Thomas Müller 7537d405e3 adding 'smallint unsigned' to type mapping for sqlite 2014-09-20 20:06:44 +02:00
Jenkins for ownCloud e55c4bb807 [tx-robot] updated from transifex 2014-09-20 01:54:34 -04:00
Morris Jobke 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
Lukas Reschke 4c6bad7f71 Merge pull request #11158 from owncloud/fix_basic_auth
Move BasicAuth check to isLoggedIn
2014-09-19 13:39:13 +02:00
Lukas Reschke 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
Vincent Petry 437f8c3cd5 Merge pull request #11119 from owncloud/removeOldUpgradeRoutines
Remove old upgrade routines
2014-09-19 12:23:42 +02:00
Vincent Petry 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
Robin Appelman 33f7af9207 Merge pull request #10958 from owncloud/db-ilike
Introduce cross-db ILIKE
2014-09-19 12:07:56 +02:00
Jenkins for ownCloud 786312d0e8 [tx-robot] updated from transifex 2014-09-19 01:55:44 -04:00
Lukas Reschke a71af58535 Prevent updates between multiple major versions
Ref https://github.com/owncloud/core/issues/11078
2014-09-18 17:56:06 +02:00
voxsim 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
Lukas Reschke 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
Lukas Reschke a543807d85 Merge pull request #11151 from owncloud/removeOverflowingFunction
Remove unused and overflowing function
2014-09-18 15:42:36 +02:00
Robin Appelman a85f0ae2da Fix ILIKE without wildcards for oracle 2014-09-18 15:09:57 +02:00
Lukas Reschke f0bf46b080 Merge pull request #11130 from owncloud/moveBasicAuthCheck
Move basic auth check
2014-09-18 14:40:42 +02:00
Robin Appelman c8dbdc29d0 Check for writable datadir during setup 2014-09-18 14:15:52 +02:00
Robin Appelman 23dd7cb51d Don't complain about non-writable datadirs before we're installed 2014-09-18 13:33:13 +02:00
Robin Appelman 6fa3280c2a Inject config into checkserver and cleanup tests 2014-09-18 13:33:13 +02:00
Lukas Reschke d07d5915c9 Remove unused and overflowing function
Resolves https://github.com/owncloud/core/issues/10991 failure 4
2014-09-18 10:21:28 +02:00
Morris Jobke c89c6ed21d Merge pull request #11143 from owncloud/improve-404
Make 404 page easier to understand
2014-09-18 09:10:16 +02:00
Jenkins for ownCloud dd6b0b1319 [tx-robot] updated from transifex 2014-09-18 01:54:39 -04:00
Lukas Reschke 8fc1a9f5a9 Make 404 page easier to understand
Fixes https://github.com/owncloud/core/issues/11133
2014-09-17 22:57:32 +02:00
Remco Brenninkmeijer f930b356e6 Error needs to push body-id for new guest layout 2014-09-17 18:02:18 +02:00
Lukas Reschke 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
Robin Appelman 0c03b2bdd5 Use ILIKE in cache search 2014-09-17 16:12:54 +02:00
Lukas Reschke 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
Lukas Reschke c88d517e88 Merge pull request #10622 from owncloud/recursive-delete-forbidden
Fix isDeletable
2014-09-17 15:36:41 +02:00
Robin Appelman 67b1ec1faf Implement ILIKE for sqlite 2014-09-17 13:47:55 +02:00
Robin Appelman 60587e9dcd Make sqlite LIKE case sensitive on default 2014-09-17 13:47:33 +02:00
Morris Jobke c6eab9aaba fix error message template 2014-09-17 13:25:50 +02:00
Lukas Reschke 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
Morris Jobke 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
Lukas Reschke 33c0d2f743 Fix mapping of relative paths 2014-09-17 11:38:10 +02:00
Robin Appelman 2f22e67570 Also check if the file itself is updatable 2014-09-17 11:35:16 +02:00
Robin Appelman d25a9a118f Check if a folder is deletable before we try to recursively delete it 2014-09-17 11:35:16 +02:00
Robin Appelman ab79caf29b Check if the parent is writable to check if a file is deletable 2014-09-17 11:35:16 +02:00
Lukas Reschke 0d37e16499 Merge pull request #11092 from owncloud/conceal_sabredav_version
Conceal or display SabreDAV version number.
2014-09-17 10:35:50 +02:00
Lukas Reschke 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
Lukas Reschke 368391e401 Merge pull request #11009 from owncloud/tobiasKaminsky-route
REST API for thumbnails
2014-09-16 19:31:51 +02:00
Lukas Reschke 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
Lukas Reschke 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
Thomas Müller ba445e85b2 Merge pull request #11082 from owncloud/deduplicateDependencyCheck
Deduplicate dependency checks
2014-09-16 16:33:02 +02:00
Lukas Reschke 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
Thomas Müller ca35d86c5a adding ILIKE to AdapterSQLSrv 2014-09-16 15:44:21 +02:00
Robin Appelman 1771bfc2f2 Introduce cross-db ILIKE 2014-09-16 15:32:34 +02:00
tobiasKaminsky 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
Lukas Reschke 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
scolebrook f31e4066de Conceal or display SabreDAV version number in browser and http response headers. 2014-09-16 13:25:44 +02:00
Lukas Reschke 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
Michael Göhler 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
Morris Jobke dd70d1b88c Merge pull request #11090 from owncloud/fix-undefined-class-and-phpdoc
Fix unexisting class and PHPDoc
2014-09-16 10:29:01 +02:00
Morris Jobke af52ffc5d5 Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspect
add y to with-aspect naming schema
2014-09-16 08:36:33 +02:00
Morris Jobke 245a0e2ad8 Merge pull request #10362 from owncloud/preserve_transparency_on_fileload
Preserve transparency when loading from a file
2014-09-16 08:33:56 +02:00
voxsim 1366133d2b add more logic in displayNamesInGroup for big user bases 2014-09-15 18:37:54 +02:00
Lukas Reschke 627252fe81 Merge pull request #11060 from owncloud/rmobslang
remove obsolete language files
2014-09-15 17:31:10 +02:00
Lukas Reschke 4f0f7e35ca Fix unexisting class and PHPDoc
You can't add int here as hint...
2014-09-15 17:08:56 +02:00
Morris Jobke 06eb3b62c6 Merge pull request #10109 from owncloud/issue_#9793_guestlayout
Step one, open guest layout for different styles.
2014-09-15 15:15:41 +02:00
Georg Ehrke cf76933b76 add phpdoc 2014-09-15 15:10:03 +02:00
Georg Ehrke 3157d307f7 add y to with-aspect naming schema 2014-09-15 15:10:03 +02:00
Thomas Müller d824d03fe1 Disable database migrations for MSSQL - scripts have to be applied manually 2014-09-15 15:00:32 +02:00
Lukas Reschke 07b14bcd4f Merge pull request #10960 from owncloud/use-intl-module-master
use intl's native normalizer_normalize() in case the module is available
2014-09-15 14:13:30 +02:00
Volkan Gezer 5d1fa60e0d remove obsolete language files 2014-09-13 15:29:11 +02:00
Raghu Nayyar 1145529584 Merge pull request #11041 from owncloud/no-size-check-on-lock-master
content size checks are not valid for LOCK
2014-09-13 00:48:52 +05:30
Clark Tomlinson cfd8b3f976 Merge pull request #11043 from owncloud/test-againstNull
Return false in case the passed values are not of type string
2014-09-12 09:42:42 -04:00
Lukas Reschke 5ff999d69d Return false in case one of the values is null 2014-09-12 13:34:45 +02:00
Thomas Müller 27cd30aa94 content size checks are not valid for LOCK 2014-09-12 09:42:32 +02:00
Jenkins for ownCloud d6834b6389 [tx-robot] updated from transifex 2014-09-12 03:28:56 -04:00
Thomas Müller 4878f7a416 Merge pull request #11006 from owncloud/addCustomHex2BinImplementationBecauseSupporting53IsSomethingReallyReallyCoolAndWeAreObviouslySomeOfTheCoolGuys
Add custom hex2bin implementation for 5.3
2014-09-11 15:05:36 +02:00
Lukas Reschke 7d2c521b46 Step one, open guest layout for different styles.
Conflicts:
	core/templates/layout.guest.php

Step one, open guest layout for different styles.
2014-09-11 11:41:02 +02:00
Lukas Reschke 8d7926543b Merge pull request #3937 from owncloud/refresh_if_maintenance_is_over
Refresh if maintenance mode is over
2014-09-11 11:34:39 +02:00
Thomas Müller 59209e0f2b use intl's native normalizer_normalize() in case the module is available 2014-09-11 10:24:31 +02:00
Lukas Reschke bfebbe47de Merge pull request #10962 from owncloud/repair_search_lucene
repair search lucene before installing
2014-09-11 10:09:43 +02:00
Lukas Reschke 1973275adc Add custom hex2bin implementation for 5.3
Fixes https://github.com/owncloud/core/issues/11004
2014-09-11 09:51:45 +02:00
Jenkins for ownCloud 0dcd8079dc [tx-robot] updated from transifex 2014-09-11 01:54:41 -04:00
kondou 18ef7bf1ed Preserve transparency when loading from a file
Fix #7148 - again :)
2014-09-10 23:49:21 +02:00
Thomas Müller 2a382a87d5 Merge pull request #10988 from owncloud/usetransactions-wrong-name
Fix method name useTransactions
2014-09-10 17:27:23 +02:00
Robin Appelman fa2b385d33 Fix method name 2014-09-10 15:59:24 +02:00
Vincent Petry 70ebe86e60 Merge pull request #10929 from owncloud/issue/10514
Set overwritewebroot when installing owncloud to avoid problems
2014-09-10 15:07:57 +02:00
Jörn Friedrich Dreyer 8e2acb1482 repair search lucene before installing 2014-09-10 10:22:40 +02:00
Bernhard Posselt ba698a4942 Merge pull request #10972 from ppaysant/routes-defaults
Allow default values for route parameters.
2014-09-09 23:40:46 +02:00
Lukas Reschke c3d90b96c8 Merge pull request #10922 from owncloud/explicit-scan-transactions
Use bigger transactions when doing explicit file system scans
2014-09-09 23:32:32 +02:00
Patrick Paysant cb5416b798 Allow default values for route parameters. 2014-09-09 23:00:29 +02:00
kondou 69f2c0544e Refresh if maintenance mode is over
Using status.php for this.
I modified status.php to also show, whether we're in maintenance.

Checks every 20 seconds if maintenance is over, if yes: reload.
2014-09-09 17:26:11 +02:00
Bernhard Posselt 023e066971 more sugar for including lists of templates 2014-09-09 15:47:42 +02:00
Bernhard Posselt d02f6c7ebe Merge pull request #10947 from owncloud/html-imports
add template functions for html imports
2014-09-09 14:07:46 +02:00
Jörn Friedrich Dreyer 3d4f77c8f1 Merge pull request #10949 from owncloud/allow_prefilling_login
allow prefilling login
2014-09-09 11:42:14 +02:00
Lukas Reschke 353155b516 Merge pull request #7323 from owncloud/Jonny007-MKD-master
Update adapter.php
2014-09-09 11:31:50 +02:00
Jörn Friedrich Dreyer ed2414fd0d Merge pull request #10886 from owncloud/keep_fileid_on_move_in_objectstore
Keep fileid on move in objectstore, fixes #10848
2014-09-09 10:25:10 +02:00
Jenkins for ownCloud 317e6d03b4 [tx-robot] updated from transifex 2014-09-09 01:55:47 -04:00
VicDeo efd485acda Merge pull request #10858 from owncloud/issue/10847
Use correct language package so the subject is correctly translated
2014-09-09 01:11:34 +03:00
Vincent Petry a9a3f17b35 Merge pull request #10927 from owncloud/update-nosetupbackends
Do not load extra user backends when an upgrade is due
2014-09-08 22:57:15 +02:00
Jörn Friedrich Dreyer 0aad7fa1b1 allow prefilling login 2014-09-08 21:44:13 +02:00
Bernhard Posselt f685d03674 append .html since componets always use html files 2014-09-08 21:37:18 +02:00
Bernhard Posselt 4aff85cd0c add template functions for html imports 2014-09-08 21:19:44 +02:00
Lukas Reschke 70abce0482 Merge pull request #10739 from owncloud/eventsource-public
Add EventSource to the public API
2014-09-08 18:46:27 +02:00
Lukas Reschke c79c894dbb Merge pull request #10755 from owncloud/shorter_sharing_links
Shorter sharing links
2014-09-08 17:26:20 +02:00
Lukas Reschke 2d847934ed Merge pull request #10938 from owncloud/useSecureMimetype
Use secure mimetype for content delivery
2014-09-08 17:13:54 +02:00
Lukas Reschke 5de404eb92 Merge pull request #10827 from oparoz/patch-2
Libreoffice config folder needs to be set
2014-09-08 16:41:26 +02:00
Lukas Reschke fa718d2e2c Fix typo 2014-09-08 16:34:03 +02:00
Lukas Reschke 0cdfe4f8c2 Merge pull request #10911 from owncloud/template-funcs
Add template shortcut functions for style and script
2014-09-08 16:32:05 +02:00
Lukas Reschke 2590a4dc85 Append port to trusted domain in case it's not 80 or 443
Ref https://github.com/owncloud/core/pull/10584#issuecomment-54677059
2014-09-08 16:15:31 +02:00
Lukas Reschke 312ed18d15 Use secure mimetype for content delivery
Adds some hardening against potential CSP bypassed.
2014-09-08 15:57:39 +02:00
Joas Schilling c5b5378558 Add a method to get the absolute url for a route
Fix #10926
2014-09-08 14:43:14 +02:00
Joas Schilling 249558966e Set overwritewebroot when installing owncloud to avoid problems
Fix #10514
2014-09-08 14:30:13 +02:00
Robin Appelman 644755df66 Use bigger transactions when doing explicit file system scans 2014-09-08 14:15:41 +02:00
Vincent Petry d6bfd90bf8 Do not load extra user backends when an upgrade is due
Whenever an upgrade is due, do not load extra user backends
2014-09-08 12:30:04 +02:00
Vincent Petry 637cff68ac Merge pull request #10862 from chli1/master
fix BadRequest error if CONTENT_LENGTH not set
2014-09-08 10:00:15 +02:00
cetra3 459ead69f6 Merge branch 'master' of https://github.com/owncloud/core 2014-09-08 15:05:49 +09:30
Bernhard Posselt 7e4d244200 add shortcut functions for style and script 2014-09-06 14:25:28 +02:00
Lukas Reschke f5951b2254 Merge pull request #10889 from owncloud/moveTrustedDomainCheck
Move trusted domain check to init()
2014-09-05 17:39:37 +02:00
Lukas Reschke c9afa60f62 Move trusted domain check to init()
handleRequest() is not called from remote.php or public.php which made these files party available but all included apps in there produced errors.

As the expected behaviour is anyways that a trusted domain warning is shown I moved this to init()

Fixes https://github.com/owncloud/core/issues/10064
2014-09-05 14:10:35 +02:00
Jörn Friedrich Dreyer 8488be4d03 Keep fileid on move in objectstore, fixes #10848 2014-09-05 13:25:59 +02:00
Robin Appelman e29b7e9335 Remove explicit propagate calls 2014-09-05 11:53:24 +02:00
Robin Appelman d0e83a71aa Update cache before post hooks 2014-09-05 11:53:24 +02:00
Robin Appelman 1d8a88dd1b Fix warning in homecache 2014-09-05 11:53:23 +02:00
Robin Appelman 850542c5d6 Refactor Cache\Updater to work outside of the users home 2014-09-05 11:53:23 +02:00
Jenkins for ownCloud 0736a6695e [tx-robot] updated from transifex 2014-09-05 01:54:39 -04:00
kondou ecc9b42e41 Match \OC_Helper::linkToPublic() to new links and fit unittests 2014-09-04 20:44:50 +02:00
kondou a10411d2bc Readd TOKEN_LENGTH 2014-09-04 19:09:26 +02:00
Jesus Macias Portela 523680cef2 Merge pull request #10840 from owncloud/issue_10674
Solve bug with touch always return true on /lib/private/files/view.php
2014-09-04 17:29:08 +02:00
kondou 226b203e20 Use base62 and remove configuration options for link length 2014-09-04 16:20:20 +02:00
kondou c2d8eabd71 Change config.sample entry and use MediumSecurity 2014-09-04 15:52:23 +02:00
kondou 3bf725d7e0 Adapt token size to new generation and add an option for free length specification
Minimum size is 3 = 46656 tokens, maximum size is 64, which is what our DB allows.
2014-09-04 15:24:33 +02:00
kondou 2a4c51389c Use a route instead of s.php and convert tokens asap 2014-09-04 15:23:55 +02:00
kondou 0f2ad9862e Initial work on shorter links 2014-09-04 15:23:53 +02:00
Lukas Reschke 1a7df33233 Merge pull request #10818 from owncloud/enableappforgroupfix
Fix upgrade process when apps enabled for specific groups
2014-09-04 13:56:41 +02:00
chli1 712487c861 fix BadRequest error if CONTENT_LENGTH not set
If client does not send content length header on webdav upload (e.g. because the content comes from a stream and its length is not predictable) the put() method should not try to compare the content length value with the actually amount of received data, because this will always fail and results in a BadRequest exception. So the check will only be performed if $_SERVER['CONTENT_LENGTH'] is set.
2014-09-04 13:49:15 +02:00
Robin Appelman fa3393674c Better phpdoc and method naming 2014-09-04 13:26:51 +02:00
Robin Appelman 8605e2e6a5 Explicitly cast id and validate type 2014-09-04 13:26:47 +02:00
Olivier Paroz bbc2d7cf4f Typ in whichOpenOffice test 2014-09-04 12:54:20 +02:00
Joas Schilling a0e8e88bc6 Use correct language package so the subject is correctly translated
Fix #10847
2014-09-04 11:23:23 +02:00
Lukas Reschke 8fec19a872 Merge pull request #10790 from cbhp/master
added missing User-Agents
2014-09-03 22:40:12 +02:00
Jesus Macias 91c8174013 Fix code with previous comments 2014-09-03 18:21:24 +02:00
Jesus Macias 883649b69c Reset changes on 3rdparty submodule 2014-09-03 18:20:09 +02:00
cbhp c00450b2c7 always use a user-agent constant
Some providers block connections with missing user-agents. Also
user-agents are useful for analyzing requests. I've added a USER_AGENT
constant that is used in cURL and in file_get_contents.
2014-09-03 18:00:05 +02:00
Lukas Reschke 63a90a129b Use proper RNG generator
OC_Util::generateRandomBytes() only returns lowercase alphanumeric values.
We should use the new RNG which has a broader characterset.
2014-09-03 17:46:48 +02:00
Lukas Reschke 26f337d523 Only return lowercase letters and digits for backwards compatbility 2014-09-03 17:18:00 +02:00
Thomas Müller 954925eaa0 Merge pull request #10667 from pmjdebruijn/itunes-appid
defaults: add customizable defaultiTunesAppId
2014-09-03 16:26:20 +02:00
Olivier Paroz eaab067716 env:UserInstallation was already there in master
My changes were made against stable7 and I merged them to the file in master, so this version is now the properly merged file for master.
I'm just adding `owncloud-<instanceid>` to the path where temp files are stored.
2014-09-03 16:08:40 +02:00
Lukas Reschke 373d1c5e9f Merge pull request #10642 from owncloud/securityutils
Add some security utilities
2014-09-03 15:28:42 +02:00
Clark Tomlinson d64cacec43 Merge pull request #10826 from oparoz/master
Adding TIFF support to the files app
2014-09-03 09:14:35 -04:00
Clark Tomlinson 0400f7845c Merge pull request #10723 from owncloud/webdav-folder-size
adding new webdav property containing the folder size
2014-09-03 09:07:23 -04:00
Lukas Reschke dcea6de26a Fix quoting 2014-09-03 14:16:55 +02:00
Lukas Reschke a54af89d8a Add test for the second argument 2014-09-03 14:13:12 +02:00
Robin Appelman 65608d7c92 Use the public api to get event sources 2014-09-03 13:36:15 +02:00
Robin Appelman dad53180bc Add event source to the public api 2014-09-03 13:36:15 +02:00
Robin Appelman 54c918fe48 Initialize an event source when we start using it, not in the constructor 2014-09-03 13:35:04 +02:00
Olivier Paroz 3bf155e138 This is not a PDF, there are no pages 2014-09-03 12:32:59 +02:00
Lukas Reschke 20a7fb0334 Fix CHAR_SYMBOLS 2014-09-03 12:22:21 +02:00
Thomas Müller 6cdb1d89ae Merge pull request #10761 from canadaduane/fix_occ_upgrade
Ensure db connection before changing cache state
2014-09-03 11:27:16 +02:00
Thomas Müller 52dc31e13c Merge pull request #10725 from owncloud/sabredav-etag-master
adding OC-ETag header
2014-09-03 11:21:47 +02:00
Lukas Reschke 77c0adb520 Merge branch 'securityutils' of https://github.com/owncloud/core into securityutils 2014-09-03 11:04:49 +02:00
Lukas Reschke 50b430ee7c Add char consts, hash the specified password for the HMAC 2014-09-03 11:03:27 +02:00
Jenkins for ownCloud 8787162ec9 [tx-robot] updated from transifex 2014-09-03 01:54:34 -04:00
Olivier Paroz 0c3c72aec0 Libreoffice config folder needs to be set
In order to avoid conflicts between multiple instances installed on one server, it's required to define a LibreOffice configuration folder per instance.

Just like with my PR for the documents app (https://github.com/owncloud/documents/pull/353), I propose to use /tmp/owncloud-instanceid
2014-09-03 03:12:35 +02:00
Olivier Paroz b559b21dc3 Converts TIFF files to PNG 2014-09-02 22:56:39 +02:00
Olivier Paroz 1e600a0d36 Adding support for tiff files 2014-09-02 22:53:41 +02:00
Vincent Petry e05b95636b Fix upgrade process when apps enabled for specific groups
Fix issue where the currently logged user was causing side-effects when
upgrading.
Now setting incognito mode (no user) on update to make sure the whole
apps list is taken into account with getEnabledApps() or isEnabled().
2014-09-02 17:16:14 +02:00
Robin Appelman 3c618a0252 Also setup the filesystem when matching routes 2014-09-02 16:15:42 +02:00
Robin Appelman a9a37b5363 Don't automatically setup the filesystem the moment we load OC\Files\FileSystem 2014-09-02 16:15:42 +02:00
Jenkins for ownCloud 689bbbe937 [tx-robot] updated from transifex 2014-09-02 01:56:07 -04:00
Jenkins for ownCloud e6e04bde4f [tx-robot] updated from transifex 2014-09-01 01:59:19 -04:00
cbhp 969b41c1c9 added missing User-Agents
header "User-Agent" was missed
2014-08-31 19:44:06 +02:00
Morris Jobke 4024960a0e Merge pull request #10780 from owncloud/config-public
Extend public config interface
2014-08-31 15:54:35 +02:00
Lukas Reschke 8009df0b60 Merge pull request #10420 from owncloud/external-share-self-signed
Make external shares work with imported self signed certificates
2014-08-31 15:50:30 +02:00
Robin Appelman 0a1e5aebf1 Extend public config interface 2014-08-31 15:27:36 +02:00
Lukas Reschke ae3425d2da Merge branch 'master' into securityutils
Conflicts:
	lib/private/util.php
2014-08-31 15:21:09 +02:00
Morris Jobke 73685892ed Merge pull request #10770 from owncloud/getUserFolder
update public interface for getUserFolder
2014-08-31 13:26:32 +02:00
Lukas Reschke a197ef0f6c Merge pull request #10768 from owncloud/l10n-use-public
Use public api for getting l10n
2014-08-31 11:58:59 +02:00
Morris Jobke ac6324a5d0 update public interface for getUserFolder 2014-08-31 11:16:40 +02:00
Robin Appelman bfa0c4b78a Explicitly set the timezones 2014-08-31 11:06:18 +02:00
Lukas Reschke 4efe6f6240 Add unit tests and fix rootcerts creation bug 2014-08-31 10:47:50 +02:00
Robin Appelman e64aa330fd check for blacklisted file certificate filenames 2014-08-31 10:47:50 +02:00
Robin Appelman 79d896e830 Rename namespace 2014-08-31 10:47:50 +02:00
Robin Appelman 6044ad0e17 Cleanup certificate code 2014-08-31 10:47:50 +02:00
Robin Appelman ba8416a04f move certificate classes to their own namespace 2014-08-31 10:47:50 +02:00
Robin Appelman c158db7200 Add certificate class 2014-08-31 10:47:50 +02:00
Robin Appelman c1b11571ea Move certificate management interface from files_external to core 2014-08-31 10:47:50 +02:00
Robin Appelman 4efdbff6df No need for this folder to be world accessible 2014-08-31 10:45:11 +02:00
Robin Appelman dcc4f96d3e Verify names of certificates 2014-08-31 10:45:11 +02:00
Robin Appelman ecdbf00628 Move certificate management code to core 2014-08-31 10:45:10 +02:00
Robin Appelman a58e670ae5 Also extend public server interface 2014-08-31 10:20:00 +02:00
Robin Appelman d0266c0bf8 Use public api for getting l10n 2014-08-31 10:08:22 +02:00
Morris Jobke 06e6f10ce4 Add optional user ID parameter for getUseFolder 2014-08-31 09:49:19 +02:00
Jenkins for ownCloud 23137f4798 [tx-robot] updated from transifex 2014-08-31 01:56:20 -04:00
Duane Johnson ccf440495e Ensure db connection before changing cache state
When trying to upgrade from 7.0.0 to 7.0.2, the manual upgrade path
(e.g. ` sudo -u www-data /usr/bin/php5 ./occ upgrade`) exits with the
following fatal error:

```
/var/www/owncloud# php occ upgrade
PHP Fatal error:  Call to a member function
  disableQueryStatementCaching() on a non-object in
  /var/www/owncloud/lib/private/db.php on line 423
```

This is caused by the self::$connection static variable having not
been initialized at the point of call. Adding a self::connect() fixes
the issue.

See https://forum.owncloud.org/viewtopic.php?f=29&t=23398&p=68556#p68556
2014-08-30 15:46:56 -06:00