Commit Graph

9826 Commits

Author SHA1 Message Date
Morris Jobke f7a78cf650 Merge pull request #17663 from owncloud/occ-memcache
Missing memcache should not cause occ hard-fail
2015-07-17 13:15:47 +02:00
Joas Schilling 3566dcf246 PR #17046 deprecated OCP\Util::mb_(sub)str_replace() 2015-07-17 12:34:56 +02:00
Joas Schilling 8a64abf4e4 Only decorate the type when it was matched 2015-07-17 12:34:56 +02:00
Joas Schilling a0c6f2e5e0 Use the decorator pattern 2015-07-17 12:34:56 +02:00
Joas Schilling bba87a2a3b Restructor the code into different classes instead of extending 2015-07-17 12:34:56 +02:00
Joas Schilling eb1c437941 Check for methods as good as possible 2015-07-17 12:34:56 +02:00
Joas Schilling 2783a78070 Allow checking for functions 2015-07-17 12:34:56 +02:00
Joas Schilling f228a3dc28 Add support for deprecated constants 2015-07-17 12:34:56 +02:00
Joas Schilling 483c886291 Add deprecation version to the list 2015-07-17 12:34:56 +02:00
Joas Schilling d2fc1b2302 Correctly handle use statements 2015-07-17 12:34:56 +02:00
Joas Schilling 4e95031ec4 Allow app:check-code to check for deprecated methods 2015-07-17 12:34:55 +02:00
Morris Jobke 3fae984b56 Merge pull request #17282 from owncloud/s2s-catchremotelockexceptions
Throw lock exceptions if remote share returned 423 status code
2015-07-17 11:34:34 +02:00
Jenkins for ownCloud 8723410319 [tx-robot] updated from transifex 2015-07-17 01:54:52 -04:00
Thomas Müller bd71540c8a Fixing 'Undefined index: REMOTE_ADDR' - fixes #17460 2015-07-16 16:40:57 +02:00
blizzz bfb90d10ed Merge pull request #17046 from nicolas-grekas/fix-16654
Do not use OC*::mb_*_replace(), they are useless
2015-07-16 11:35:25 +02:00
Nicolas Grekas 472d48f6e3 Do not use OC*::mb_*_replace(), they are useless 2015-07-16 11:00:04 +02:00
Robin McCorkell 8efa23c895 Fix memcache factory unit tests 2015-07-16 03:53:18 +01:00
Robin McCorkell e556d97b64 Fix memcache factory creation when not installed
Memcache factory expects a class name, not an instantiated object
2015-07-15 22:55:30 +01:00
Robin McCorkell 7830434d78 Missing memcache should not cause occ hard-fail
Warning is now printed to logs, but occ and cron will still work.
2015-07-15 22:53:14 +01:00
Robin Appelman da951ba059 Use the new IteratorDirectory instead of the fakedir wrapper 2015-07-15 13:57:53 +02:00
Roeland Jago Douma fea71a81fd Cannot share the same file multiple times with remote user
Fix for #17183
It should not be possible to create multiple remote shares from user A
to user B of the same file/folder.
2015-07-15 12:42:40 +02:00
Morris Jobke c601fb8181 Merge pull request #17620 from owncloud/s2s-hasupdated-catch405
Throw StorageNotAvailable if propfind on root failed
2015-07-14 08:56:53 +02:00
Jenkins for ownCloud 2d5ddb02fa [tx-robot] updated from transifex 2015-07-14 01:54:45 -04:00
Vincent Petry f62d94c4ff Throw StorageNotAvailable if propfind on root failed
If PROPFIND fails with 404 or 405 on the remote share root, it means the
storage is not available. Throw StorageNotAvailable is such case.
2015-07-13 18:28:53 +02:00
Vincent Petry b3b080e1c0 Strip public webdav info about sharing and mount points
Remove information about whether a file is an incoming share or mount
point when requested over public webdav.
2015-07-13 14:20:35 +02:00
Morris Jobke 1006ec56ce Merge pull request #17481 from rullzer/mimetype-list
Move mimetypes.list.php to config/mimetypemapping.dist.json
2015-07-13 08:31:18 +02:00
Jenkins for ownCloud 7cf6badad5 [tx-robot] updated from transifex 2015-07-12 01:54:49 -04:00
Jenkins for ownCloud bfd7194cf9 [tx-robot] updated from transifex 2015-07-11 01:54:51 -04:00
Roeland Jago Douma 8cac236135 Move to OC::$configDif 2015-07-10 15:15:50 +02:00
Roeland Jago Douma 032ffc969e Move mimetypealiases.json to mimetypealiases.dist.json 2015-07-10 10:17:49 +02:00
Jenkins for ownCloud 176dabd976 [tx-robot] updated from transifex 2015-07-10 01:54:55 -04:00
Morris Jobke bceb38ce82 Merge pull request #17517 from RealRancor/fix_failed_login_syntax
Fixed "Remote IP:" syntax on failed logins
2015-07-10 02:34:09 +02:00
Morris Jobke c86e742e67 Merge pull request #15586 from Egari/addThemeSupportToMimeIcon
Add theme support to mimetypeIcon through imagePath integration
2015-07-09 23:02:46 +02:00
Morris Jobke d52e197b0d Merge pull request #16965 from owncloud/getUserFolder-in-IRootFolder
Add getUserFolder to IRootFolder
2015-07-09 14:29:47 +02:00
Thomas Müller d3b58d147f Allow upgrade of not enabled apps 2015-07-09 12:37:57 +02:00
RealRancor e62c375749 Fixed "Remote IP:" syntax on failed logins 2015-07-09 10:04:51 +02:00
Jenkins for ownCloud 6d9bb17360 [tx-robot] updated from transifex 2015-07-09 01:54:53 -04:00
Morris Jobke 19f34bafa5 Merge pull request #17472 from RealRancor/add_is_dir
Add is_dir check to getAllApps() function
2015-07-08 18:30:45 +02:00
Roeland Jago Douma 895d29adf1 Move mimetypemapping.json to mimetypemapping.dist.json
This allows users to create their own mapping file to extend our current
mappings. This makes sure that custom mappings are not lost on OC
upgrades.
2015-07-08 17:16:12 +02:00
Roeland Jago Douma 35fba1ef9f Move mimetypes.list.php to config/mimetypemapping.json
This allows users to add new mimetypemappings (extention -> mimetype)
themself. And not have to wait until a new release for updated
mimetypes.

