34fcf1e9d0
Wrap the import/export db in a wrapper to make it compatible with the old style
2013-12-20 12:09:19 +01:00
dc45141f4a
Merge pull request #6262 from nickvergessen/issue/4375
...
correctly mark app management active
2013-12-20 02:27:52 -08:00
1c340444a4
Added test cleanup listener to detect untidy tests
...
After each test suite, detects whether there are stray datafiles, hooks
or proxies, then show a warning and clear them.
2013-12-19 20:18:09 +01:00
068688063e
Security Update: session fixation
...
Previous version is vulnerable to session fixation attack in some situations, guessing non-apache-module-php5 environment. Regeneration of session id should be done here.
2013-12-20 03:38:51 +09:00
09bd5bd517
Added isUserAgent() method to request
...
- added isUserAgent() method to OC_Request which makes it possible to
test it
- OC_Response::setContentDisposition now uses OC_Request::isUserAgent()
2013-12-19 18:40:22 +01:00
526e873073
Merge pull request #6219 from leo-b/fix_router_deprecation
...
Symfonys addCollection() with multiple arguments is deprecated
* leo-b/fix_router_deprecation:
Symfonys addCollection() with multiple arguments is deprecated, fix deprecation warning
2013-12-19 17:38:37 +01:00
321d961353
Merge branch 'master' into user-no-change-displayname
2013-12-19 15:57:04 +01:00
ae3df84e20
Merge pull request #6491 from owncloud/fix-warning-array_walk_recursive-json
...
only walk an array
2013-12-19 03:25:58 -08:00
3ea01e2152
Merge pull request #6492 from owncloud/appconfig-cache
...
Fetch all appconfig values for an app at once and cache the results
2013-12-19 03:25:20 -08:00
9b18a4fd87
Merge pull request #4378 from owncloud/fixing-3417-master
...
Don't use xcache in case admin auth is enabled
2013-12-19 03:24:37 -08:00
684e331b5b
Merge pull request #6503 from owncloud/finally-kill-mdb2-master
...
Finally kill mdb2 master
2013-12-19 02:56:46 -08:00
748d90592a
Merge pull request #6502 from owncloud/core-extramimetypes
...
Added missing mime types
2013-12-18 23:41:36 -08:00
aa17a896ac
fix return statement
2013-12-19 00:33:29 +01:00
5eae75eeca
kill MDB2 in PHPDoc
2013-12-19 00:32:46 +01:00
62fdc2b0dc
Merge pull request #6476 from ogasser/dbal_precision_scale
...
DB: Support DECIMAL(precision,scale) syntax in XML
2013-12-18 15:15:26 -08:00
b109d411d8
Added missing mime types
...
This is mostly to fix acceptance tests that have a .cc file.
Also fixed typo in python mime type.
2013-12-18 22:40:58 +01:00
38f4ecaeac
Merge remote-tracking branch 'owncloud/master' into fixing-3417-master
...
* owncloud/master: (30 commits)
Added entry with ext storage info
[tx-robot] updated from transifex
[tx-robot] updated from transifex
clarifying license
remove unused method tail()
reliable detect encrypted files
[tx-robot] updated from transifex
remove duplicated code
add missing quotes + field declarations
Do not use xcache variable cache if cache size is 0.
always show home breadcrumb in files view
Use DEBUG instead of ERROR when favourites not found. Fix #6419
update file cache for target file
only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted
Fixed JS plural function to be per app
call set password hook because it doesn't get triggered during test execution and fix paths
Do not use L10n when logging exceptions
Also add default to the \OCP\IConfig interface
add default parameter for AllConfig->get*Value()
always show 'Deleted Files' breadcrumb
...
Conflicts:
lib/private/memcache/xcache.php
2013-12-18 15:44:46 +01:00
2e195dbdae
dont re-read the config values for an app when a non existing key is fetched
2013-12-18 15:28:32 +01:00
6c707323f2
only walk an array
2013-12-18 15:25:28 +01:00
5a646477a5
Fetch all appconfig values for an app at once and cache the results
2013-12-18 15:10:12 +01:00
277ae28171
Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes
...
Fixed download file from URL error messages
2013-12-18 06:03:50 -08:00
a90342b781
Merge pull request #6461 from owncloud/check-xcache-varsize
...
Do not use xcache variable cache if cache size is 0.
2013-12-18 05:36:40 -08:00
9c5a620c4f
Merge pull request #6256 from owncloud/session-preserver-thirdparty
...
preserve 3rd party values in in the Session destructor
2013-12-18 05:20:06 -08:00
e7a5c90cab
Replace static usage of OC_Config and OC_Preferences with the injected \OC\ConfigAll
2013-12-18 13:03:19 +01:00
a6c1b3ece3
fix the config option to remove the ability for users to set their displayname
2013-12-18 13:03:19 +01:00
3b0d0e2b1f
DB: Support DECIMAL(precision,scale) syntax in XML
...
Add support for specifying the precision and scale of a decimal data
type to the XML description language.
See owncloud/core#6475
2013-12-17 22:46:45 +01:00
6488ff2c75
[tx-robot] updated from transifex
2013-12-17 16:43:17 -05:00
1d0af242b9
Merge pull request #6436 from owncloud/allconfig-defaults
...
Add default parameter to OC\AllConfig/OCP\IConfig's getValue's
2013-12-17 05:09:58 -08:00
a99dd3183c
[tx-robot] updated from transifex
2013-12-17 06:46:52 -05:00
275d666d26
Merge pull request #6438 from owncloud/core-logexceptionfix
...
Do not use L10n when logging exceptions
2013-12-17 00:53:03 -08:00
dfeb04a574
Do not use xcache variable cache if cache size is 0.
...
This is possible because it is possible to only use xcache as an opcode cache
but not a variable cache.
2013-12-17 02:40:16 +01:00
8f0c56c1b2
Merge branch 'master' into fix-5388-master
2013-12-16 22:38:22 +01:00
a3fbad43c1
Use DEBUG instead of ERROR when favourites not found. Fix #6419
2013-12-16 17:07:22 +01:00
059c3c8708
fix issue with logging non utf8 chars
2013-12-16 15:38:55 +01:00
2a1d6d3106
Do not use L10n when logging exceptions
...
In some specific situations, the L10N bundle isn't loadable yet (for
example when there is an issue with the app_config table). In such case,
we still want to be able to log the real exception.
This fixes errors that say "OC_L10N_String::__toString must not throw
exceptions"
2013-12-16 15:11:13 +01:00
fed63dff06
Merge pull request #6315 from owncloud/ingroup-cache
...
cache the result from inGroup
2013-12-16 06:01:00 -08:00
e2efad6ae7
Also add default to the \OCP\IConfig interface
2013-12-16 14:33:03 +01:00
59f02066b6
add default parameter for AllConfig->get*Value()
2013-12-16 14:30:01 +01:00
c205d8d1c9
Merge remote-tracking branch 'owncloud/master' into fixing-3417-master
...
* owncloud/master: (1989 commits)
[tx-robot] updated from transifex
dont try to register background jobs if we haven't upgraded yet
adjust test
coding style
coding style
On webdav sesssions, loginname was compared to username which does not need to match necessarily
rely only on php DateTime to parse the db datetime string
LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng
Fix webroot for update page
Update 3rdparty ref
update 3rdparty
toggle select all checkbox
remove unneeded ; in comment
LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283
Add test for having utf8 filenames in the cache
fix fallback overwriting result of getHome
[tx-robot] updated from transifex
fix smbclient directory listing parser
cache the home folder of a User
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
...
Conflicts:
lib/util.php
2013-12-14 18:32:48 +01:00
77b68505c2
[tx-robot] updated from transifex
2013-12-13 14:44:31 -05:00
4c45c6f418
dont try to register background jobs if we haven't upgraded yet
2013-12-13 17:15:18 +01:00
f26ba5846d
coding style
2013-12-13 16:58:16 +01:00
dcfda5c2a9
coding style
2013-12-13 16:58:09 +01:00
91d6a6dd7c
On webdav sesssions, loginname was compared to username which does not need to match necessarily
2013-12-13 16:58:03 +01:00
6408125edc
rely only on php DateTime to parse the db datetime string
2013-12-13 16:38:05 +01:00
ad998c1fb5
Merge pull request #6390 from owncloud/migration-fixwebroot
...
Fix webroot for update page
2013-12-13 05:35:29 -08:00
df1a404466
Fix webroot for update page
...
On the update page, config.js was missing which caused oc_webroot to not
be available. That would trigger the faulty oc_webroot fallback that
didn't take URLs like "/owncloud/index.php/files/apps" into account.
This fix adds config.js in the update page and also a fix for the
oc_webroot fallback, in case it is used elsewhere.
2013-12-13 12:56:48 +01:00
7b30ffbf23
Merge pull request #6318 from owncloud/gethome-cache
...
cache the home folder of a User
2013-12-13 01:30:43 -08:00
8a86837eac
remove unneeded ; in comment
2013-12-12 13:59:00 +01:00
f23b7a262f
fix fallback overwriting result of getHome
2013-12-12 12:57:25 +01:00
335b2f40a6
Fixed download file from URL error messages
...
- L10N now converted to string to make them work with json_encode
- Added specific error message when server doesn't allow fopen on URLs
- Fixed client side to correctly show error message in a notification
- Added OCP\JSON::encode() method to encode JSON with support for the
OC_L10N_String values
2013-12-12 10:38:12 +01:00
3d29992378
user Group->users as assosiative array
2013-12-11 16:25:41 +01:00
366d75e947
cache the home folder of a User
2013-12-11 16:22:26 +01:00
b126374780
cache the result from inGroup
2013-12-11 15:47:36 +01:00
5c7a08aab4
check if a $_SESSION entry exists before we try to remove it
2013-12-11 12:59:48 +01:00
7afe6b3493
Merge branch 'master' into fix-5388-master
2013-12-11 09:12:47 +00:00
cdd182ce35
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
2013-12-11 00:19:51 +01:00
82bf1f9c8c
Added workaround for Android content disposition
...
Fixes #5807
2013-12-10 12:42:41 +01:00
409b510889
Moved content disposition code+workarounds to OCP\Response
...
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.
Refactored download code to use the new API.
Removed unused trashbin download file.
2013-12-10 12:42:26 +01:00
009e25788f
correctly mark app management active
2013-12-09 15:53:31 +01:00
6aab1ebf44
[tx-robot] updated from transifex
2013-12-09 06:40:22 -05:00
a36bf5c2b5
preserve 3rd party values in in the Session destructor
2013-12-09 12:38:27 +01:00
bc3650e48c
Merge pull request #6231 from owncloud/fix-plural-l10n
...
fix plural translation - fixes #6226
2013-12-09 01:41:06 -08:00
fc607e6bce
Separate PHP upload limit and free space
2013-12-08 22:59:46 +08:00
079d20a80e
[tx-robot] updated from transifex
2013-12-07 22:28:29 -05:00
4c4c9096c4
fix plural translation - fixes #6226
2013-12-07 11:38:01 +01:00
6a747106db
Merge pull request #6150 from owncloud/backgroundjob-log-exception
...
Remove background jobs that are giving errors
2013-12-06 11:56:53 -08:00
123bc9921a
Merge pull request #6201 from owncloud/backgroundscan-reuse-etag
...
reuse etags when doing a background scan
2013-12-06 10:13:14 -08:00
9eca2471b3
Merge branch 'master' into backgroundscan-reuse-etag
2013-12-06 18:27:46 +01:00
4c8bc61753
XSendfile and encryption don't work together
...
The file on disk is encrypted, and not readable on client systems
2013-12-06 17:59:59 +01:00
6aa9daf4e6
Users of getFolderContent are mostly interested in the unecrypted file size
2013-12-06 15:51:49 +01:00
b18c8e5c53
Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expire
...
Sharing etag propagation on expire
2013-12-06 05:41:08 -08:00
9c4bbf9ad7
Revert "Revert "Fix user's displayName being overwritten by (old) cookie""
...
This reverts commit eba35d28cd
2013-12-05 20:53:11 +01:00
3f7aac1a79
add a optional parameter to skip check for expired files, this is necessary to find out to whom a file was shared after it was expired.
2013-12-05 17:29:15 +01:00
eba35d28cd
Revert "Fix user's displayName being overwritten by (old) cookie"
...
This reverts commit 2a7380cc21
2013-12-05 16:12:46 +01:00
01ab15a2b0
reuse etags when doing a background scan
2013-12-05 15:23:34 +01:00
2a7380cc21
Fix user's displayName being overwritten by (old) cookie
2013-12-05 14:18:32 +01:00
7e702f294f
[tx-robot] updated from transifex
2013-12-04 18:14:17 -05:00
301d469813
Symfonys addCollection() with multiple arguments is deprecated, fix deprecation warning
2013-12-04 18:01:51 +01:00
d73875b2b4
Merge pull request #6169 from owncloud/php_version_warning
...
PHP version warning
2013-12-04 01:49:54 -08:00
61296ed7bb
lower required php version to 5.3.3
2013-12-04 10:25:22 +01:00
8fdbb98899
Merge pull request #6168 from owncloud/extstorage-testtestmethod
...
Added unit test for the test() method of ext storage
2013-12-03 11:00:49 -08:00
16eb7c15d2
Merge pull request #6076 from owncloud/fix-6073-master
...
Correct property name. It's just 'tableprefix', without the 'db' prefix.
2013-12-03 08:21:45 -08:00
6cf9844e9c
Added unit test for the test() method
...
This is to make sure that method isn't broken
2013-12-03 14:35:53 +01:00
b83e891456
Merge pull request #5929 from owncloud/code_check_on
...
switch code checker on by default. apps are not allowed to access
2013-12-03 01:14:35 -08:00
a999350f69
Merge pull request #6158 from owncloud/rmdir-check
...
check if a directory exists before we try to remove it
2013-12-02 15:14:41 -08:00
83ec234f53
[tx-robot] updated from transifex
2013-12-02 17:28:29 -05:00
64bfcbee0a
check if a directory exists before we try to remove it
2013-12-02 22:44:28 +01:00
4f4ad72460
remove background jobs if they are failing
2013-12-02 13:43:26 +01:00
35bb6f7e3a
Catch exceptions from background jobs and log them
2013-12-02 13:41:47 +01:00
87e795a693
fixing PHPDoc and spelling
2013-12-02 08:42:28 +01:00
832be7c908
Merge pull request #6052 from owncloud/datetime-doctrine
...
Get rid of date strings for DB. Completely use Doctrine and DateTime.
2013-12-01 01:29:35 -08:00
1b18c5a047
[tx-robot] updated from transifex
2013-11-29 14:10:40 -05:00
3c62de90fd
Merge pull request #6129 from owncloud/chunking-fixtouchafterassemble
...
Fixed touch after chunk assembling
2013-11-29 09:19:51 -08:00
80d2371f97
Fixed touch after chunk assembling
...
Fixed touch after chunk assembling which was using the wrong path,
resulting in the creation of an extra file.
Fixes #6007
2013-11-29 16:29:35 +01:00
7ca0de9bd3
make 5.3.8 the minimum supported version. This fixes several issues with broken PHP versions like: https://github.com/owncloud/core/issues/5734
...
Also make the version compare clearer. It was pure luck that floatval on a php version returned the correct value.
2013-11-29 15:46:10 +01:00
a03ba06dcd
Merge pull request #6077 from owncloud/fix-api-documentation
...
API doc for contacts manager, server container and share
2013-11-29 03:24:19 -08:00
41a1a32e5a
Merge pull request #6099 from owncloud/fix_source_not_found_warnings
...
make sure that we don't try to access an already deleted files
2013-11-28 12:59:24 -08:00
0cbe9d79ba
Merge pull request #6106 from owncloud/fix_preview_creation
...
Fix preview creation
2013-11-28 12:48:19 -08:00
466ed01e5d
correctFolder() already resolves the dirname internally
2013-11-28 19:25:49 +01:00
bdfef554c4
add PHPDoc for setMimetype()
2013-11-28 19:05:43 +01:00
eeb31420fe
we need to be able to set the mimetype manually
2013-11-28 18:52:58 +01:00
eaedda2116
make sure that we don't try to access an already deleted files, fixes some file source not found warnings
2013-11-28 13:31:08 +01:00
dab3629ff5
Merge pull request #6089 from owncloud/files-mimetyperefreshafterrename
...
Redetect mime type whenever extension is renamed
2013-11-28 03:46:42 -08:00
93b0bd0a9e
Use getLastError() everywhere.
2013-11-28 12:05:46 +01:00
904573d0d0
Add getLastError()
2013-11-28 12:04:28 +01:00
955127231a
No function as oci_last_error. It's oci_error.
2013-11-28 11:37:29 +01:00
fcf332abbf
There is no property such as dbusername. It's 'dbuser'.
2013-11-28 11:33:49 +01:00
b90f88f939
Correct property name. It's 'dbpassword', with the 'db' prefix.
2013-11-28 11:33:43 +01:00
005c98e46c
Correct property name. It's just 'tableprefix', without the 'db' prefix.
2013-11-28 11:23:45 +01:00
d2567129a1
Merge pull request #6072 from owncloud/mssql-fix-schema-migration-oc6
...
on mssql the schema migration sometimes fails due to an already existing...
2013-11-28 02:16:16 -08:00
f23d641b82
Merge pull request #6084 from owncloud/fix-app-routing
...
fix custom routes defined by apps
2013-11-28 00:00:09 -08:00
43b1cf7988
Redetect mime type whenever extension is renamed
2013-11-27 21:34:51 +01:00
885d04bc86
Fix getRawPathInfo for the '/' edge case
2013-11-27 21:28:54 +01:00
39f9e16f20
Merge pull request #6086 from owncloud/incognito_mode
...
return false if user is in incognito mode
2013-11-27 09:11:18 -08:00
4a78f12682
[tx-robot] updated from transifex
2013-11-27 12:10:54 -05:00
6deda1b9f6
return false if user is in incognito mode
2013-11-27 16:52:30 +01:00
c47e46fda0
fix custom routes defined by apps
2013-11-27 15:35:49 +01:00
a81909097c
Merge pull request #6027 from owncloud/public-api-restful-routing-oc6
...
fix appframework routing
2013-11-27 01:55:52 -08:00
7755e69af0
add PHPDoc for urlParams
2013-11-27 10:55:06 +01:00
b910524acb
add comment from @DeepDiver
2013-11-27 10:32:48 +01:00
7c88736292
API doc for contacts manager, server container and share
2013-11-27 00:35:36 +01:00
4fbc2774ef
on mssql the schema migration sometimes fails due to an already existing transaction - error: 'New transaction is not allowed because there are other threads running in the session.'
...
The solution is to simple reconnect to the database to start with a fresh connection
2013-11-26 22:39:01 +01:00
4f15282bc9
Merge pull request #6058 from owncloud/ldap2avatar
...
Set Avatar for LDAP users automatically (if a picture is available)
2013-11-26 12:05:32 -08:00
1fef97f6a5
Merge pull request #6060 from owncloud/fix-6050-oc6
...
fixing getRawPathInfo() once more
2013-11-26 10:13:58 -08:00
52941341fd
fixing failing unit test
2013-11-26 16:52:33 +01:00
fb7aa2f014
[tx-robot] updated from transifex
2013-11-26 10:47:07 -05:00
2a93720f3f
fixes #6050
2013-11-26 14:13:33 +01:00
10d84f6e9b
Add a (currently) empty system for running common repair steps
2013-11-26 14:12:48 +01:00
62afe7fe7a
remove passwords from logfile
2013-11-26 12:26:32 +01:00
3bbaba1eca
Use the Doctrine to convert date string to DateTime object.
2013-11-26 12:21:31 +01:00
a330b2ef9b
Use DateTime object instead of fixed format date string.
...
Use a DateTime object and have conversion handled by Doctrine instead of using
a date string with a fixed format.
2013-11-26 12:00:31 +01:00
9fb1da2811
Use bindValue() instead of passing parameters in execute().
2013-11-26 11:50:14 +01:00
dc67c7efa9
[tx-robot] updated from transifex
2013-11-26 04:04:05 -05:00
9fbccc83e3
merge master into single-user-mode
2013-11-25 21:25:04 +01:00
844b4785f1
Merge pull request #6034 from owncloud/fix-api-documentation
...
Fix api documentation
2013-11-25 11:17:16 -08:00
4b67d4258d
Merge pull request #6035 from owncloud/fixing-rawpath-reverseproxy-oc6
...
Fixing rawpath reverseproxy oc6
2013-11-25 08:21:33 -08:00
a42d152ac3
Merge pull request #6037 from owncloud/fix-6007-oc6
...
adding chunked upload handling
2013-11-25 08:16:45 -08:00
1fdd2ac7ee
adding documentation for registerRoutes()
2013-11-25 17:15:08 +01:00
b3e7e54c8d
fix some capital letters
2013-11-25 16:42:28 +01:00
4e0fa85307
page level doc blocks and class descriptions
2013-11-25 16:39:01 +01:00
bc8cc9142e
AppFramework(Controller|HTTP|HTTP-Responses|Middleware), IContainer API fixes
2013-11-25 16:28:24 +01:00
27cc333dfe
adding chunked upload handling
2013-11-25 15:35:26 +01:00
71c1327691
Add "single user mode" which restricts access to users in the admin group
...
This can be enabled by setting 'singleuser' to true in config.php
2013-11-25 15:08:24 +01:00
b9fed935b4
in case uri and script name don't match we better throw an exception
2013-11-25 14:42:34 +01:00
248eed16a6
fix defaults.php doc
2013-11-25 14:26:26 +01:00
a0a665ea45
handle duplicate slashes in case of reverse proxy configuration
2013-11-25 14:21:51 +01:00
7f47cc062c
fix defaults.php doc
2013-11-25 14:13:58 +01:00
b7ddc78626
fix db.php doc
2013-11-25 14:06:25 +01:00
317d421874
provide more cli friendly error messages
2013-11-25 13:04:23 +01:00
243f3f0c4c
No decimal points for Kilobyte and Byte #5371 .
2013-11-25 12:26:03 +01:00
993fea2f05
fix appframework routing
2013-11-25 11:36:33 +01:00
1a69079139
Merge pull request #6021 from owncloud/show_build
...
Show build number
2013-11-24 15:01:11 -08:00
37b07fe6a9
Merge branch 'master' into fix-5388-master
2013-11-24 23:27:44 +01:00
a2d4cd87d0
Merge pull request #5874 from owncloud/fix-5845
...
Fix file uploads on Windows with SQL Server
2013-11-24 14:15:17 -08:00
228f1788fa
add new function to generate the human readable version string based on version, channel and build number
2013-11-24 21:26:34 +01:00
6229f457d0
update PHPDoc
2013-11-24 21:18:14 +01:00
a11192bab3
send the build number too to push the next daily build. This is needed for the new daily build update channel
2013-11-24 16:45:06 +01:00
2ce850f7db
fix overwrite host support and make the code a bit more readable
2013-11-24 12:41:09 +01:00
aef34618de
Merge pull request #5995 from owncloud/extstorage-isreadablefix
...
Return plausible isReadable() default impl for ext storage
2013-11-24 03:04:33 -08:00
ba0e09adce
[tx-robot] updated from transifex
2013-11-24 00:14:51 -05:00
6085878966
Avatar: accept OC_Image as in setParameter
2013-11-22 23:57:23 +01:00
c62cce8269
Moved default isReadable/isUpdatable impl into Common class
...
Also adjusted all ext storage backends to not override these when the
default behavior is expected.
2013-11-22 18:21:17 +01:00
aeefe48cba
Revert "use relative paths to create images from a file. This way it also works if"
...
This reverts commit 3488f0b77a
2013-11-22 18:01:44 +01:00
26e9e68a39
Merge branch 'master' into fix-5388-master
2013-11-22 17:14:15 +01:00
9adff4f7f5
Change OC_Migrate from MDB2 to Doctrine
2013-11-22 15:53:56 +01:00
3b904647b0
Merge pull request #6003 from owncloud/incognito_mode
...
Incognito mode
2013-11-22 06:08:49 -08:00
7e4f50d4e3
add incognito mode, allows to hide my user ID. For example, this is useful to access public resources while a user is still logged in
2013-11-22 13:55:38 +01:00
c05177b25b
Merge pull request #5882 from owncloud/preview-movie-5s
...
Movie preview - use frame after 5 seconds
2013-11-22 04:27:34 -08:00
8ccac86c98
Enable user backends to provide avatar images
2013-11-22 13:25:20 +01:00
c503588827
Merge pull request #6000 from owncloud/use_relative_path_to_create_images
...
use relative paths to create images from a file.
2013-11-22 03:52:40 -08:00
2f73db12bb
Merge pull request #5040 from owncloud/public_api_avatar_master
...
Add public API for \OC\Avatar
2013-11-22 03:42:28 -08:00
92c8672c0f
fixing PHPDoc comments and syntax
2013-11-22 12:34:37 +01:00
3488f0b77a
use relative paths to create images from a file. This way it also works if
...
no user is logged in (e.g. public gallery share)
2013-11-22 12:26:01 +01:00
14e7075030
we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB.
...
in some cases 1MB was no enough to generate thumbnail
2013-11-22 12:23:22 +01:00
c22019dec5
Working on a chunked video can result in a broken frame index the option -vsync 1 can heal that
2013-11-22 12:20:06 +01:00
60cfdae503
[tx-robot] updated from transifex
2013-11-21 21:07:12 -05:00
f94a6eb166
Add missing Avatar Interface
2013-11-22 00:43:23 +01:00
00071401d7
Round out Avatar Public API
2013-11-21 23:40:25 +01:00
4a2f9636cf
Merge pull request #5773 from owncloud/fix-2152-master
...
Make working en_US.UTF-8 locale a hard requirement
2013-11-21 08:03:21 -08:00
5d9731cef2
[tx-robot] updated from transifex
2013-11-21 10:05:34 -05:00
d0265f3388
Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershome
...
Quota storage wrapper is now used for all users in sharing mode
2013-11-21 06:59:50 -08:00
cd1cf58875
Fixing the warning notifications
2013-11-21 14:44:25 +01:00
69e8e7dbd5
Now using the "Home" storage detection approach for quota
...
To find out whether to apply a quota, we now try and detect whether the
storage to wrap is a "Home" storage.
2013-11-21 12:17:47 +01:00
356eef0739
Quota storage wrapper is now used for all users in sharing mode
...
When accessing a shared folder, the folder's owner appears as mountpoint
but wasn't wrapped by a quota storage wrapper.
This fix makes sure that all home storages are wrapped by a quota
storage wrapper, if applicable, to make sure quotas are respected when
uploading into shared folders.
2013-11-21 12:04:54 +01:00
f2fe47bc21
fixing spelling and restructure sentence
2013-11-21 09:59:21 +01:00
a88aec8a5c
Merge pull request #5965 from owncloud/mimetype-only-path
...
Change default mimetype detection for storage backends to only use filename
2013-11-20 08:11:41 -08:00
51a8172868
always get the right node for the given file path
2013-11-20 16:14:08 +01:00
a0d570b4cc
Change default mimetype detection for storage backends to only use filename
2013-11-20 15:25:29 +01:00
726a202cdb
Fixed getLocalFile() condition for x-send-file
...
Until now, addSendfileHeader() was called even when no x-send-file
headers were set. Even though the method itself doesn't do anything,
a call to getLocalFile() was done and would trigger a full download
when using external storage.
Additionally, the storage resolution code is wrong and always
returns the local storage of the root filesystem, which caused the code to
be run anyway.
This commit fixes both issues.
2013-11-20 14:33:59 +01:00
4a0d295e4a
Merge pull request #5927 from owncloud/quota-excludeextstorage
...
External storage space is now not counted in total space
2013-11-18 14:42:40 -08:00
7504fc0aef
switch code checker on by default. apps are not allowed to access some of the internal classes where we have a public api for now
2013-11-18 18:42:06 +01:00
3e2fd9942b
Root size for home storage is now size of "files" subdir
...
Fixes #4593
2013-11-18 18:17:25 +01:00
614e4d485c
External storage space is now not counted in total space
...
Added argument to getFileInfo() to disable adding the size of
mountpoints to a directory's size.
Fixes #5924
2013-11-18 18:09:01 +01:00
385a296864
one tab less
2013-11-18 12:19:16 +01:00
e5994f9c1a
fix the version check for downloaded apps. Fixes https://github.com/owncloud/apps/issues/1485
2013-11-18 12:16:03 +01:00
c3746e866a
[tx-robot] updated from transifex
2013-11-15 22:56:31 -05:00
368342a085
Update error messages
2013-11-15 14:46:00 +01:00
630e46f60a
Merge pull request #5789 from ogasser/db_fix_default_for_numeric
...
DB: Set correct default value for numeric types
2013-11-15 04:19:33 -08:00
bcf56b0407
Use \Patchwork\Utf8\Bootup::initLocale
2013-11-15 13:06:35 +01:00
49e9f771ff
Merge pull request #5813 from owncloud/fix-4736-master
...
Don't set a default value when there isn't a default specified
2013-11-15 01:06:38 -08:00
926b274200
Movie preview - use frame after 5 seconds
2013-11-15 01:46:51 +01:00
617dc0e468
Merge branch 'master' into moviepreviewfallback
...
Conflicts:
lib/private/preview/movies.php
2013-11-14 20:57:29 +01:00
ecc7b01cee
Merge pull request #5824 from owncloud/fix-publicshare-non-existing
...
Fix fatal error when trying to open a non existing public link
2013-11-14 11:45:08 -08:00
2bb4c266a6
Merge pull request #5862 from owncloud/files-singledotdirs
...
Files singledotdirs
2013-11-14 11:40:21 -08:00
447e468d1a
Merge pull request #5850 from owncloud/oc_api_tests
...
Add unit tests for OC_API::mergeResponses and fix error with api returning incorrect status codes.
2013-11-14 07:58:51 -08:00
bd3ead0d31
Compare dirname() results to DIRECTORY_SEPARATOR, not '/'
2013-11-14 09:42:56 -05:00
ca675d7b08
Alias the aggregate columns so SQL Server doesn't combine them.
2013-11-14 09:41:55 -05:00
19e03ef77f
Merge pull request #5827 from owncloud/avoid_preview_errors
...
Use dedicated OC_Image loader methods in previews
2013-11-14 05:52:51 -08:00
c06d8bb007
Fixed normalizePath() to strip out single dot dirs
...
Now removing "/./" and trailing "/." from the paths when normalizing.
2013-11-14 13:15:03 +01:00
1449437c9e
Merge multiple failed third party responses when returning the result
2013-11-14 01:21:54 +00:00
bb182bbfb2
Merge multiple shipped failures before responding.
2013-11-14 01:19:46 +00:00
ca5c39a3a1
Return failed shipped responses over succedded shipped responses
2013-11-14 01:14:37 +00:00
a39f3fdbf9
Return result object when only one successful response is returned
2013-11-14 01:10:56 +00:00
790055571d
Update lib/private/api.php after merge conflict
2013-11-14 01:00:14 +00:00
b06682b7fb
Merge branch 'ocs_api_fix_success_code' into oc_api_tests
2013-11-14 00:41:04 +00:00
00944a376a
Merge branch 'master' into oc_api_tests
2013-11-14 00:40:57 +00:00
f19caeed33
Remove OC_App dependancy from OC_API::mergeResponses()
2013-11-13 22:46:24 +00:00
408ce91b25
Merge pull request #5768 from owncloud/quota-workaroundwhenmissingrootsize-home-only
...
Do not use -1 as the size for the root folder of the home storage
2013-11-13 05:57:16 -08:00
3fa651f2b1
Merge pull request #5447 from owncloud/fixing-5117-master
...
No data corruption duriing parallel upload
2013-11-13 02:59:34 -08:00
17e45e2002
Pick any none 100 status code before defaulting to 100
2013-11-13 00:45:49 +00:00
ec51825d31
Use dedicated OC_Image loader methods
...
This prevents excessive logging and disk access
2013-11-13 00:36:42 +01:00
34c92f6656
Now using HomeStorage for legacy home storage ids
...
Legacy home storage ids with the format "local://path/to/datadir/user1"
are now also wrapped by the HomeStorage.
2013-11-12 18:01:02 +01:00
1a65e3a725
Now calling parent method when path is not root
2013-11-12 16:15:44 +01:00
32a703ab36
Do not use -1 as the size for the root folder of the home storage
2013-11-12 16:15:43 +01:00
abc428916c
Fix fatal error when trying to open a non existing public link
2013-11-12 15:38:00 +01:00
49cd5dad24
add trash bin and file versions delete hooks in OC::registerPreviewHooks
2013-11-12 14:08:55 +01:00
53f17a71d1
treat numeric as an alias for decimal
2013-11-12 13:55:20 +01:00
4b01eaf6cc
changed type to decimal
2013-11-12 13:47:47 +01:00
dcca887f18
Don't set a default value when there isn't a default specified
2013-11-11 17:58:25 +01:00
68f3f2e691
make it possible to detect transferID part
2013-11-11 17:47:46 +01:00
99ee95d46c
Added missing escaping
2013-11-11 15:41:03 +01:00
55331479cd
Merge pull request #5701 from owncloud/sharing-updateownerfoldersizes
...
Fixed watcher to also update the owner's folder sizes
2013-11-11 06:16:51 -08:00
b278356eb9
DB: Set correct default value for numeric types
...
Set 0 as default value for columns with numeric data type instead of the
empty string ''. Otherwise the database complains about an invalid
default value for this column.
To reproduce put the following in your ````appinfo/database.xml````:
````
<field>
<name>modified</name>
<type>decimal</type>
<default/>
<notnull>true</notnull>
<length>15</length>
</field>
````
See owncloud/mozilla_sync#14
2013-11-10 14:15:33 +01:00
df288605d4
Fixed undefined variable error when using avconv
2013-11-10 11:46:46 +01:00
841c622085
Merge pull request #5687 from owncloud/fixing-5659-master
...
display the exception instead of meaningless message
2013-11-09 23:14:52 -08:00
a8f6a2446c
Merge pull request #5759 from owncloud/fixing-5757-master
...
adding proper htaccess commands for Apache 2.4
2013-11-09 23:13:17 -08:00
3428c03b80
[tx-robot] updated from transifex
2013-11-09 01:45:32 -05:00
b5e013973b
implementing solution using <ifModule mod_authz_core>
2013-11-08 17:29:14 +01:00
a6d8854d2a
Make working en_US.UTF-8 locale a hard requirement
2013-11-08 14:30:08 +01:00
4b5083e3ca
Fixed the rebellous space, replaced with a tab
2013-11-08 12:27:53 +01:00
0c6af55112
Added ffmpeg fallback when avconv is not available
...
On some distros, avconv isn't available yet.
This fix adds a fallback to ffmpeg.
When none is found, no error message is displayed in the console any
more.
Fixes #5745
Also, this now uses exec() instead of shell_exec() to be able to get the
return code.
The binary path found with "which" is now used to prevent further FS
binary lookup when running the commands.
Moved the "-ss" parameter before "-i" for ffmpeg.
2013-11-08 12:19:32 +01:00
f93dcc5d77
the filesystem has to be initialized once we know the user
2013-11-08 11:24:19 +01:00
9c8b1e1775
adding proper htaccess commands for Apache 2.4
2013-11-08 10:45:35 +01:00
4459d964d6
Merge pull request #5747 from owncloud/scanner-post-hooks
...
Add post hooks for filesystem scanner
2013-11-07 12:44:23 -08:00
013444813e
Now removing stray old cookies from 5.0.12
...
Cookies from 5.0.12 seemed to have an extra slash in the path.
Firefox doesn't allow to remove them if the trailing slash isn't
there,
thus making it impossible to logout correctly.
This fix adds extra code to delete such stray cookies.
Ported from stable5 branch 99e5c6f7eb
2013-11-07 18:49:50 +01:00
d6845babd6
Add post hooks for filesystem scanner
2013-11-07 16:22:29 +01:00
bcd776b0c0
Fix a regression (Tags→TagManager)
2013-11-07 12:51:03 +01:00
4ac05e071a
Remove duplicate getAvatarManager()
2013-11-07 12:48:41 +01:00
507325dd50
Add public API for \OC\Avatar
2013-11-07 12:48:40 +01:00
263603aa4c
[tx-robot] updated from transifex
2013-11-06 21:44:36 -05:00
7c89309e26
Merge pull request #5691 from owncloud/switch-to-oc6-documentation
...
move to oc6 documentation
2013-11-05 08:22:26 -08:00
e3868ba118
Fixed watcher to also update the owner's folder sizes
...
Note that the root folder size is mandatory for quota calculation.
2013-11-05 13:58:14 +01:00
08c8bf5a7b
decode arguments as array
2013-11-05 10:30:18 +01:00
3488202f67
Merge pull request #5582 from owncloud/files-previewcaching
...
Append file etag to preview URLs
2013-11-05 01:21:51 -08:00
f91fe8d595
Merge pull request #5673 from owncloud/oc6-windows-server-mssql-master
...
Oc6 windows server mssql master
2013-11-05 00:41:11 -08:00
d48ba5a5bf
Merge pull request #5540 from owncloud/scanner-enhancments-master
...
Scanner enhancments master
2013-11-04 23:58:42 -08:00
01f2b7eb3a
move to oc6 documentation
2013-11-04 22:50:12 +01:00
8274d9f91c
Inherit lastInsertId() from Adapter.
2013-11-04 22:28:41 +01:00
4f24d4ba01
display the exception instead of meaningless message
2013-11-04 21:55:55 +01:00
c3898061a8
Merge pull request #5544 from owncloud/fixing-3593-2-master
...
Add FileId header and switch fileid and instance id
2013-11-04 04:30:12 -08:00
0f266d0f62
set log level to DEBUG
2013-11-04 12:58:30 +01:00
e89f080f09
[tx-robot] updated from transifex
2013-11-03 14:39:28 -05:00
07e540613e
[tx-robot] updated from transifex
2013-11-03 12:44:12 -05:00
7125bfba21
Merge pull request #5678 from owncloud/fix-api-documentation
...
Fix api documentation
2013-11-03 06:38:44 -08:00
ba2dd3b37c
Merge pull request #5671 from owncloud/fixing-5668-master
...
replace template function link_to_docs() with \OC_Helper::linkToDocs()
2013-11-03 05:08:56 -08:00
ef592981ea
unify license headers for public API files
2013-11-03 13:51:39 +01:00
d2a48d58ce
fix "No page-level DocBlock"
2013-11-03 13:38:25 +01:00
7c1f0da0fe
Always select item_source.
2013-11-03 12:34:40 +01:00
fa56aec4b8
Deduplicate expiration date check into a method.
2013-11-03 12:34:38 +01:00
779b87d46a
Use unshareItem() when unsharing expired shares.
2013-11-03 12:33:34 +01:00
ebf1694795
Use unshareItem() in unshareAll().
2013-11-03 12:33:34 +01:00
1d1f5b288e
Extract unshare() code into unshareItem().
2013-11-03 12:33:34 +01:00
329299e34c
OCP\Share::unshareAll(): Deduplicate hook parameters.
2013-11-03 12:33:31 +01:00
e37047b2a0
WIN: fixing Fatal error: Call to a member function logicToPhysical() on a non-object in C:\jenkins2\workspace\server-stable5-windows\database\mssql\label\WINDOWS\lib\files\storage\mappedlocal.php on line 311
2013-11-02 20:22:12 +01:00
5ecebe211b
mssql: fixing lastInsertId() implementation
2013-11-02 20:21:19 +01:00
eb3c5070c0
replace template function link_to_docs() with \OC_Helper::linkToDocs()
2013-11-02 19:11:46 +01:00
06b42f9788
Merge pull request #5443 from owncloud/fix-autoloader-caching
...
Remove Autoloader Cache Hack. Do not use Cache on Install.
2013-11-01 05:35:34 -07:00
eb0ecaa13c
Merge pull request #5658 from owncloud/session-error-full-sentence
...
[Trivial] Make "Please contact your system administrator" a full sentence.
2013-11-01 05:08:19 -07:00
b6bb2b26dd
Make "Please contact your system administrator" a full sentence.
2013-11-01 11:35:02 +01:00
f5b42c63d4
Merge pull request #5653 from owncloud/fix-api-documentation
...
fix documentation stuff
2013-11-01 02:56:03 -07:00
fad2149e3f
Merge pull request #5551 from owncloud/fix-5202-master
...
When updating an appstore app, execute a database update
2013-10-31 11:10:28 -07:00
0dbe90cc9a
fix documentation stuff
2013-10-31 19:00:53 +01:00
ae469b67a0
Merge pull request #5637 from owncloud/fix_privatedata
...
Fix privatedata
2013-10-31 10:26:47 -07:00
b4cdac0a60
Merge pull request #5591 from owncloud/home-storage
...
Make home folders movable without requiring rescans
2013-10-31 10:20:03 -07:00
d6ddb12c20
Get rid of the SELECT query. Try UPDATE, on failure INSERT.
2013-10-31 16:04:18 +01:00
aae6e76926
fixing undefined index in delete()
2013-10-31 10:24:28 +01:00
64d0b0d184
PHPDoc comment updated - checkLoggedIn() removed
2013-10-31 10:21:17 +01:00
0cec17ba87
no need to check if the user is logged in
2013-10-31 10:14:06 +01:00
47da2ef8db
fixing php notice: Undefined index key
2013-10-31 10:02:18 +01:00
b2929de0a7
no need to check if the user is logged in - this is already done in the ocs dispatcher itself
...
adding @return
2013-10-31 09:58:18 +01:00
64bfd21ccd
Merge branch 'master' into fix_privatedata
2013-10-31 09:05:35 +01:00
3f42c890be
we should check if a user is logged in before we check for admin privilege
2013-10-30 22:59:31 +01:00
261cd87efa
Merge branch 'master' into home-storage
2013-10-30 22:11:19 +01:00
c1730d241c
Merge pull request #5615 from owncloud/fixing-5614-master
...
http header OCS-ApiRequest: true is required in case of session based OC...
2013-10-30 13:12:16 -07:00
cba12e009f
Added missing HTTP prefix to the $_SERVER variable
2013-10-30 21:07:19 +01:00
330d026be7
fix the privatedata key value store
2013-10-30 19:36:29 +01:00
c9f3f2874f
Merge branch 'master' into update-parent-storage-mtime
...
Conflicts:
lib/private/files/cache/updater.php
2013-10-30 13:41:10 +01:00
de342a5ac7
Merge pull request #5603 from owncloud/fix_file_cache_updater_master
...
Fix file cache updater (backport to master of #5513 )
2013-10-30 02:31:08 -07:00
3d42e402c5
http header OCS-ApiRequest: true is required in case of session based OCS API calls
2013-10-29 23:07:27 +01:00
e1e4c7c214
Merge branch 'master' into fix_file_cache_updater_master
2013-10-29 17:47:33 +01:00
e08f38f99b
Merge pull request #5605 from owncloud/fix_delete_user
...
remove user from cache if he was deleted successfully
2013-10-29 09:46:21 -07:00
e0bc89c87f
Merge pull request #5577 from owncloud/fix_urlgenerator_imagepath
...
use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace
2013-10-29 09:29:29 -07:00
0d7d396d80
make sure that also the storage etag gets changed
2013-10-29 16:30:47 +01:00
f021dad204
remove user from cache if he was deleted successfully
2013-10-29 15:50:33 +01:00
34c1512466
Merge pull request #5601 from owncloud/fix-mimetype-detection
...
Fix mimetype detection
2013-10-29 07:47:20 -07:00
7223b5acce
Merge pull request #5396 from owncloud/fix-sharing-code
...
Fix sharing error message - id -> file name
2013-10-29 07:33:23 -07:00
a80ac9c492
make getUidAndFilename() private
2013-10-29 15:10:02 +01:00
fcfac51aa1
backport of https://github.com/owncloud/core/pull/5513
2013-10-29 15:08:12 +01:00
b3626f34cd
Update the parent folders storage_mtime on write and delete to prevent rescans
2013-10-29 14:18:57 +01:00
b3e39dd3d9
Map empty mimetypes to octet-stream for Oracle DBMS.
2013-10-29 14:18:42 +01:00
fa6ae81149
Return early if fileinfo is there.
2013-10-29 13:48:30 +01:00
68d13210bd
Reset mimetype to application/octet-stream on empty reply from file command.
2013-10-29 13:29:35 +01:00
0e92a4896d
dont use the home storage for non-existing users
2013-10-29 13:12:28 +01:00
a04a01d51f
Do not calculate $isWrapped if not needed.
2013-10-29 12:54:30 +01:00
b0b76fe064
[tx-robot] updated from transifex
2013-10-29 07:31:51 -04:00
aaefb64306
Merge pull request #5493 from owncloud/fix-language-detection
...
Fix HTTP language detection
2013-10-28 16:37:12 -07:00
e273c14540
use the new home storage backend when no existing local storage backend exists for the user's home
2013-10-29 00:26:35 +01:00
f1e6e80eb1
add specialized storage backend for home folders
2013-10-29 00:14:23 +01:00
db0fa6c529
use getHome() to delete users data
2013-10-29 18:01:37 +01:00
682d6e8a80
use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace
2013-10-28 14:18:20 +01:00
e62ca4ea4f
Append file etag to preview URLs
...
Fixes #5534
2013-10-28 14:14:55 +01:00
4750fbc226
Merge pull request #5550 from owncloud/fix-4716-master
...
'Update to' is shown when there is no update
2013-10-28 03:33:27 -07:00
78971c61e6
update documentation for app update
2013-10-28 11:27:51 +01:00
c61d328ab9
Merge pull request #3889 from owncloud/apps_preload
...
Don't load the apps when we need to upgrade
2013-10-28 03:17:52 -07:00
8df8211225
[tx-robot] updated from transifex
2013-10-27 07:27:22 -04:00
119ecc6f34
[tx-robot] updated from transifex
2013-10-27 02:32:11 -04:00
466b6c1ee0
local user backend shall search for both username and displayname, fixes #5401
2013-10-25 21:57:12 +02:00
ebcd9ae628
Added comment for clarification about fseek() call in quota.php
2013-10-25 16:15:01 +02:00
b6c67c4c63
'Update to' is shown when there is no update
...
See #4716
2013-10-25 15:41:59 +02:00
310c8400df
When updating an appstore app, execute a database update
...
See #5202
2013-10-25 15:38:08 +02:00
c455cb989b
add header 'OC-FileId' on PUT
2013-10-25 13:20:59 +02:00
3bca1519ee
switch instance id and file id
2013-10-25 13:20:29 +02:00
8253994262
using array_diff_assoc to detect diffs in values as well
2013-10-25 12:40:31 +02:00
f619f59f1c
cast storage_mtime to int
2013-10-25 12:39:50 +02:00
c8df27de73
Fixed quota stream to not wrap read-only fopen calls
2013-10-25 12:33:16 +02:00
d8b245490b
Fixed quota stream's fseek method
...
- Added missing return statement
- Added missing support for SEEK_END
- Fixes #5524
2013-10-25 12:09:46 +02:00
3917d18980
Merge pull request #5528 from frisco82/changeUpadateNotification
...
Changed update message to be more instructive
2013-10-24 10:28:17 -07:00
66813e9df6
Merge branch 'master' into fix-language-detection
2013-10-24 19:27:33 +02:00
3a81c8e3af
Changed update message to be more instructive, changed update style to be less aggresive
...
Fix br tags
Improve english messages
2013-10-24 19:21:40 +02:00
54e9d8c306
Merge pull request #5507 from owncloud/webdav-removeredirectfromindex
...
Remove WebDAV redirect from the root path
2013-10-24 10:05:21 -07:00
222f1b8da2
Merge pull request #5494 from owncloud/fixing-3593-master
...
introducing new dav property {xmlns:oc="http://owncloud.org/ns }id
2013-10-24 09:41:56 -07:00
c5b8963b18
log the data arrays
2013-10-24 18:13:21 +02:00
a22f12cfe0
- fixing namespace
...
- remove property only if present
2013-10-24 14:40:43 +02:00
88d1e20d56
some logging added ....
2013-10-24 14:24:56 +02:00
c186f33428
Remove WebDAV redirect from the root path
...
This will prevent people mounting the root path.
They should use the full webdav path instead.
Fixes #4923
2013-10-24 10:34:09 +02:00
808e9b0f51
Merge pull request #5402 from owncloud/fixing-5367-master
...
fixes chunked upload
2013-10-24 00:56:46 -07:00
db70b18c1d
Merge pull request #5496 from owncloud/prefer_png_from_theme_over_core_svg
...
prefer logo png from theme over svg from core
2013-10-23 14:44:43 -07:00
291cdbdd98
Merge pull request #5497 from owncloud/ie8-placeholdershim
...
Ie8 placeholdershim
2013-10-23 13:18:37 -07:00
caa3a8d784
Merge pull request #5464 from owncloud/fixing-5456-master
...
Fixing 5456 master
2013-10-23 10:50:36 -07:00
54e0f1d739
fixing PHPDoc & grammar
2013-10-23 19:06:36 +02:00
086b82bd69
Fixed sharing dropdown placeholders in IE8/9
...
Added jquery.placeholder shim to handle input field placeholders in IE8/9
2013-10-23 18:51:25 +02:00
1317b7c03d
pass the name of the item source from the browser to the server - no need to get the data via complicated db queries
2013-10-23 18:39:37 +02:00
1909288fcb
Merge branch 'master' into fix-sharing-code
2013-10-23 17:16:16 +02:00
3d5e229ac5
Merge pull request #5442 from owncloud/extstorage-ignoreduplicateinserts
...
Ignore duplicate inserts in file cache and mime type
2013-10-23 07:47:50 -07:00
0bf034da96
prefer logo png from theme over svg from core
...
The logo images are specified in the php templates with eg `image_path('', 'logo-wide.svg')`. If that file exists the correct path will be served to the client in the html template. Then the `SVGSupport()` is checked in https://github.com/owncloud/core/blob/master/core/js/js.js#L701 which will replace `svg` with `png` in img tags and css background definitions.
fixes #5074
partially solves #5421 , but not when an svg has been specified in css and is then 'fixed' by js to point to a png which does not exist in the theme but is then might be resolved to an image from core .... well theoretical problem ... might not even be a problem
@karlitschek @jancborchardt please review
2013-10-23 16:44:56 +02:00
b02a485712
handle case where fileid is not set
2013-10-23 16:40:29 +02:00
8c69a5388e
Merge pull request #5478 from owncloud/core-logexceptionstacktrace
...
Expand exception stack trace in log in debug mode
2013-10-23 07:19:14 -07:00
b60ae11db8
introducing new dav property {xmlns:oc=" http://owncloud.org/ns }id
2013-10-23 16:03:57 +02:00
06f2ae082e
Have to also strtolower() on available language name. Otherwise no match.
2013-10-23 15:39:50 +02:00
daf93c4516
Sort, so 'de' is preferred over 'de_DE' when performing non-exact matching.
2013-10-23 15:38:54 +02:00
c14b470ea2
Apply substring on the correct value.
2013-10-23 15:38:22 +02:00
959b0f9125
Merge pull request #5458 from owncloud/fixing-5222-master
...
php 5.3 compatibility regarding OC\DB\Connection fixed
2013-10-23 05:35:33 -07:00
c4dee281e6
Added $app parameter to logException
2013-10-23 13:58:42 +02:00
a542c57a7b
Catch duplicate insertion errors while scanning files
...
When two scanning processed run at the same time, for example when
scan.php and list.php were called at the same time on an external
storage mountpoint, duplicate insertion errors can occurs.
These errors are now logged and ignored.
Since both scans are running in parallel transactions, they don't see
each other's changes directly in the DB which can cause duplicate
insertion errors for mime types as well, but those mime types can't be
selected yet. The solution to this is to force-reload the mimetypes list
after the transaction is finished.
Fixes #5199
2013-10-23 13:00:46 +02:00
4c76dd3871
Better variable names.
2013-10-23 12:56:51 +02:00
207f6d55ce
Fix coding style for else.
2013-10-23 12:39:12 +02:00
3c710696e8
add missing file header
2013-10-23 12:27:54 +02:00
9d1b425b62
Correct indentation for default language.
2013-10-23 12:25:48 +02:00
42c58220de
Moved logException to OCP\Util class
2013-10-23 10:48:27 +02:00
2d14daf36b
Merge pull request #5472 from owncloud/enc_init_status_on_enable
...
Encryption set init status on enable
2013-10-23 01:02:45 -07:00
4bf37f72b2
Merge pull request #5482 from owncloud/fix_weird_http_namespace
...
Fix namespace for OCP\Appframework\Http
2013-10-23 00:40:30 -07:00
cf61b1a977
Merge pull request #5391 from owncloud/undefined-property-in-schema-master
...
removing pointless calls on quoteIdentifier() - reason: name on $tableDi...
2013-10-22 22:46:43 -07:00
ad017285e1
Fix namespace for OCP\Appframework\Http
...
To avoid having to use OCP\Appframework\Http\Http in the public - and stable
- API OCP\Appframework\Http is now both a class and a namespace.
2013-10-23 05:57:34 +02:00
064fd5ae53
Merge pull request #5451 from owncloud/reuse-session-ocs-master
...
Support existing sessions within OCS API calls
2013-10-22 14:41:21 -07:00
09903aa36c
- delete properties on node delete
...
- move properties on node move
2013-10-22 19:41:26 +02:00
bd450d6f6b
add post_enable hook if a app gets enabled
2013-10-22 16:15:19 +02:00
c85cc13d1a
Allow null as cache parameter (if no cache was found) and for cache removal.
2013-10-22 11:17:15 +02:00
dde832b76c
Only write-back on cache miss.
2013-10-22 11:17:15 +02:00
f5e2b92688
Only use autoloader cache when 'instanceid' is available.
2013-10-22 11:17:15 +02:00
eb6637682e
Inject memoryCache into Autoloader. Remove recursion-prevention hack.
2013-10-22 11:17:15 +02:00
6e0e621218
creating and deleting of file and folder 'Shared' in root is not allowed
2013-10-22 11:10:07 +02:00
cadd71ec8a
Merge pull request #5455 from owncloud/fixing-2423-master
...
introduce link_to_docs() and migrate links
2013-10-22 01:28:43 -07:00
9d976013da
Merge pull request #5437 from owncloud/create-custom-logfile
...
Try to create custom log file before falling back to default.
2013-10-22 01:17:31 -07:00
7f1432600c
fixing php 5.3.3 error:
...
Undefined variable: this
lib/private/appframework/dependencyinjection/dicontainer.php:92
2013-10-22 09:29:17 +02:00
87a09156f8
use OC_Helper::linkToDocs() in lib/private/config.php
2013-10-21 23:08:09 +02:00
e30e4ea1cc
php 5.3 compatibility regarding OC\DB\Connection fixed
2013-10-21 22:51:56 +02:00
408e0022dd
Merge pull request #5249 from owncloud/activities-api
...
[OC6] Activities api
2013-10-21 13:21:17 -07:00
124984905e
introduce OC_Helper::linkToDocs()
2013-10-21 22:01:27 +02:00
97aff7c64e
Use quoteIdentifier with proper objects
2013-10-21 22:31:57 +03:00
148d2616e5
introduce link_to_docs() and migrate links
2013-10-21 21:29:45 +02:00
66a2f3b0b9
New OCS route:
...
/ocs/cloud/user
Response:
<?xml version="1.0"?>
<ocs>
<meta>
<status>ok</status>
<statuscode>100</statuscode>
<message/>
</meta>
<data>
<id>thomas</id>
<display-name>DeepDiver</display-name>
<email>no-response@domain.tld</email>
</data>
</ocs>
2013-10-21 20:14:18 +02:00
581cd9bb9c
Support existing sessions within OCS API calls
2013-10-21 18:58:46 +02:00
2628601e79
adding oc-mtime handling to chunked upload
2013-10-21 15:00:28 +02:00
3cb666ad77
chunked files are assembled into a part file on the target storage followed by an atomic rename operation.
2013-10-21 13:21:39 +02:00
5978ddbec6
Try to create custom log file before falling back to default.
2013-10-20 23:58:07 +02:00
701009bd72
dispayNamesInGroup(s) should always return uid as key in the result attr, fixes #5209
2013-10-20 20:55:27 +02:00
6aee83cadf
[tx-robot] updated from transifex
2013-10-19 08:27:13 -04:00
9e99f9d13d
the logfile shoudn't be world readable.
2013-10-18 17:15:02 +02:00
05523e7a70
Merge pull request #3219 from owncloud/disabled-links-ui
...
Disabled links UI fixes
2013-10-18 05:02:06 -07:00
33c4747fdf
Use display name from magic cookie, fixes #4884
2013-10-18 13:36:33 +02:00
1f1fcc6129
Remove "link" shares right after disabling the "allow_link_share" setting
2013-10-18 11:37:13 +02:00
4cf328e3b9
Don't return links for shared files if disabled
2013-10-18 10:34:30 +02:00
5c5621d84e
Merge pull request #5395 from owncloud/more_check_options
...
add options to disable the check for a working .htaccess file in data
2013-10-18 01:23:20 -07:00
11cfb9dc48
Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeout
...
Added timeout for WebDAV post setup check
2013-10-18 01:10:04 -07:00
b1f72edc57
Fixed spaces
2013-10-17 23:22:19 +02:00
d2d2c9a46d
fixes #5367
2013-10-17 20:20:13 +02:00
2845747528
[tx-robot] updated from transifex
2013-10-17 13:48:52 -04:00
f9bbfad3e5
Fix sharing error message - id -> file name
...
fixe #2827
2013-10-17 16:45:11 +02:00
6a60a47d59
add options to disable the check for a working .htaccess file in data and for a working WebDAV server. This are advanced settings that are needed in special situations where our check fail and the user runs into an http timeout.
2013-10-17 16:27:43 +02:00
c3c27b3e58
Merge pull request #5394 from owncloud/sabre-server-location
...
Move OC_Connector_Sabre_Server to expected location.
2013-10-17 07:11:50 -07:00
5ee74b656c
Move OC_Connector_Sabre_Server to expected location.
2013-10-17 16:04:59 +02:00
4c5959e1f5
fix comment
2013-10-17 15:19:15 +02:00
e55d2359b1
removing pointless calls on quoteIdentifier() - reason: name on $tableDiff doesn't exist and my design the name cannot be changed
...
adding PHPDoc
2013-10-17 14:54:37 +02:00
521277b8b6
only call shell_exec if enabled
2013-10-17 14:31:07 +02:00
9c8d1190c0
Merge pull request #5385 from owncloud/generate-sql-migration-master
...
new console command to generate sql migration scripts
2013-10-17 04:53:18 -07:00
d2b1a361cc
Merge pull request #5379 from owncloud/undefined-shipped
...
fix undefined "shipped"
2013-10-17 04:37:40 -07:00
6e1881dbe4
new console command to generate sql migration scripts
2013-10-17 12:51:30 +02:00
793ccfd1df
fix undefined "shipped"
2013-10-17 11:35:13 +02:00
b70d67d49a
Merge pull request #5237 from owncloud/coverage-on-windows-master
...
PHP Code Coverage on windows master
2013-10-17 02:23:15 -07:00
186c6a56d1
Merge pull request #4949 from owncloud/improve_unknown_preview_backend
...
use svg to generate filetype icon if imagick available
2013-10-17 01:48:34 -07:00
d70a6c3f98
Merge pull request #4935 from owncloud/webdav-depth-fix-master
...
WebDAV depth infinity support - the dirty way
2013-10-17 01:37:38 -07:00
30f4d91d01
Public API documentation fixes
...
refs #4883
* http/response.php
* config.php
* response.php
* files.php
* idbconnection.php
* app.php
* user.php
* template.php
* share.php
* db.php
* icache.php & il10n.php
2013-10-17 00:49:15 +02:00
04783da829
Merge pull request #5276 from owncloud/fixing-5170-master
...
only text/plain is now used to generate text previews
2013-10-16 14:21:40 -07:00
221a650815
Merge branch 'master' into activities-api
...
Conflicts:
lib/private/server.php
2013-10-16 21:15:25 +02:00
fdeef5e874
Merge branch 'master' into fixing-appframework-master
...
Conflicts:
lib/private/appframework/middleware/security/securitymiddleware.php
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
2013-10-16 15:45:55 +02:00
c3f7d22adc
Merge pull request #5067 from owncloud/urlParams_fix
...
Get urlParams registered before Request is instantiated
2013-10-16 06:42:09 -07:00
852a50aa89
remove test code
2013-10-16 15:38:56 +02:00
8c2b0b1394
Merge branch 'master' into activities-api
2013-10-16 15:36:35 +02:00
aca66270c7
accept text/markdown as well
2013-10-16 15:31:43 +02:00
d8a7b1e537
Merge branch 'master' into fixing-5170-master
2013-10-16 14:48:55 +02:00
fa3a65aea7
Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend
...
file system is now initialized with apache authentication as well
2013-10-16 04:23:45 -07:00
52e31405f7
Added timeout value to WebDAV post setup check
...
Fixes #5357
2013-10-16 12:34:22 +02:00
7037f9c6f8
Added DAV client wrapper that support timeout values
...
Since SabreDAV does not support passing a timeout value to curl, this
commit adds a subclass for it that will set the timeout value to
curlRequest().
2013-10-16 12:32:42 +02:00
ada94fb558
Merge pull request #5333 from owncloud/avater_with_encryption
...
avatars should also work with encryption after pr #5332 was merged
2013-10-16 01:34:05 -07:00
5f249e1a54
Prevent renaming/deleting mount points
...
Fixed permissions returned for mount points to not include update and
delete permissions.
Fixes #5291
2013-10-15 14:58:58 +02:00
25320f19df
Merge branch 'master' into avater_with_encryption
2013-10-15 11:53:51 +02:00
fa341e49a8
Merge pull request #5341 from owncloud/fix-logout-link-html
...
Fix logout link HTML.
2013-10-15 00:33:00 -07:00
e3489b36ff
any preview requiring the which command will not be used on Windows
2013-10-15 00:15:45 +02:00
06f9b7b862
Fix logout link HTML.
...
<a id="logout" href=/projects/owncloud/core/index.php?logout=true>
2013-10-14 22:31:13 +02:00
6df5c7ebd5
streamCopy() should return proper structure.
...
Callers of streamCopy() expect an array to be returned containing count and result.
2013-10-14 21:33:23 +02:00
3380bd650f
avatars should also work with encryption after pr #5332 was merged
2013-10-14 17:30:24 +02:00
c97b52090e
Merge pull request #4867 from owncloud/fixing-4546-master
...
Adding detection of aborted uploads for chunked uploads
2013-10-14 06:39:32 -07:00
5318df3b3c
there shall be tabs
2013-10-14 14:51:25 +02:00
fb3829e8b8
file system is now initialized with apache authentication as well
2013-10-14 14:46:43 +02:00
71601a7c6f
implement previews for markdown
2013-10-14 14:10:47 +02:00
258ccdfabe
case insensitive sort
2013-10-14 11:15:04 +02:00
a201a66878
fix style
2013-10-14 10:57:00 +02:00
a5e808defc
Merge branch 'master' into fixing-4546-master
...
Conflicts:
lib/private/connector/sabre/file.php
2013-10-14 10:56:50 +02:00
f06df170cb
finally fix the app sorting
2013-10-14 10:54:38 +02:00
Bart Visscher
Frank Karlitschek
Vincent Petry
NARUKAWA Hiroki
Andreas Fischer
Robin Appelman
Thomas Müller
icewind1991
Oliver Gasser
Thomas Tanghus
Georg Ehrke
Arthur Schiwon
Jörn Friedrich Dreyer
tomneedham
Joas Schilling
Pellaeon Lin
Morris Jobke
Björn Schießle
Bjoern Schiessle
Nico Kaiser
Alexander Bergolth
Owen Winkler
Simon Könnecke
Raghu Nayyar
ringmaster
Tom Needham
Oliver Gasser
kondou
Lukas Reschke
Ramiro Aparicio
VicDeo
Victor Dubiniuk
Michael Gapczynski