wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
25833 commits 157 branches 562 tags 714 MiB
Commit graph

3921 commits

Author SHA1 Message Date
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
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
Robin Appelman
57945dbc4b fix typehinting 2015-07-01 16:13:33 +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
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
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
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
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
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
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
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
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
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
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
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
Lukas Reschke
1ead0b6f95 Use proper type 
This is a string
 2015-06-19 21:00:42 +02:00