Fixes: #15384
2015-07-08 13:18:58 +02:00
Morris Jobke 0fe81d2f21 Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptions
Fix the path for users which have an exception for a group share
2015-07-08 10:33:42 +02:00
RealRancor 1300204586 Add is_dir check to getAllApps() function 2015-07-08 10:25:39 +02:00
Jenkins for ownCloud 2fd84607ee [tx-robot] updated from transifex 2015-07-08 01:55:28 -04:00
stolter 1fc188fd29 Add theme support to mimetypeIcon through imagePath integration 2015-07-07 14:38:14 +02:00
Joas Schilling 6fb3a8d5f5 Add missing tunnel on new class 2015-07-07 11:18:24 +02:00
Joas Schilling 40eaf71a33 Make sure the owner always has the right path 2015-07-07 11:08:21 +02:00
Morris Jobke 87e10a7fb7 Merge pull request #17399 from rullzer/mimetype-php
PHP mimetype stuff should also use config/mimetypealiases.json
2015-07-07 11:05:50 +02:00
Roeland Jago Douma d685327d5a Make php also use config/mimetypealiases.json 2015-07-07 08:56:15 +02:00
Jenkins for ownCloud ee5dd25290 [tx-robot] updated from transifex 2015-07-07 01:55:18 -04:00
Roeland Douma b4f782b568 Merge pull request #16724 from owncloud/mimetype-js
Javascript to fetch mimetype icons
2015-07-06 20:59:56 +02:00
Bjoern Schiessle 058d910f5e intproduce pre_addToGroup hook. we need to calculate the possible unique
targets before the user was added to the group otherwise we will always detect
a name collision
2015-07-06 17:24:05 +02:00
Thomas Müller 9120942bcf Merge pull request #16924 from owncloud/copy-recursive-polyfill
add recursive copy polyfill for storage backends
2015-07-06 17:05:36 +02:00
Roeland Jago Douma c8145cdbd6 Javascript mimetype icon resolver
This makes it possible to retrieve the icon for mimetypes in javascript.
It makes no additional queries to the server to retrieve the mimetype.

