8ede209ea3
Merge pull request #8493 from owncloud/we-certainly-don't-want-type-juggling-on-that
...
Use strict type comparison
* owncloud/we-certainly-don't-want-type-juggling-on-that:
Use strict type comparison
2014-05-08 13:02:48 +02:00
390549c286
Merge pull request #8221 from owncloud/type-hinting-sharing
...
Type hinting fixes for sharing
2014-05-08 09:30:50 +02:00
9f88141bcd
Use 'boolean' as type instead of 'bool'
2014-05-07 20:46:08 +02:00
f569c721a6
Merge branch 'master' into optimize-startup-queries
...
Conflicts:
apps/files_sharing/lib/sharedstorage.php
tests/lib/group/manager.php
removed hasFilesSharedWith from lib/public/share.php and
sharedstorage.php to fix merge
2014-05-07 17:54:38 +02:00
c4109d9aef
Use strict type comparison
...
We certainly don't want to have type juggling on that.
2014-05-07 15:11:42 +02:00
254fa5eb22
Merge pull request #8488 from owncloud/sabre-notfoundloglevel
...
Some expected Sabre exceptions are now logged with DEBUG level
2014-05-07 15:05:17 +02:00
75d81eefc1
Merge pull request #8223 from owncloud/fix_linkToPublic
...
Fix linkToPublic and linkToAbsolute.
2014-05-07 14:40:59 +02:00
4a493c8835
Some expected Sabre exceptions are now logged with DEBUG level
2014-05-07 11:43:50 +02:00
d16bb09aed
Merge pull request #8045 from josh4trunks/nginx_x-accel_send_uri
...
Send URI instead of filepath to NGINX for X-Accel
2014-05-06 18:41:06 +02:00
72864d1c53
Typo
2014-05-06 18:05:06 +02:00
9411ba2acd
Merge pull request #8459 from owncloud/fix-getUserFolder
...
fix getUserFolder() of server container
2014-05-05 23:08:42 +02:00
91a5e728c0
fix getUserFolder() of server container
2014-05-05 18:15:48 +02:00
578eb33c20
Dont create borders around previews when scaling up is disabled
2014-05-05 14:54:34 +02:00
1a454f61ed
Merge pull request #8386 from owncloud/fix_6946_master
...
Fix 6946 master
2014-05-05 14:08:45 +02:00
341fcdc37a
Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-master
...
Images on public sharing get downscaled to increase use experience - thi...
2014-05-05 10:12:40 +02:00
0b7d9e2668
Cleanup code a little bit
...
- Use OCP\Response constants instead of the HTTP error code
- Use checkAppEnabled() instead of OC_App::isEnabled with an if statement
- Remove uneeded variable $baseURL
- Rename $isvalid to $isValid
2014-05-04 15:51:08 +02:00
73b914ddbc
Add CSRF check on login and logout
...
This is a minor issue and not worth a backport in my opinion as it could break more things than it's worth having it.
2014-05-04 13:56:21 +02:00
5cfc9d973d
Fix PHP Doc and use readable variable name
2014-05-04 13:02:58 +02:00
6f57911b44
Does also take int or string
2014-05-04 13:01:57 +02:00
d091cca636
Fix typo
2014-05-04 12:53:06 +02:00
623161b9a9
Merge pull request #8023 from flyser/master
...
Fix setting the max-upload-size for really large values.
2014-05-03 11:49:38 +02:00
906061a07b
Merge pull request #8171 from owncloud/fix-import
...
be nice and use a relative import so people can use the class without fi...
2014-05-02 22:43:19 +02:00
9e18be6422
Merge pull request #8377 from youngguns-nl/issue_8376
...
RecursiveDirectoryIterator does not work on NFS
2014-05-02 18:45:09 +02:00
c92c577b5e
- Introduce isShared() and isMounted() on FileInfo class
...
- Reuse these methods on determineIcon()
- Generate permission string for the desktop client
- expose {http://owncloud.org/ns }permissions as additional WebDAV property containing the permission string
2014-05-02 17:37:16 +02:00
20893cc3b3
Images on public sharing get downscaled to increase use experience - this will speed up loading time
...
- adding keep aspect to core/ajax/preview.php
- remove duplicate method Preview::show()
- no more hard coded mimetype of preview
- remove .png from the preview urls
- keep old route preview.png for backwards compatibility
- aspect preserving previews are now cached
2014-05-02 17:02:57 +02:00
6694129cbc
columns should be nullable by default
2014-05-01 23:03:45 +02:00
50f49c57b5
Some more params are optional
2014-05-01 18:11:30 +02:00
11404b2b12
Merge pull request #8391 from owncloud/router-parameter-sorting
...
Preserve keys when sorting parameters when generatings urls
2014-04-30 15:10:36 +02:00
4481a8412c
Merge pull request #8132 from owncloud/issue/8131
...
Issue/8131 Fix emitting of filesystem related hooks
2014-04-30 13:57:44 +02:00
77e6278d09
Preserve keys when sorting parameters when generatings urls
2014-04-29 11:55:19 +02:00
b95aa43a5d
Merge pull request #8285 from owncloud/better_getmountby_handling
...
Handle return values better from Filesystem::getMountBy*
2014-04-29 11:22:11 +02:00
c060f6ec7b
Deduplicate code
2014-04-29 10:34:28 +02:00
c1caaa6241
Correctly emit create/update hooks when a large file is being created/update
...
after being uploaded in .part files
Fix #8131
2014-04-29 10:34:27 +02:00
4fa9e46d2b
Emit a new hook, when a file is being updated only
...
The write-hook also is triggered for created files
Fix #8131
2014-04-29 10:34:26 +02:00
6935364b33
add class Pimple to autloader
2014-04-28 20:57:44 +02:00
e7c6111ae3
Update outdated comment
2014-04-28 20:23:18 +02:00
e8a287f5bb
refs #8376 ; spaces=>tabs
2014-04-28 19:52:06 +02:00
54f482ff9c
refs #8376 ; added comment and applied patch on other files
2014-04-28 19:32:25 +02:00
66b1ad0a9b
Merge branch 'master' into type-hinting-sharing
...
Conflicts:
apps/files_sharing/lib/share/file.php
apps/files_sharing/tests/api.php
lib/private/share/share.php
2014-04-28 17:59:41 +02:00
45e42c25de
Group Database backend must not gather user details itself but ask user
...
backends. This is a port to master from PR #7745
remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends
Conflicts:
lib/private/group/backend.php
LDAP: getDisplayNamesInGroup is not an option for group backends anymore
Conflicts:
apps/user_ldap/group_ldap.php
apps/user_ldap/group_proxy.php
clean up group backends
Conflicts:
lib/private/group/database.php
remove now unnecessary test
implement getDisplayNames in group manager
adjust user manager tests
test for group manager's displayNamesInGroup
trim must not be used in empty in PHP < 5.5
keep the constant to not provoke PHP warnings
Conflicts:
lib/private/group/backend.php
2014-04-28 13:49:56 +02:00
d7ec1fe447
rewind iterator before iteration starts
2014-04-28 13:05:20 +02:00
b68098ebba
remove preview office fallback as it makes too much trouble and generates inacceptable results
2014-04-28 12:05:10 +02:00
d8be9d96ed
fixes #8376
2014-04-28 10:20:24 +02:00
5fd776debf
Merge pull request #7473 from owncloud/append-error-document
...
Remove .htaccess creation code
2014-04-28 08:50:42 +02:00
7c0370105a
Fix wrong var name
2014-04-26 11:15:09 +02:00
fc9371ae10
Merge branch 'master' into contactsmanager-register
...
Conflicts:
lib/private/contactsmanager.php
2014-04-26 10:55:25 +02:00
7599fa94ce
Merge pull request #8350 from owncloud/share-search-mime
...
fix search by mime for shared single files
2014-04-25 15:54:36 +02:00
5194f014c9
Merge pull request #7504 from owncloud/webdav-injection
...
Proper injection of filesystem view into the webdav connector
2014-04-25 14:42:43 +02:00
194ea66cb5
Merge branch 'master' into share-search-mime
2014-04-25 14:04:41 +02:00
672a8248ce
Correct the path returned by getFolderContent for substorages
2014-04-25 13:56:45 +02:00
456ca0cf7d
fix paths of searchByMime results on substorages
2014-04-25 12:31:44 +02:00
6c20a014ea
merge master into webdav-injection
2014-04-25 11:47:06 +02:00
77e3d067f0
Better handle return values from Filesystem::getMountBy*
...
getMountByStorageId and getMountByNumericId return an empty array on error,
which should be detected to avoid possible errors. This commit also adds in
some new logging points and throws to aid debugging
2014-04-25 09:50:34 +01:00
1cafd1e3b9
Merge pull request #8337 from owncloud/flv-to-mimes
...
Add flv to known mimetypes
2014-04-24 19:09:01 +02:00
f520305848
Merge pull request #8026 from owncloud/remove_shared_folder
...
remove the "Shared" folder
2014-04-24 18:45:45 +02:00
fc4be3d0ad
Add flv to known mimetypes
2014-04-24 19:09:31 +03:00
35321c7d41
add additional rows to the select statement, 'stime' is needed for the expire check
2014-04-24 15:18:25 +02:00
6650be9913
add setting to set default expire date
2014-04-24 13:34:31 +02:00
cd0c5990f8
properly quote etags
2014-04-24 11:12:39 +02:00
49b44e7e22
Normalize paths when moving properties
2014-04-24 11:12:39 +02:00
ff0dab6e92
This adds one more missing untranslated text from lib/share
...
Also displays the untrusted domain warning in English
2014-04-24 01:42:18 +02:00
4ba6f4839d
fixing typos and PHPDoc
2014-04-23 15:36:01 +02:00
e77d89fc4b
Revert changes to OC_Connector_Sabre_Server
2014-04-23 14:21:09 +02:00
c8801a41d8
Merge pull request #8324 from owncloud/expired-link-error
...
Fix error when viewing expired link
2014-04-23 14:13:44 +02:00
b312d38d38
remove hard-coded shared folder
2014-04-23 12:59:22 +02:00
7ef8f6d352
always allow to rename the share mount point
2014-04-23 12:54:26 +02:00
93469ca468
make it possible to move files out of a shared mount point
2014-04-23 12:54:26 +02:00
fb88aba8f4
some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code
2014-04-23 12:54:26 +02:00
652d417a58
we don't allow to share a folder if it contains a share mount point
2014-04-23 12:54:26 +02:00
bffcbac7a7
allow to rename group share mount points
2014-04-23 12:54:25 +02:00
dfb69e9418
allow user to delete shared files/folders
2014-04-23 12:54:25 +02:00
4c840cb61d
fix target generation for group shares
2014-04-23 12:54:25 +02:00
ed981294f1
fix share api tests
2014-04-23 12:54:25 +02:00
27c5a978f9
we no longer need to handle the Shared folder different from any other folder
2014-04-23 12:54:25 +02:00
c4e0fb75a4
add api to get shares from a specific user
2014-04-23 12:54:24 +02:00
a02fb3722b
user should be able to rename/delete shared files if the owner allowed it
2014-04-23 12:54:24 +02:00
72bbb9ca20
allow to remove and change mount points
2014-04-23 12:54:24 +02:00
cfc52ccc3d
add some action items
2014-04-23 12:54:24 +02:00
3d0661a1e7
Fix error when viewing expired link
2014-04-23 12:54:18 +02:00
704b9e6a0d
Merge pull request #8009 from owncloud/feature/add-sharing-target
...
Add option to getUsersSharingFile() to get the paths for the shared users
2014-04-23 12:49:06 +02:00
535e6ff71f
Merge pull request #7617 from nishiki/cache_user
...
Cache user
2014-04-23 12:32:30 +02:00
dcc48f9b46
Merge pull request #8068 from wakeup/fix-share.php-string-extraction
...
Make lib/** share.php strings extractable for translation
2014-04-23 09:58:10 +02:00
b42ce6c30a
Prevent error if previously cached data doesn't have an etag
2014-04-22 15:24:38 +02:00
6e857de6b7
Make lib/** share.php strings extractable for translation
...
They were not ready for translation as they had no placeholders
and/nor wrapper function to be translated
This should fix : #8011
2014-04-22 14:56:44 +02:00
0330481c5e
Merge pull request #8263 from LEDfan/add-key-to-contacts
...
Add key to every contact
2014-04-22 14:20:53 +02:00
efff7dd2a4
Change key to addressbook-key
2014-04-22 12:46:09 +02:00
3821a09689
merge master into webdav-injection
2014-04-22 12:25:49 +02:00
0ebb4662ec
Merge pull request #8281 from owncloud/public-responses
...
make download and redirectresponse public
2014-04-22 00:08:04 +02:00
e88731a477
Some more PHPDoc fixes
2014-04-21 15:44:54 +02:00
f2f5a53d36
Merge pull request #7988 from owncloud/routing-cache-webroot
...
Keep cached urls with different hostnames or baseurls seperate
* owncloud/routing-cache-webroot:
Sort parameters and cast to int
add delimiter between host and baseurl
Keep cached urls with different hostnames or baseurls seperate
2014-04-20 18:27:23 +02:00
7e447f4f42
make download and redirectresponse public
2014-04-20 16:12:46 +02:00
f2e5494edc
Merge pull request #8203 from owncloud/correct-link
...
Use direct link instead of JS
* owncloud/correct-link:
Link to previous directory
Use direct link instead of JS
2014-04-20 15:58:53 +02:00
e930ce6436
Add type hinting
2014-04-20 00:55:01 +02:00
0c736feaba
remove useless import
2014-04-19 19:31:49 +02:00
4a7e0561ca
move db into iservercontainer
2014-04-19 19:30:12 +02:00
95a83233a9
fix doc strings for db facade
2014-04-19 15:32:17 +02:00
f260951825
port database layer from appframework to core
2014-04-19 14:56:16 +02:00
b78c1373b6
Add key to every contact
2014-04-18 14:30:44 +02:00
9583549556
camelCase vars in OC\ContactsManager
2014-04-17 17:56:23 +02:00
707658c00a
Merge pull request #8205 from owncloud/fix-8202
...
Add one more LOWER.
2014-04-17 16:10:33 +02:00
a2a0eb370b
Merge pull request #8222 from owncloud/type-hinting
...
Type hinting fixes
2014-04-17 16:08:15 +02:00
13b463cc17
Merge pull request #8189 from Xenopathic/misc_fixes
...
Various fixes
2014-04-17 11:56:51 +01:00
8a0c8a1956
Merge pull request #8240 from owncloud/thumbnail-on-short-videos-master
...
videos which are shorter then 5 seconds will now get a proper thumbnail ...
2014-04-17 11:15:05 +02:00
5a1a056c6d
Merge pull request #8183 from owncloud/move-security-headers
...
Move security headers
2014-04-16 23:46:20 +02:00
81c23b02da
Link to previous directory
2014-04-16 21:10:14 +02:00
a4389340b8
escape $second + update PHPDoc
2014-04-16 19:45:55 +02:00
d0f8cc20c5
videos which are shorter then 5 seconds will now get a proper thumbnail at 1 second
2014-04-16 17:16:03 +02:00
da99e403bc
Also fix linkToAbsolute
2014-04-16 14:30:24 +02:00
6fe3fd4a0b
Fix linkToPublic. Refs #8218
2014-04-15 23:04:35 +02:00
a4b7f5155f
Fix PHPdoc in lib/private
...
using scrutinizer patch
2014-04-15 22:55:20 +02:00
8bc7174bdc
Merge pull request #8104 from owncloud/lukepolo-master
...
Added the ability to Drag and Drop folders [chrome]
2014-04-15 21:39:32 +02:00
a9bf3df82d
Fix PHPdoc in OC\Share\Share and OCP\Share
2014-04-15 21:05:44 +02:00
8322a9e5c2
Merge pull request #8210 from owncloud/enhance-assets-management-master
...
adding checks and log messages regarding the assets folder
2014-04-15 20:07:07 +02:00
295b75cca9
merge master into webdav-injection
2014-04-15 20:05:43 +02:00
c82adb8c5d
merge master into webdav-injection
2014-04-15 20:03:00 +02:00
ffab31e3ee
Merge pull request #8197 from owncloud/secure_mimetypes
...
White-list known secure mime types. Refs. #8184
2014-04-15 19:50:33 +02:00
64679b2e62
Remove limit and offset manipulation when getting users or groups, because it does not work when more than one user or group backend. Fixing it would be too costly performancewise, so we switch back to the model used in OC 5: limit and offset are effective per backend, and not a general constraint
2014-04-15 17:46:48 +02:00
714343cd74
Add Bart to PgSqlTools copyright.
2014-04-15 16:29:43 +02:00
02726acbc8
adding checks and log messages regarding the assets folder
2014-04-15 16:26:12 +02:00
7f77b08098
Sort parameters and cast to int
2014-04-15 15:48:02 +02:00
bd37010f35
Merge remote-tracking branch 'owncloud/master' into db-convert-tool
...
* owncloud/master: (61 commits)
[tx-robot] updated from transifex
Make email display name change translatable again
Ignore jquery.multiselect.js - it's 3rdparty
javascript code cleanup + fixing syntax errors
Revert "close-button for share_dropdown"
close-button for share_dropdown
[tx-robot] updated from transifex
The latest developer manual link
The latest developer manual link
p() and print_unescaped() also take arrays as parameter
Check whether the user has permissions to add personal storage backends
[tx-robot] updated from transifex
Fix a wrong WebDAV Warning with self-signed-certs
fix translation link
upda mailinglist address
fix contribute link
default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute
Correctly process request parameters other than GET or POST, dont use globals in the class but inject it
[tx-robot] updated from transifex
use references for middleware to fix problems on 5.3
...
2014-04-15 15:44:44 +02:00
e125dc60cd
introduce new function to force a language
2014-04-15 15:12:25 +02:00
2dbb2db7e0
Merge pull request #7780 from owncloud/share-file-exists
...
Verify that a file exists before we share it
2014-04-15 11:23:17 +02:00
91d40f5033
remove unneeded LOWER. Fixes #8202
2014-04-14 22:19:21 +03:00
340089f270
Merge pull request #8059 from owncloud/countUsersInGroup
...
add optional countUsersInGroup method to group backends
2014-04-14 20:45:12 +02:00
9046f7b2f8
Merge pull request #8178 from owncloud/fix-request-parameters
...
Correctly process request parameters other than GET or POST, dont use gl...
2014-04-14 20:42:26 +02:00
2bda3f9ae0
Use direct link instead of JS
...
Due to our CSP policy this link won’t work as it it considered as
inline Javascript.
This commit replaces the link with a static link to the files app.
Reimplementation of #8067 - fixes #7742
2014-04-14 20:16:52 +02:00
9cc41a2460
Move PostgreSQL sequence resynchronisation out into PgSqlTools class.
2014-04-14 18:37:47 +02:00
2fb68c120b
Added explanation to mimetypes.list.php to avoid future confusion.
2014-04-14 18:21:19 +02:00
51e47319ef
White-list known secure mime types. Refs. #8184
2014-04-14 17:17:50 +02:00
fe364656a4
Merge pull request #8181 from owncloud/fix_wrong_webdav_warning
...
Fix a wrong WebDAV Warning with self-signed-certs
2014-04-14 16:53:06 +02:00
8df19c4379
Merge pull request #8019 from owncloud/thumbnail_fixes
...
Thumbnail fixes
2014-04-14 16:23:03 +02:00
71de321869
Merge pull request #8156 from owncloud/fix-middleware-container
...
fix the middleware registration process in the container
2014-04-14 14:53:58 +02:00
eeee9eacea
Prevent error from cache update on deleted files
2014-04-13 16:17:13 +01:00
eecc400698
p() and print_unescaped() also take arrays as parameter
...
This fixes some scrutinizer issues.
2014-04-13 16:18:05 +02:00
b04d95b116
Remove uneeded usages of nosniff
2014-04-13 12:48:16 +02:00
a2a850dd91
Fix indentation
2014-04-13 11:52:31 +02:00
df67a04385
Move security headers to base.php
...
Some headers were currently only added to the templates but not to other components (e.g. SabreDAV / JSON / etc...)
The migration to base.php ensures that the headers are served to all requests passing base.php
2014-04-13 11:51:03 +02:00
d98ae4f9b2
Fix a wrong WebDAV Warning with self-signed-certs
...
Occuring in the admin interface
2014-04-13 05:24:29 +02:00
62cce982bb
default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute
2014-04-12 16:17:49 +02:00
e7fa2790f3
Correctly process request parameters other than GET or POST, dont use globals in the class but inject it
2014-04-12 15:02:19 +02:00
526100dc90
be nice and use a relative import so people can use the class without firing up owncloud
2014-04-12 01:33:21 +02:00
4af72a076d
use references for middleware to fix problems on 5.3
2014-04-11 20:50:49 +02:00
77ecfdd1a4
Only encode dangerous dangerous characters
...
There is no need to encode all characters into HTML entities, only potential dangerous characters as &, ", ', < and > should get encoded.
This may fix issues like https://github.com/owncloud/calendar/pull/394
2014-04-11 19:42:15 +02:00
763da4258e
fix the middleware registration process in the container
2014-04-10 20:51:03 +02:00
2fc6fb36ad
Merge pull request #8139 from owncloud/fix-middleware-registration
...
register middleware as string to not force request to be instantiated to...
2014-04-10 20:24:30 +02:00
694244f2e0
Supply the contactsmanager object to the callbacks
2014-04-10 18:07:15 +02:00
5c412f480c
$key is not needed for registering contactsmanager callbacks
2014-04-10 18:06:31 +02:00
e401df26bc
Merge pull request #8107 from owncloud/dav-negativetimestampfix
...
Fixed Sabre Node implementation to correctly return timestamps as int
2014-04-10 17:37:53 +02:00
26a89e369e
Merge pull request #8137 from owncloud/routeing-requirements
...
add requirements to routing
2014-04-10 16:23:01 +02:00
ecd74d3630
Merge pull request #8138 from owncloud/allow-app-in-routes.php
...
To isolate the variable scope used inside the $file it is required in it...
2014-04-10 16:09:23 +02:00
654d5af394
Merge pull request #8027 from owncloud/routes-ocs
...
Load all routes when matching an ocs route
2014-04-10 12:22:34 +01:00
6cc578d1a7
Merge pull request #8018 from owncloud/ocs_result_success_is_100
...
OC_OCS_Result Class, Only accept 100 code as success
2014-04-10 13:03:10 +02:00
8d05848391
Merge pull request #7825 from owncloud/hash-stream
...
Use streams when generating hashes of remote files
2014-04-10 10:42:04 +02:00
9a8457aca0
Merge pull request #8053 from owncloud/preview-hook-root
...
Pass the correct root to the preview on post_write
2014-04-10 10:31:40 +02:00
f06ef8aa4b
register middleware as string to not force request to be instantiated too early and thus not having url parameters
2014-04-09 23:59:57 +02:00
98a5f121fd
To isolate the variable scope used inside the $file it is required in it's own method
2014-04-09 22:45:34 +02:00
d2961dcf11
Merge branch 'master' into lukepolo-master
...
Conflicts:
apps/files/js/filelist.js
2014-04-09 22:00:25 +02:00
70c88027db
add requirements to routing
2014-04-09 21:57:32 +02:00
511816b878
Implement the register function of OC\ContactsManager
2014-04-09 21:53:06 +02:00
4f11786a3d
Fixed Sabre Node implementation to correctly return timestamps as int
...
Negative timestamps were returned as string and were confusing other
Sabre API like Sabre_DAV_Property_GetLastModified.
This fix makes sure the timestamp is returned as int when defined.
2014-04-09 15:46:51 +02:00
78ee4c1327
Merge remote-tracking branch 'owncloud/master' into db-convert-tool
...
* owncloud/master: (137 commits)
add comment to clearify when a skip in the foreach happens
remove obsolete code
Always define sendmail_is_available
[tx-robot] updated from transifex
Make hardcoded exception messages translatable
Disable sharing in trashbin app
class Test_Config is already declared
[tx-robot] updated from transifex
using array_key_exists() instead of isset() - required because in case the value is null isset is returning false
fixing undefined exception classes
unit test testSetAppValueIfSetToNull() added
unit tests for dynamic backend registration
ignore underscore.js in scrutinizer.yml
adding ownCloud globals to jshintrc: OC, t, n
Use git checkout on directory as some files may not be in git resulting in, e.g.:
adding underscore.js
reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085
translations for oc-dialogs reside in code
Fix copy conflict dialog translation
[tx-robot] updated from transifex
...
2014-04-09 15:20:18 +02:00
352063cf0a
Fix Undefined index: storage in share.php
...
There parameter was removed when the code was cleaned up:
{"app":"PHP","message":"Undefined index: storage at
E:\\ownCloud\\owncloud\\lib\\private\\share\\share.php#1160",
"level":0,"time":"2014-04-09T12:56:23+00:00"}
2014-04-09 15:14:44 +02:00
d418e176ce
Do not query when the list is empty
2014-04-09 15:02:06 +02:00
015b9b1dac
Add option to getUsersSharingFile() to get the paths for the shared users
2014-04-09 15:02:05 +02:00
a4f42676ea
Make hardcoded exception messages translatable
2014-04-08 20:07:25 +02:00
5f8d9b3a4e
ask implementsAction instead of checking method_exists for easier testing
2014-04-08 12:31:11 +02:00
698297feb3
add optional countUsersInGroup method to group backends
2014-04-08 12:04:38 +02:00
7dd0074655
fixing mkdir code to respect external file systems as well
2014-04-07 23:17:35 +02:00
3587c88fe9
Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master
...
Conflicts:
apps/files/js/file-upload.js
2014-04-07 22:28:16 +02:00
c1fd300048
using array_key_exists() instead of isset() - required because in case the value is null isset is returning false
2014-04-07 21:05:48 +02:00
0fe32eee13
Merge pull request #8083 from owncloud/fix-link-to-sync
...
Remove wrong whitespace from URL and use HTTPS
2014-04-07 14:38:47 +02:00
51fbf0bcbc
add delimiter between host and baseurl
2014-04-07 13:27:18 +02:00
84285011ce
Merge branch 'master' into routing-cache-webroot
2014-04-07 13:24:51 +02:00
6babf90175
Switch to HTTPS
2014-04-06 22:06:38 +02:00
5679f5c37e
Remove wrong whitespace from URL and use HTTPS
...
The whitespace caused the generated links to begin with a whitespace (e.g. `<a href=" http://owncloud.org/sync-clients/ " target="_blank">`)
Additionally I switched the link to HTTPS.
2014-04-06 22:04:14 +02:00
1b55c312e5
Removed two unused functions
...
These two functions were actually not usable and only a todo since ages. I think it's better to remove it than having dead and unmaintained code.
2014-04-04 22:27:05 +02:00
4028301dea
Merge pull request #8055 from owncloud/getfileinfo-exists
...
dont scan not existing files in View->getFileInfo
2014-04-04 18:07:29 +02:00
0597c5226a
Merge pull request #8039 from owncloud/chunking-removeexpireinhaskey
...
Do not expire chunks while checking for their existence
2014-04-04 17:18:54 +02:00
ccf1287fbf
adding unit test for cache mechanism
2014-04-04 16:21:50 +02:00
b61ec7352b
dont scan not existing files in View->getFileInfo
2014-04-04 15:10:07 +02:00
e76c246718
Pass the correct root to the preview on post_write
2014-04-04 15:02:08 +02:00
f029312e5b
fixing typos/spellings
2014-04-04 11:37:47 +02:00
8a10c44eb3
Merge pull request #8015 from owncloud/storageinfo-reuse
...
Allow reusing FileInfo for getStorageInfo
2014-04-04 10:18:02 +02:00
9b4643f386
Send URI instead of filepath to NGINX for X-Accel
2014-04-03 20:46:54 -07:00
ab56f69416
Do not expire chunks while checking for their existence
...
The expiration should be done by the gc() function on login, not while
isComplete() is calling hasKey() for every chunk.
2014-04-03 21:12:35 +02:00
20f26068e7
Merge pull request #7476 from owncloud/type-hinting
...
Type hinting
2014-04-03 20:02:27 +02:00
db95f49b7e
Load all routes when matching an ocs route
2014-04-03 13:01:20 +02:00
c7324f7e44
fix float comparison for negative results
2014-04-03 12:00:53 +02:00
7cdb16979a
Fix setting the max-upload-size for really large values.
...
php can only parse filesize units up to gigabytes, not terabytes or petabytes.
2014-04-03 01:17:28 +02:00
b9a8bd7e1f
extract more methods
2014-04-02 18:32:32 +02:00
436a78db44
extract method isCachedBigger
2014-04-02 18:00:21 +02:00
6b017201b8
Only accept success as 100 like the OCS spec does
2014-04-02 15:50:51 +00:00
bca6cc6f74
remove unnecessary code
2014-04-02 17:34:48 +02:00
b8248f4a0a
compare floats with epsilon
2014-04-02 17:32:27 +02:00
da5541ac02
Allow reusing FileInfo for getStorageInfo
2014-04-02 17:10:57 +02:00
850a0e7388
Verify that a file exists before we share it
2014-04-02 13:47:11 +02:00
7bdc085022
Merge pull request #8006 from wakeup/master
...
Fix admin-dir_permissions redirection when cannot write warning is shown.
2014-04-02 13:21:53 +02:00
c0746f6b49
Merge pull request #7968 from owncloud/core-overwritewebrootwithroot
...
Allow using "/" in "overwritewebroot"
2014-04-02 12:56:36 +02:00
b6ad7c3cdd
Fix admin-dir_permissions redirection when cannot write warning
...
is shown.
2014-04-02 12:41:46 +02:00
4cc70ec39d
Merge pull request #7979 from owncloud/core-fixfilegetcontentsloop
...
Correctly read the full stream in file_get_contents
2014-04-02 10:55:50 +02:00
7086c386fd
Merge branch 'master' into append-error-document
...
Conflicts:
lib/private/setup.php
lib/private/updater.php
2014-04-02 08:48:37 +02:00
1c7a71ca77
use binary safe read
2014-04-02 04:38:54 +02:00
54a15a8001
Use streams when generating hashes of remote files
2014-04-02 04:38:54 +02:00
82d1ea240e
Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available
...
idn_to_ascii is only used if available
2014-04-01 22:51:23 +02:00
d811026ec9
Merge pull request #7935 from owncloud/getpath-shared
...
Make getPath work for shared files
2014-04-01 21:59:09 +02:00
6e6a131b32
Merge pull request #7696 from owncloud/chunk-remainingspacefix
...
Fixed chunking and insufficient storage check
2014-04-01 16:09:19 +02:00
9c8596e95b
Keep cached urls with different hostnames or baseurls seperate
2014-04-01 15:43:27 +02:00
a94ac41512
Merge pull request #7966 from owncloud/url_generation_hack
...
Check if web root has already been appended
2014-04-01 10:59:53 +02:00
0067a4eac2
Added missing fclose in file_get_contents and file_put_contents
2014-04-01 10:08:16 +02:00
d6ce45fe61
Correctly read the full stream in file_get_contents
...
When using user-defined stream wrappers, PHP will
return a maximum of 8192 bytes even if more was
requested.
This fix uses stream_get_contents to make sure the full stream is read
and not only the first 8 KB.
Added unit test with a bigger test file to cover this case.
2014-04-01 10:07:16 +02:00
6b061c236d
Merge branch 'master' into type-hinting
...
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
2014-03-31 21:38:54 +02:00
f9853b253c
Deduplicate connection handling code into \OC\DB\ConnectionFactory
2014-03-31 20:09:07 +02:00
cf361b6b4a
Allow using "/" in "overwritewebroot"
...
Whenever the reverse proxy is using "/" as the webroot, it is now
possible to set that value in "overwritewebroot"
2014-03-31 15:36:48 +02:00
3a731a01b1
select statement always need to contain file_source respectively item_source
2014-03-31 15:03:35 +02:00
0c2585f3ac
Improve phpdoc
2014-03-31 14:29:55 +02:00
6292aa57af
Check if web root has already been appended
2014-03-31 14:24:38 +02:00
65e3f63400
Merge pull request #7939 from owncloud/wring_redirect_on_login
...
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
2014-03-31 10:50:05 +02:00
7278f2f567
Sub-dir was prepended twice
2014-03-29 20:40:49 +01:00
3a7829f784
Sub-dir was prepended twice
2014-03-29 20:39:55 +01:00
73c81ae709
Merge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-master
...
adding @method annotation to declare methods which can be called on the ...
2014-03-28 21:20:09 +01:00
c14107550d
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
2014-03-28 18:05:48 +01:00
f331d5f9d4
Give storages the option to implement the getById behaviour for View->getPath
2014-03-28 15:15:56 +01:00
e4069e1553
Emit event after setting a new expiration for a share
...
all credits to @frisco82
https://github.com/owncloud/core/pull/5335
2014-03-28 15:00:13 +01:00
70db348475
Merge pull request #7824 from owncloud/hash-parameter-order
...
Fix parameter order for Storage\Local::hash
2014-03-28 13:06:07 +01:00
f1b085df01
adding @method annotation to declare methods which can be called on the wrapped statement object
2014-03-28 12:57:27 +01:00
d0012e729a
Merge pull request #7879 from owncloud/sharing_cleanup_public_api
...
sharing api cleanup, first step
2014-03-28 12:23:11 +01:00
5068c57845
Merge pull request #7613 from owncloud/fix_urlGenerator2
...
Add \OC::$WEBROOT to URLGenerator::getAbsoluteURL()
2014-03-28 12:12:49 +01:00
2d592ddc8f
Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
...
Squashed commit of the following:
commit eaf4f43f687db59137a0b00bc0e12ed4eb0d0943
Merge: 1e9c5behttps://github.com/kev300/core into kev300-master
commit 1e7d7bdd8b5c7f301501cb822cdf2ef0ad3f2872
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:11:42 2013 +0100
Update util.php
commit 3f0723f054a27a506be7f26932ccb54fff6f2be9
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:09:15 2013 +0100
Update util.php
commit 512176abdcfbe5b2b060b91033abc9608912d1f8
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:02:04 2013 +0100
Update util.php
commit 6cbefd080188d287024e0b047b88dd4525d6c2c1
Author: kev300 <admin@gadeco.de>
Date: Mon Dec 16 16:44:46 2013 +0100
Update util.php
Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
2014-03-28 12:09:29 +01:00
040f430f0c
Merge pull request #7829 from owncloud/cachefolderlocation
...
Cache folder is now configurable
2014-03-28 12:08:38 +01:00
5fa8f7cf12
Merge pull request #7107 from owncloud/load-apps-proper-master
...
Load apps proper master
2014-03-28 10:33:55 +01:00
c9ccacb9ea
Merge pull request #7902 from owncloud/ext-xsendfileextstoragefix
...
Use the correct resolve method to resolve file storage (x-sendfile)
2014-03-27 09:31:17 +01:00
b48510c978
Use the correct resolve method to resolve file storage
...
When detecting whether the file to be downloaded is on external storage,
the correct path needs to be used.
It turns out that \OC\Files\View is needed to resolve the path correctly
relative to the user's home.
2014-03-26 18:14:35 +01:00
10e62bfd68
Merge pull request #7893 from owncloud/no-routed-link-for-css-files
...
css files are not to be routed through index.php anymore
2014-03-26 16:48:54 +01:00
93b984ecf8
css files are not to be routed through index.php anymore
2014-03-26 15:36:55 +01:00
371a924c92
merge master into webdav-injection
2014-03-26 14:26:07 +01:00
9b2bb7c6ab
fix undefined index warning in router
2014-03-26 13:02:11 +01:00
83b4bcfdbf
idn_to_ascii is only used if available
2014-03-26 11:17:23 +01:00
e76be308eb
Remove unused setUserVars utility method
...
That method was moved to the external storage recently so
isn't needed here any more.
2014-03-26 09:39:09 +01:00
743ca4581d
Merge pull request #7748 from owncloud/postgresversionwarning
...
Added PostgreSQL version warning on upgrade
2014-03-25 23:17:18 +01:00
6bfeb342db
fixing code style
2014-03-25 23:17:00 +01:00
1816f43722
Merge pull request #7864 from owncloud/routing-performance
...
Routing performance
2014-03-25 23:00:36 +01:00
ed97d872af
Merge pull request #7325 from owncloud/recursive-mkdir-local
...
Recursive mkdir fixes #7047
2014-03-25 22:45:14 +01:00
1ae10b9da3
Merge pull request #7420 from owncloud/cachehooks-first
...
Manually triger the filecache update hooks before any other hook
2014-03-25 22:41:09 +01:00
bbc2e37259
Merge pull request #7477 from owncloud/foldersize-reuse
...
Allow re-using already known fileinfo when calculating folder sizes
2014-03-25 22:33:24 +01:00
31681a3a27
finally fix the paths for the OCS Share API
2014-03-25 17:52:45 +01:00
3653a51af2
fix path creation for re-shares, issue #7662
2014-03-25 17:48:50 +01:00
2d8607fae9
don't assign variables in if condition
2014-03-25 17:47:24 +01:00
5db3b049fd
add todo
2014-03-25 17:47:24 +01:00
bc0292c16d
always return an array
2014-03-25 17:47:24 +01:00
Andreas Fischer
Vincent Petry
Bart Visscher
Lukas Reschke
Morris Jobke
Robin Appelman
Thomas Müller
Bernhard Posselt
Jörn Friedrich Dreyer
icewind1991
Joas Schilling
Volkan Gezer
Sjors van der Pluijm
Arthur Schiwon
Georg Ehrke
Sjors van der Pluijm
Robin McCorkell
Björn Schießle
Victor Dubiniuk
Volkan Gezer
Tobia De Koninck
Bernhard Posselt
Thomas Tanghus
kondou
Tom Needham
josh4trunks
Fabian Henze
tomneedham
Morris Jobke