079e9cecba
Revert "Use OCP classes as much as possible in files_external"
2015-07-02 13:00:21 +02:00
73c20ec189
Merge pull request #17321 from rullzer/3rdparty-doctering-v1.2.6
...
Upgrade 3rdparty submodule for docterine v1.2.6
2015-07-02 12:55:28 +02:00
c7968d202f
Merge pull request #17316 from owncloud/master-delete-ocsid-from-db-if-none-specified
...
[Master] Delete OCS ID from DB if none is specified
2015-07-02 12:37:31 +02:00
aa7c8ad191
Add the item name to the federated sahre activity
2015-07-02 12:28:48 +02:00
95faaad5cf
Use the app constant to fix the grouping
2015-07-02 12:27:58 +02:00
7e3f8d3ac1
Use the item name when refering to the unaccepted remote share
2015-07-02 12:26:06 +02:00
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
f52eec765c
owner is stored as 'uid_owner', not as 'owner' in the oc_share table
2015-07-02 10:49:22 +02:00
bfcb8ffeb3
Merge pull request #17246 from owncloud/share-lock-owner-parent
...
lock parent folders for the owner when locking a shared file as recipient
2015-07-02 10:38:08 +02:00
a6ea91996c
Fix duplicated line in doc block
2015-07-02 10:24:16 +02:00
3c8c148734
Upgrade 3rdparty submodule for docterine v1.2.6
2015-07-02 10:04:24 +02:00
5580b0e7c0
Merge pull request #17310 from owncloud/master-remove-ocs-ids
...
[master] Remove OCS IDs
2015-07-02 09:19:33 +02:00
b100036457
Bump versions
2015-07-02 09:18:41 +02:00
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
68f8717056
[master] Remove OCS IDs
...
While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307
Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
2015-07-02 08:45:16 +02:00
61a60ffd47
Merge pull request #17293 from owncloud/revert-z-index
...
Revert z-index changes
2015-07-02 08:21:54 +02:00
d2e1cae331
[tx-robot] updated from transifex
2015-07-02 01:59:26 -04:00
ba9b214aaa
Merge pull request #17295 from owncloud/scanfilesignature
...
Fix scanFile signature to avoid boring warning
2015-07-01 21:42:05 +02:00
9c06975bd5
Fix scanFile signature to avoid boring warning
2015-07-01 16:29:11 +02:00
57945dbc4b
fix typehinting
2015-07-01 16:13:33 +02:00
b80b1fbd24
Revert "fix z-index of share-autocomplete"
...
This reverts commit 4edf388a38
2015-07-01 16:12:55 +02:00
75451927b5
Revert "explicitly set z-index on app-content, fix overlap from navigation"
...
This reverts commit 71e5bc1803
2015-07-01 16:12:36 +02:00
207ce35ee9
phpdoc
2015-07-01 16:07:57 +02:00
2eb9936d77
This will be 8.2 in the future
2015-07-01 10:06:26 -04:00
faf642c31d
expose the mount manager in the public api
2015-07-01 15:57:04 +02:00
dd20cd1995
remove no longer needed readonly wrapper
2015-07-01 15:45:54 +02:00
365fafc9bc
use permissions mask wrapper instead of readonly wrapper
2015-07-01 15:45:23 +02:00
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
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
3c0be7d126
only lock the parent folders
2015-07-01 15:10:25 +02:00
d6f56ea609
lock parent folders for the owner when locking a shared file as recipient
2015-07-01 15:10:22 +02:00
fb2ec1dc56
Merge pull request #17285 from Rechenzentrum-Universitaet-Augsburg/master
...
Changed broken links to php manual
2015-07-01 14:21:03 +02:00
78e02045c1
Changed broken links to php manual
2015-07-01 14:13:18 +02:00
aae55174f6
Only do the description kung-fu on strings - fixes #17028
2015-07-01 13:15:13 +02:00
cf245b80fe
Only delete part file on error if it is really a part file
2015-07-01 12:52:06 +02:00
5caeda33f1
Merge pull request #17273 from owncloud/s2s-catchmoreexceptiontypes
...
Catch more error codes thrown by federated shares
2015-07-01 12:30:32 +02:00
b476c125c0
Merge pull request #15363 from owncloud/ext-ocp
...
Use OCP classes as much as possible in files_external
2015-07-01 11:16:52 +02:00
5d3aa36355
Catch more error codes thrown by federated shares
...
Most of the time it doesn't make sense to forward Guzzle's
RequestException, so we convert it to StorageNotAvailable instead.
This prevents unpredictable error codes to block access to unrelated
folders needlessly.
2015-07-01 11:14:03 +02:00
fd4efdded9
Clean up part file only once, not twice on error
2015-07-01 09:47:05 +02:00
728a22cda1
Use OCP classes as much as possible in files_external
2015-07-01 09:08:28 +02:00
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
4e44cc49d9
Merge pull request #17093 from owncloud/upgrade-timestamp
...
[upgrade] show timestamp for output during upgrade
2015-07-01 08:55:32 +02:00
da45fad3eb
Merge pull request #17078 from owncloud/fix-initial-server-host
...
Fix undefined offset
2015-07-01 08:55:12 +02:00
8f05d4b662
Merge pull request #16535 from rullzer/ocs_share_api_url
...
OCS Share API link shares now always have an url
2015-07-01 08:54:48 +02:00
1469177a3a
Merge pull request #16406 from owncloud/enc-strlenperffix
...
Small perf tweak in strlen loop
2015-07-01 08:54:33 +02:00
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
044d2ece07
Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_util
...
Move core apps from OC_Log::write to OCP\Util
2015-07-01 08:53:16 +02:00
f25b71f70e
Merge pull request #15475 from rullzer/files_sharing_OCP_DB
...
Move files sharing app (mostly) to OCP\DB
2015-07-01 08:53:03 +02:00
b921748e61
Merge pull request #17224 from owncloud/webdav-handle-ServerNotAvailableException
...
Adding exception handling for ServerNotAvailableException
2015-07-01 07:18:36 +02:00
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
Thomas Müller
Morris Jobke
Joas Schilling
Joas Schilling
Lukas Reschke
Bjoern Schiessle
Roeland Jago Douma
Jenkins for ownCloud
Vincent Petry
Robin Appelman
Jan-Christoph Borchardt
Frank Karlitschek
Michael Roth
Robin McCorkell