* config/mimetypealiases.json added
* mimetype.js: this is where the logic resides to convert from mimetype
  to icon url
* mimetypelist.js: generated file with a list of mimetype mapping (aliases)
  and the list of icon files
* ./occ maintenance:mimetypesjs : new command for occ to gernerate
  mimetypes.js
* unit tests updated and still work
* javascript tests added
* theming support
* folder of the theme is now present in javascript (OC.theme.folder)
2015-07-06 16:32:10 +02:00
Vincent Petry 073e654692 Merge pull request #17304 from owncloud/fix-17265
Check if response could get generated
2015-07-06 12:29:07 +02:00
Jenkins for ownCloud 5734edfe20 [tx-robot] updated from transifex 2015-07-06 01:54:38 -04:00
Jenkins for ownCloud 55f4d0eea1 [tx-robot] updated from transifex 2015-07-05 01:54:50 -04:00
Jenkins for ownCloud 468871818d [tx-robot] updated from transifex 2015-07-04 01:55:24 -04:00
Thomas Müller 403deb2a33 Fixing unit test execution 2015-07-03 18:00:16 +02:00
Thomas Müller 1385b1ec48 Remove OC_Appconfig 2015-07-03 18:00:16 +02:00
Thomas Müller d3ac73c0c9 Remove OC_Log 2015-07-03 18:00:16 +02:00
Thomas Müller 68fd74963e Remove legacy search classes 2015-07-03 17:56:14 +02:00
Vincent Petry 3df27a01be Merge pull request #17379 from owncloud/kill-file-mapper
Remove file mapper - was only use in Windows and never worked properly
2015-07-03 17:53:47 +02:00
Thomas Müller 7b9daf84ee Merge pull request #16923 from owncloud/flysystem-base
Flysystem base adapter
2015-07-03 17:48:10 +02:00
Vincent Petry cc373ab89a Merge pull request #15470 from rullzer/files_sharing_getUrlContent
Move away from private static function OC_Util::getUrlContent
2015-07-03 17:47:46 +02:00
Robin Appelman de4e4cb6ea also dont download existing on fopen when using w+ and wb+ 2015-07-03 15:53:02 +02:00
Robin Appelman 6cc65b53ab add phpdoc 2015-07-03 15:53:02 +02:00
Robin Appelman 232872e401 add flysystem adapater 2015-07-03 15:53:02 +02:00
Thomas Müller f55aa856ad Remove file mapper - was only use in Windows and never worked properly 2015-07-03 15:41:29 +02:00
Morris Jobke 838ddc72c1 Merge pull request #17348 from owncloud/fix-lower-than
Correct lower than wording
2015-07-03 14:42:08 +02:00
Thomas Müller 7644c631e4 Merge pull request #15663 from owncloud/remove-ocp-app-register
Remove \OCP\App::register()
2015-07-03 13:44:58 +02:00
Robin Appelman b849b7c7f2 better handling of folders 2015-07-03 13:43:22 +02:00
Morris Jobke 208985dc1c fix wording 2015-07-03 12:54:49 +02:00
Morris Jobke 3e97ca3b96 Add getUserFolder to IRootFolder
* untangle DI of user specific folders
* allows to autodetect the dependency
2015-07-03 11:11:58 +02:00
Lukas Reschke 0b8ced1ab3 Merge pull request #17345 from owncloud/app-code-check-search
[app code check] add OC_Search_Provider and _Result
2015-07-03 09:44:18 +02:00
Vincent Petry f70791653c Merge pull request #17291 from owncloud/mount-manager-public
expose the mount manager in the public api
2015-07-03 07:57:31 +02:00
Jenkins for ownCloud b8f5b2c47a [tx-robot] updated from transifex 2015-07-03 01:54:57 -04:00
Vincent Petry 34043d4647 Throw lock exceptions if remote share returned 423 status code 2015-07-03 07:51:13 +02:00
Morris Jobke fd8f6a18fd Merge pull request #17327 from owncloud/fix_index
owner is stored as 'uid_owner', not as 'owner' in the oc_share table
2015-07-02 23:26:28 +02:00
Lukas Reschke 8335c7a4e9 Correct wording
If a max version of 8.0.1 has been specified the message should indicate that 8.0.1 is also supported.
2015-07-02 16:37:39 +02:00
Lukas Reschke b21d4a55f2 Add missing type annotations 2015-07-02 16:36:40 +02:00
Bjoern Schiessle f5a7aa2968 call post_addToGroup als for class OC_User because sharing and LDAP are using this class. Minimal approach to fix #16740 2015-07-02 16:25:11 +02:00
Morris Jobke 081264cb93 [app code check] add OC_Search_Provider and _Result
Thanks to @libasys for noticing this.
2015-07-02 16:20:20 +02:00
Joas Schilling 8294ad71fc Fix the path for users which have an exception for a group share 2015-07-02 15:35:31 +02:00
Morris Jobke f5c57e076e Merge pull request #17077 from owncloud/files-scan-absolute-path
fix getting mount points when passing a path to the files:scan command
2015-07-02 13:02:20 +02:00
Lukas Reschke 62e3de1bdb Check if response could get generated
`json_encode` fails hard on PHP >= 5.5 if a non UTF-8 value is specified by returning false. Older PHP versions just nullify the value which makes it at least somewhat usable.

This leads to very confusing errors which are very hard to debug since developers are usually not aware of this. In this case I'd consider throwing a fatal exception – since it arguably is an error situation – is a fair solution since this makes developers and administrators aware of any occurence of the problem so that these bugs can get fixed.

Fixes https://github.com/owncloud/core/issues/17265
2015-07-02 11:42:51 +02:00
Bjoern Schiessle f52eec765c owner is stored as 'uid_owner', not as 'owner' in the oc_share table 2015-07-02 10:49:22 +02:00
Lukas Reschke d67d4f36bd Delete OCS ID from DB if none is specified
If no OCS ID is specified in appinfo.xml and an app update is triggered and a OCS ID is stored in the DB we should clean the value.

Ref https://github.com/owncloud/activity/issues/320#issuecomment-117937748
2015-07-02 09:16:00 +02:00
Jenkins for ownCloud d2e1cae331 [tx-robot] updated from transifex 2015-07-02 01:59:26 -04:00
Robin Appelman 57945dbc4b fix typehinting 2015-07-01 16:13:33 +02:00
Robin Appelman 207ce35ee9 phpdoc 2015-07-01 16:07:57 +02:00
Robin Appelman faf642c31d expose the mount manager in the public api 2015-07-01 15:57:04 +02:00
Morris Jobke bad499baad Merge pull request #17252 from owncloud/fix-php-errors-in-app-description
Only do the description kung-fu on strings
2015-07-01 15:44:21 +02:00
Vincent Petry 709eca2085 Merge pull request #17268 from owncloud/files-cleanuppartfileonlyonce
Clean up part file only once, not twice on error
2015-07-01 15:20:53 +02:00
Michael Roth 78e02045c1 Changed broken links to php manual 2015-07-01 14:13:18 +02:00
Thomas Müller aae55174f6 Only do the description kung-fu on strings - fixes #17028 2015-07-01 13:15:13 +02:00
Vincent Petry cf245b80fe Only delete part file on error if it is really a part file 2015-07-01 12:52:06 +02:00
Vincent Petry fd4efdded9 Clean up part file only once, not twice on error 2015-07-01 09:47:05 +02:00
Morris Jobke b5c9196ffc Merge pull request #17088 from owncloud/add-verbosity-to-upgrade
[upgrade] add verbosity check and show repair info & steps
2015-07-01 08:56:06 +02:00
Morris Jobke 4e44cc49d9 Merge pull request #17093 from owncloud/upgrade-timestamp
[upgrade] show timestamp for output during upgrade
2015-07-01 08:55:32 +02:00
Morris Jobke da45fad3eb Merge pull request #17078 from owncloud/fix-initial-server-host
Fix undefined offset
2015-07-01 08:55:12 +02:00
Morris Jobke 1469177a3a Merge pull request #16406 from owncloud/enc-strlenperffix
Small perf tweak in strlen loop
2015-07-01 08:54:33 +02:00
Morris Jobke c703a3a63e Merge pull request #15569 from owncloud/remove-getetag-properties
Remove unneeded getetag entries in properties table
2015-07-01 08:53:37 +02:00
Vincent Petry b921748e61 Merge pull request #17224 from owncloud/webdav-handle-ServerNotAvailableException
Adding exception handling for ServerNotAvailableException
2015-07-01 07:18:36 +02:00
Vincent Petry f76773bd4c Merge pull request #17259 from owncloud/chunk-cleanupgracefulonlock
Do not try clearing locked files in cache folder
2015-07-01 07:08:47 +02:00
Lukas Reschke aff55347f9 Use UTF-8 mode for preg_split and preg_replace
Otherwise a single application with a description containing a non compliant character can break the whole ownCloud appstore. This is for example https://apps.owncloud.com/content/show.php?content=149553

Fixes https://github.com/owncloud/core/issues/17101#issuecomment-117365224
2015-07-01 01:44:33 +02:00
Vincent Petry 16ff6cff54 Merge pull request #17256 from owncloud/locking-disablecallbackwrapperwhendisabled
Do not set callback wrapper when locking is disabled
2015-06-30 18:28:28 +02:00
Vincent Petry 2fe677d0ed Catch cache garbage collection exception on postLogin
Just log the exception instead of preventing access to OC.
2015-06-30 17:36:55 +02:00
Vincent Petry dd4de48418 Do not try clearing locked files in cache folder 2015-06-30 17:00:46 +02:00
Björn Schießle 2c1b0f9a66 Merge pull request #17225 from owncloud/fix_12106
if it is a mount point we need to get the path from the mount manager
2015-06-30 16:40:57 +02:00
Bjoern Schiessle 44ec3dd110 if it is a mount point we need to get the path from the mount manager 2015-06-30 15:08:18 +02:00
Thomas Müller 134dc136e6 Avoid namespace clash 2015-06-30 15:07:48 +02:00
Thomas Müller 3f3c603922 Adding exception handling for ServerNotAvailableException - refs #17192 2015-06-30 15:05:59 +02:00
Vincent Petry 0118bf04dc Merge pull request #17251 from owncloud/issue-17247-filesize-stat-failed-for-in-log
Perform the filesize on the file that exists
2015-06-30 14:51:29 +02:00
Vincent Petry afd83caf69 Do not set callback wrapper when locking is disabled 2015-06-30 13:45:41 +02:00
Morris Jobke 2bcd0af177 Merge pull request #17189 from owncloud/files-straypartfilesonexception
Cleanup part file after upload exception
2015-06-30 11:58:26 +02:00
Joas Schilling 9c533342fc Perform the filesize only when the file exists
Regression from 95602d4069
and 9b336765b6
2015-06-30 11:47:58 +02:00
Joas Schilling a1bfc26b88 Merge pull request #17249 from owncloud/file-cache-is-a-icache
Fixing "ImportController::__construct() must implement interface OCP\…
2015-06-30 09:46:09 +02:00
Thomas Müller fc474de573 Fixing "ImportController::__construct() must implement interface OCP\\ICache, instance of OC\\Cache\\File given" 2015-06-29 22:43:18 +02:00
Vincent Petry 167f57c15e Unlock first path on rename if second path is locked 2015-06-29 17:31:14 +02:00
Vincent Petry 3217d4dad1 Cleanup part file after upload exception
Added unit tests for checking for stray part files.
Convert exception to sabre exception in upload put method.

Also added unit test for exception mapping, which also indirectly tests
that the part file is being deleted on exception.

This applies to both chunking and non-chunking mode.

Added some unit tests for chunk upload.
2015-06-29 17:31:14 +02:00
Vincent Petry 2fa432dfb8 Fix class name conflict
Looks like PHP 5.6.x doesn't like name conflicts.

\Sabre\DAV\Server would overlap with \OC\Connector\Sabre\Server.
2015-06-29 17:11:14 +02:00
Morris Jobke b88a0e7080 Merge pull request #17231 from owncloud/add-missing-version-field
Add missing version field
2015-06-29 16:41:47 +02:00
Joas Schilling 30f5fa42e5 Merge pull request #17229 from owncloud/maintenance-plugin-test
Unit tests added for MaintenancePlugin
2015-06-29 16:22:38 +02:00
Thomas Müller 372a9afabe Fixing ctor calls and ctor itself to not break usage in calendar and contacts ..... 2015-06-29 15:54:05 +02:00
Lukas Reschke ab4d5d20ea Typehint $targetVersion 2015-06-29 15:10:40 +02:00
Lukas Reschke b56af26199 Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-store
Send OC version to appstore so it can reply with the right links
2015-06-29 15:07:00 +02:00
Robin Appelman 8a2ef26b5e handle invalid results from mount providers 2015-06-29 14:42:34 +02:00
Thomas Müller f8127046ee Unit tests added for MaintenancePlugin 2015-06-29 14:18:09 +02:00
Joas Schilling 70eb20e3a7 Merge pull request #17030 from owncloud/lock-posthooks
Keep shared lock for post-hooks
2015-06-29 14:17:03 +02:00
Morris Jobke c57fb19b2f Merge pull request #17226 from owncloud/webdav-add-message-on-maintenance
In case of maintenance we should add a message to the exception
2015-06-29 14:11:36 +02:00
Robin Appelman 786ec82a61 add unit test 2015-06-29 14:06:29 +02:00
Robin Appelman 8ec7e9fac7 fix getting mount points when passing a path to the files:scan command 2015-06-29 14:03:23 +02:00
Lukas Reschke 5810e7ab87 Merge pull request #17050 from owncloud/request-status-from-ocs
Request approved state for disabled apps with ocsid
2015-06-29 13:41:11 +02:00
Thomas Müller e236e564af In case of maintenance we should add a message to the exception 2015-06-29 12:31:01 +02:00
Joas Schilling ae3d402dbc Send OC version to appstore so it can reply with the right links 2015-06-29 12:14:07 +02:00
Thomas Müller aa595392f6 Merge pull request #17217 from owncloud/use-new-updater-url
Use new updater URL + add unit tests
2015-06-29 11:27:23 +02:00
Jenkins for ownCloud 733d59ed44 [tx-robot] updated from transifex 2015-06-29 01:54:44 -04:00
Lukas Reschke 04fe9e05f0 Use new updater URL + add unit tests
Uses the new updater url "https://updates.owncloud.com/server/"
2015-06-28 11:25:28 +02:00
Jenkins for ownCloud 4d565a8447 [tx-robot] updated from transifex 2015-06-28 01:55:19 -04:00
Lukas Reschke a793b98fd0 Fix indentation 2015-06-27 20:37:07 +02:00
Lukas Reschke af01958f3e Add missing annotations for parameters 2015-06-27 20:35:47 +02:00
Lukas Reschke d1f0ff372e Merge pull request #17163 from owncloud/update-licenses
Update license headers
2015-06-27 20:22:23 +02:00
Roeland Douma 708c6268ad Merge pull request #17206 from oparoz/bpg-media-type
Adding BPG media type
2015-06-27 10:19:56 +02:00
Jenkins for ownCloud 28c223edc6 [tx-robot] updated from transifex 2015-06-27 01:55:58 -04:00
Olivier Paroz 158c5b5e47 Adding BPG media type 2015-06-26 19:22:12 +02:00
Vincent Petry 0684cc15dc Merge pull request #17071 from owncloud/share-get-users-non-existing
fix getUsersSharingFile with locking
2015-06-26 18:27:53 +02:00
Vincent Petry 271ef9dedb Remove test-specific method to make Bjoern and Joas happy 2015-06-26 17:37:04 +02:00
Robin Appelman c338999032 fix getUsersSharingFile with locking 2015-06-26 16:31:52 +02:00
Thomas Müller ac94126393 Merge pull request #17191 from owncloud/issue-17188-group-share-part-file
Correctly check if the real file exists, otherwise try the part file
2015-06-26 16:01:41 +02:00
Björn Schießle b318b9cf17 Merge pull request #17008 from owncloud/fix-17006
Improve splitting of username and remote adress when username contains an `@`
2015-06-26 16:01:16 +02:00
Joas Schilling 9b336765b6 Correctly check if the real file exists, otherwise try the part file 2015-06-26 13:17:23 +02:00
Thomas Müller 796aae4402 Merge pull request #17009 from owncloud/lock-downloadfile
Lock file during download
2015-06-26 13:04:34 +02:00
Thomas Müller 6c3a4282e5 Merge pull request #17165 from owncloud/federated_cloud_sharing_search_address_book
Search address book for federated cloud id
2015-06-26 10:53:02 +02:00
Jenkins for ownCloud b1e29c7dde [tx-robot] updated from transifex 2015-06-26 01:55:35 -04:00
Vincent Petry 538e466c30 Keep shared locks in post hooks
Instead of unlocking after the file operation, change exclusive locks
back to shared locks during post hooks, and unlock after that.

Also added unit tests to test locking in pre-hooks, during operation and
post-hooks.
2015-06-25 16:33:02 +02:00
Morris Jobke f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Bjoern Schiessle a288d0eea3 ne need to check twice if $row['share_with'] is set 2015-06-25 12:14:46 +02:00
Bjoern Schiessle dd9dfc4461 show nice display name for remote shares if possible 2015-06-25 12:14:03 +02:00
Morris Jobke 1601867c9d Remove unneeded getetag entries in properties table
* fixes #13281
2015-06-25 08:44:26 +02:00
Jenkins for ownCloud dddbfb903f [tx-robot] updated from transifex 2015-06-25 01:55:15 -04:00
Vincent Petry 58439c337c Merge pull request #17070 from owncloud/lock-movemountbug
Lock correct paths when moving mount
2015-06-24 18:37:48 +02:00
Morris Jobke 5f59393b30 Merge pull request #17110 from owncloud/share-error-handling
[sharing] handle shares of users that aren't available anymore
2015-06-24 17:38:34 +02:00
Lukas Reschke 004280e407 Merge pull request #17136 from rullzer/fix_remove_link_OCS
Allow removing of link password in OCS again
2015-06-24 16:45:00 +02:00
Vincent Petry 8859004a2b Rollback folder scan if an entry was locked 2015-06-24 15:42:00 +02:00
Thomas Müller 161ca900e0 Merge pull request #17130 from owncloud/update-mime-types
Update wmv and add mts and mt2s
2015-06-24 13:35:58 +02:00
Roeland Jago Douma 6977eff106 set NULL correctly in password update
Old code used 'NULL' but docterine wants null. Now it is possible again
to remove the password from a link share.
2015-06-24 12:37:59 +02:00
Morris Jobke 300d1c88d0 Merge pull request #17106 from owncloud/htaccess-update-only-once
Only update the htaccess ErrorDocument links when they are not set yet
2015-06-24 12:20:22 +02:00
Vincent Petry 35047a2300 Fix locked paths in the moveMount case
When moving a mount point directly, the lock must be applied on the
local mount point path instead of the attached storage root.

Other operations will still lock the attached storage root.
2015-06-24 11:33:28 +02:00
Thomas Müller 5c213539af Update wmv and add mts and mt2s - fixes #17128 and owncloud/firewall#107 2015-06-24 11:06:29 +02:00
Morris Jobke 17ff77c4e7 [Repair] add repair info for changed collation 2015-06-24 10:25:07 +02:00
Morris Jobke 5ff536b45a [upgrade] add verbosity check and show repair info & steps 2015-06-24 10:25:05 +02:00
Joas Schilling dba5d5e205 Use a OutputFormatter instead of hacking into writeln() 2015-06-24 09:26:30 +02:00
Morris Jobke 4f2f8a6f28 [sharing] handle shares of users that aren't available anymore
* properly handle the case where an abandoned share is left and
  simply skip it
2015-06-23 18:22:36 +02:00
Morris Jobke 02b2b60581 Merge pull request #17095 from owncloud/proper-error-handling
Proper error handling
2015-06-23 17:40:55 +02:00
Joas Schilling 0db311c9db Only update the htaccess ErrorDocument links when they are not set yet 2015-06-23 16:45:56 +02:00
Morris Jobke c86e129ce9 [updater] keep maintenance active on failure and mark failure in red 2015-06-23 14:45:53 +02:00
Björn Schießle cce841c665 Merge pull request #17045 from owncloud/enc_improvements
encryption improvements
2015-06-23 14:30:21 +02:00
Morris Jobke 1ba9fd3ada [upgrade] print update message before running the update code
* otherwise you don't know during which app update something failed
2015-06-23 13:13:44 +02:00
Bjoern Schiessle 95602d4069 make sure that we always read the header from the original file 2015-06-23 11:41:21 +02:00
Morris Jobke fe42553e8a [updater] propagate error case properly
* add $success to the updateEnd hook
* add new return code for a update failure
* add exception class to failure hook message
2015-06-23 10:03:27 +02:00
Morris Jobke fdd01cf15c Added error message on initMountpoints exception 2015-06-23 09:54:03 +02:00
Hendrik Leppelsack 8621d176db moved tooltip.js to vendor scripts 2015-06-22 15:38:32 +02:00
Joas Schilling 738b78f1b0 Use \OC\HintException and translate the hint 2015-06-22 15:34:06 +02:00
Joas Schilling 2b7e5f841a Merge spliteUserRemote with fixRemoteUrlInShareWith 2015-06-22 15:25:23 +02:00
Bjoern Schiessle d38a378b8c make sure that we split username and server address at the first '@' from the right to allow usernames containing '@' 2015-06-22 15:25:23 +02:00
Björn Schießle a88b370dc8 Merge pull request #12546 from oparoz/patch-1
Send the mime icon if we can't generate a preview
2015-06-22 13:55:17 +02:00
Hendrik Leppelsack f66e9af9a0 replaced tipsy with bootstrap tooltip 2015-06-22 13:32:06 +02:00
Lukas Reschke 4d23e06097 Fix undefined offset
There are cases where no trusted host is specified such as when installing the instance, this lead to an undefined offset warning in the log right after installing. (when another domain than localhost or 127.0.0.1 was used)
2015-06-22 12:28:07 +02:00
Thomas Müller c74c8eff3a Enable x-sendfile only if we do not lock the file system 2015-06-22 12:07:53 +02:00
Thomas Müller ced15c44b4 Merge pull request #16657 from owncloud/view-emit-path
emit hooks from a view as long as the path is inside the default root
2015-06-22 11:29:11 +02:00
Bernhard Posselt 7fe5ab4d4a Merge pull request #17056 from owncloud/appframework-type-cast
Allow multiple whitespace in type hints in AppFramework
2015-06-22 10:35:28 +02:00
Robin McCorkell 103f8ca6e8 Merge pull request #17052 from owncloud/fix-phpdoc-groupmgm
Use proper type
2015-06-21 23:33:19 +01:00
Robin McCorkell 04b6f67f07 Allow multiple whitespace in type hints in AppFramework
Type hints such as `@param bool     $doSomething` will now correctly get
parsed, allowing for alignment of docblock parameters if the app developer so
wishes.
2015-06-20 23:52:01 +01:00
Jenkins for ownCloud 183bd6dd49 [tx-robot] updated from transifex 2015-06-20 01:55:10 -04:00
Lukas Reschke 1ead0b6f95 Use proper type
This is a string
2015-06-19 21:00:42 +02:00
Lukas Reschke 00a65e30ce Request approved state for disabled apps with ocsid
In case an application gets disabled the level is set to "experimental" if it does not contain a `shipped` tag. This can for example be reproduced by installing the documents app from the appstore and then disabling it. Or cloning an app from git.

With this change the controller will now load the level of the application from the appstore if a valid OCSID has been provided.

Fixes https://github.com/owncloud/core/issues/17003
2015-06-19 19:04:54 +02:00
Olivier Paroz ba3b6f9be4 Remove unneeded returns from private cropping methods 2015-06-19 15:07:49 +02:00
Morris Jobke 5ed9743570 Merge pull request #17041 from owncloud/ocp-since-checker
Add tool to check OCP for missing @since tag
2015-06-19 14:40:15 +02:00
Morris Jobke eddbdb8f21 Fix missing @since tags in OCP 2015-06-19 10:51:36 +02:00
Morris Jobke 7e046d0595 Fix naming of param in private/server.php 2015-06-19 10:23:04 +02:00