39be83ca8b
Merge pull request #6676 from aseques/check_internet_proxy
...
Fix internet detection to use OC_Util::getUrlContent
2014-01-19 12:08:55 -08:00
1af7dab535
Fixed quota wrapper to not wrap failed fopen streams
...
When calling fopen() on some storage types, these return false instead
of throwing an exception.
This fix makes sure that in case the stream wasn't opened (for example
when a file doesn't exist any more) the stream isn't wrapped.
Also added 'rb' as another case that doesn't need to be wrapped.
Fixes #6832
2014-01-19 18:51:36 +01:00
3a2e03a7f0
Merge pull request #6784 from owncloud/fix-activation-of-unknown-apps
...
Fix activation of unknown apps
2014-01-18 08:13:57 -08:00
66aa9b4e27
lib/files.php: make use of === instead of ==
2014-01-18 15:16:17 +01:00
bf0471a92e
show link to app documentation
2014-01-17 14:56:25 +01:00
5cb08bb9cb
Merge branch 'master' into fileinfo
...
Conflicts:
tests/lib/files/cache/cache.php
2014-01-17 14:47:29 +01:00
6b4c3df087
Load a separate config (if present) when running unit tests
2014-01-17 14:40:48 +01:00
350214c609
Added Javascript unit tests
...
- added karma utility to run jasmine unit tests
- added Sinon library (for stubs/mocks/fakeserver)
- added a few unit tests for core and files
- added autotest-js.sh script
2014-01-16 17:12:29 +01:00
504645cf00
Add bindParam to statement wrapper
2014-01-16 14:07:16 +01:00
32e941a2bc
Merge pull request #6644 from ben-denham/unshare-all-fix
...
\OCP\Share::unshareAll() fix
2014-01-16 03:13:26 -08:00
7f68497b39
error handling in case a requested app doesn't exists
2014-01-15 17:11:29 +01:00
729210daa0
Merge branch 'master' into memcache-public
...
Conflicts:
apps/user_ldap/lib/connection.php
2014-01-15 13:02:15 +01:00
d4519125db
Merge pull request #6744 from owncloud/fix_ocs_response_messages
...
keep response message
2014-01-15 03:17:24 -08:00
34559ef114
Merge pull request #6768 from owncloud/scanner-use-storage-mtime
...
Use storage_mtime when determining if we can reuse cached data while scanning
2014-01-15 01:31:33 -08:00
c01949ec0e
Merge branch 'master' into fileinfo
2014-01-14 16:31:08 +01:00
c3a0b0d7f3
Merge pull request #6704 from owncloud/encryptedfoldersizecalc
...
Fix calculated folder size to use unencrypted size
2014-01-14 07:20:16 -08:00
203d5d01ca
Use storage_mtime when determining if we can reuse cached data while scanning
2014-01-14 13:54:07 +01:00
92969052d7
remove ru_RU - it has bee removed from transifex
2014-01-13 16:41:10 +01:00
e706cf6c06
add Support for passing a FileInfo instance to View->putFileInfo
2014-01-13 15:57:49 +01:00
82762bb462
remove ArrayAccess, JsonSerializable from the public part of FileInfo
2014-01-13 15:13:45 +01:00
39d2c18793
Extends phpdoc for \OCP\File\FileInfo
2014-01-13 14:42:14 +01:00
617acbd6f9
Add a FileInfo class which holds all info of a file and return that from getFileInfo, getDirectoryContent and search
2014-01-13 14:28:49 +01:00
6845860470
keep response message
2014-01-13 12:27:05 +01:00
a2cae551f3
fixing typo in redirection query string
2014-01-12 15:49:32 +01:00
6f21da12e8
encode imagePath and fix documentation of loadFromFile
2014-01-11 12:07:28 +01:00
2abea96462
Disabled internet checking as mentioned when in proxy mode
2014-01-10 09:33:35 +01:00
acd81f6c69
Readd support for memcached_server config variable.
2014-01-10 00:57:40 +01:00
320353c237
Add support for multiple memcached servers.
2014-01-10 00:57:34 +01:00
4faba49f0a
Fix calculated folder size to use unencrypted size
...
The encrypted size was used when calculating folder sizes.
This fix now also sums up the unencrypted size and shows that one when
available.
2014-01-09 17:47:50 +01:00
b24c21b00f
Merge pull request #6687 from owncloud/sharing-fixpartfilehandling
...
Removed special handling of part files in shared storage rename
2014-01-09 06:16:43 -08:00
5d456c7cc2
Merge branch 'master' into memcache-public
2014-01-09 13:54:58 +01:00
d50c7391d8
Use $server->getMemCacheFactory() in ldap connection
2014-01-09 13:54:50 +01:00
c3829dfa61
rename user-id to loginname to stay consistent
2014-01-09 10:29:21 +01:00
22bd69f75c
set login name within apache auth backend
2014-01-09 10:28:24 +01:00
9b7c3a5c66
fixing PHPDoc and use cameCase names
2014-01-09 10:27:47 +01:00
d8b8abb429
Merge pull request #6681 from owncloud/userreport
...
add command line option to get user number statistics
2014-01-08 10:41:39 -08:00
4585b4ea3f
Infowarning about 32bit
2014-01-08 19:41:10 +01:00
8eaa39f4e2
Removed special handling of part files in shared storage rename
...
This fixes the issue introduced by the transfer id which itself wasn't
taken into account by the shortcut code for part file in the shared
storage class.
2014-01-08 18:43:20 +01:00
e35bca1c26
Fix ownCloud for php5.3.x
2014-01-08 16:07:01 +01:00
5a2a0426a6
Also update the OCP\IServerContainer
2014-01-08 15:51:40 +01:00
be7837402d
get the memorycache factory from OCP\Server instead of a cache instance
...
this allows apps to specify a prefix to use
2014-01-08 15:18:12 +01:00
d7cb5ab080
add tests for user counting
2014-01-08 13:26:48 +01:00
cb6a3e2617
if backends have the same class name, sum their users up instead of overwriting
2014-01-08 13:24:28 +01:00
f642ad3961
Prevent deleting storage root
...
Storage mount points are not deletable, so make sure that the unlink
operation and its hooks aren't run in such cases.
Note that some storages might recursively delete their contents when
calling unlink on their root. This fix prevents that as well.
2014-01-08 13:17:36 +01:00
4c93b00990
Merge branch 'master' into disable-mod_pagespeed
2014-01-08 10:19:16 +01:00
1614ad42b3
Merge pull request #6673 from owncloud/master-quota-insufficientstorageforfilesfix
...
Now also preventing to override "files" dir size with -1
2014-01-08 00:55:11 -08:00
5eef107344
turn off mod_pagespeed
2014-01-08 07:56:08 +01:00
f356894aa3
Merge pull request #6594 from owncloud/kill-index.php-from-url
...
Kill index.php from url
2014-01-07 22:28:58 -08:00
428d2b6e0f
Remove unused spaces
2014-01-08 00:16:37 -02:00
938ece1a3f
Remove name from code
2014-01-08 00:15:08 -02:00
1e1ced7772
Introduce user count action to user management
2014-01-07 23:05:37 +01:00
5be4af9f51
Now also preventing to override "files" dir size with -1
...
Fixes #6526
2014-01-07 22:34:01 +01:00
b6474506eb
Merge pull request #6660 from owncloud/fixing-disabled-function-checks
...
Fixing disabled function checks
2014-01-07 11:10:45 -08:00
2d5427efa9
Merge pull request #6290 from owncloud/files-androidcontentdisposition
...
Files androidcontentdisposition
2014-01-07 11:06:20 -08:00
09d7882571
trimming all array elements
2014-01-07 19:47:01 +01:00
f2fbfbc665
Merge pull request #6642 from owncloud/update-SabreDAV
...
Update sabre dav to 1.7.9
2014-01-07 08:04:13 -08:00
3abe4c3e88
Merge pull request #6663 from owncloud/fix_empty_mimetypes
...
remove duplicate exe mimetype, add correct msi mimetype
2014-01-07 07:31:12 -08:00
e0bd7e145c
Remove @ in order to get proper error handling
2014-01-07 16:24:05 +01:00
9404a8f40c
remove duplicate exe mimetype, add correct msi mimetype
2014-01-07 15:51:08 +01:00
9d869ab596
we shall explode on ',' only
2014-01-07 14:53:02 +01:00
07a84aa5eb
reuse existing helper function OC_Helper::is_function_enabled
2014-01-07 14:52:18 +01:00
970eed2867
Merge pull request #6530 from owncloud/prevent-corruption-on-parallel-upload-master
...
Adding a random postfix to the part file.
2014-01-07 03:25:26 -08:00
ed469a7d2c
in order to work properly with encryption ocTransferId is added to the file path - questionable usage of magic string
2014-01-07 11:53:33 +01:00
d2f2645a6a
[tx-robot] updated from transifex
2014-01-07 01:56:11 -05:00
5c3c379f35
Merge branch 'fix-5388-master' into migration_unit_tests
2014-01-07 00:40:36 +00:00
4d65a80892
Remove the static dependency on OC_Util from Memcache
2014-01-06 13:11:38 +01:00
cd147bb37a
Use APCIterator for Memcache\APC::clear()
2014-01-06 12:58:43 +01:00
1df1b55b66
expose memory cache in public api
2014-01-06 12:55:56 +01:00
0e843b9d7d
[tx-robot] updated from transifex
2014-01-06 01:55:59 -05:00
baccc8f584
Unshare all will now delete all shares for the item, instead of only for a single owner.
2014-01-06 11:14:43 +13:00
214aecac78
require composer's autoload.php if present
2014-01-05 21:49:08 +01:00
ce3df44699
Merge pull request #6031 from s0taka/master
...
No decimal points for Kilobyte and Byte #5371 .
2014-01-05 11:52:10 -08:00
569851fa0e
Add tabs to conformance with owncloud code standards
2014-01-05 12:38:54 -02:00
e4616199df
[tx-robot] updated from transifex
2014-01-05 01:55:53 -05:00
d258ade35e
Fix PostgreSQL port configuration on install
2014-01-04 19:23:25 -02:00
1824ae1222
Merge branch 'master' into fix-5388-master
2014-01-04 13:46:08 +00:00
f016a3ead3
Merge pull request #6610 from owncloud/apcu-clear
...
Fix APCIterator syntax in \OC\Memcache\APCu::clear
2014-01-03 05:30:49 -08:00
1ce45713bd
Merge pull request #6605 from owncloud/free_space_disabled
...
Return SPACE_UNKNOWN if disk_free_space is disabled
2014-01-02 08:19:52 -08:00
83f968ace2
Fix APCIterator syntax in \OC\Memcache\APCU::clear
...
see http://www.php.net/manual/en/apciterator.construct.php
2014-01-02 16:12:56 +01:00
14e0b1b6d1
Merge pull request #6513 from owncloud/user-no-change-displayname
...
Re-add the config options to remove the ability for users to change their displayname
2014-01-02 05:04:27 -08:00
25370fcb82
Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free space on a local storage
2014-01-02 13:19:10 +01:00
095f9b8ee0
[tx-robot] updated from transifex
2014-01-02 01:56:21 -05:00
25a9311e94
Merge pull request #6601 from AdamWill/pimple-include
...
don't specify path to 3rdparty directory when registering Pimple autoloader
2014-01-01 15:25:58 -08:00
9b4a827e0b
don't specify path to 3rdparty directory when registering Pimple autoloader
...
The core 3rdparty directory is in the include_path from lib/base.php anyway, so this is unnecessary, and causes problems for downstream distributors who unbundle Pimple.
2014-01-01 09:52:19 -08:00
d5382ac05d
Add support mimetype
...
Add support mimetype for extension .sh, .bash and .sh-lib
2014-01-01 14:09:02 +01:00
4c179850ab
Revert "Added support for extra backends (see pull request #5043 )"
...
This reverts commit 2d75914f2a760fa9ea30
2014-01-01 13:43:23 +01:00
2d75914f2a
Added support for extra backends (see pull request #5043 )
...
Somebody had forgotten "OC_User::setupBackends();"...
2014-01-01 11:53:27 +01:00
6254f0a403
use getAppWebPath() in here as well
2013-12-31 15:12:17 +01:00
ae5671d281
new config parameter 'front_controller_active' which will instruct the url generator to generate urls without index.php
2013-12-31 14:36:02 +01:00
760fa9ea30
[tx-robot] updated from transifex
2013-12-31 01:55:42 -05:00
9ea9638490
[tx-robot] updated from transifex
2013-12-30 01:55:38 -05:00
64a001edab
[tx-robot] updated from transifex
2013-12-27 01:55:35 -05:00
7b2f4b08ac
[tx-robot] updated from transifex
2013-12-26 01:55:34 -05:00
97031ba45c
Merge pull request #6520 from owncloud/tests-testcleanuplistener
...
Added test cleanup listener to detect untidy tests
2013-12-24 14:27:39 -08:00
efdeba7416
Merge pull request #6449 from owncloud/core-appsorderfix
...
Fixed apps loading order
2013-12-24 14:26:11 -08:00
dbbd99db09
[tx-robot] updated from transifex
2013-12-24 01:55:40 -05:00
7b428f6009
Merge pull request #6460 from owncloud/remove-numRows
...
Remove OC_DB_StatementWrapper::numRows()
2013-12-23 03:38:56 -08:00
f60ecfc7fd
[tx-robot] updated from transifex
2013-12-22 01:56:05 -05:00
63a2bea7ec
Remove OC_DB_StatementWrapper::numRows().
...
Using this method will result in an unneccesary extra SQL query (which also may
return an incorrect result because the underlying table changed in the
meantime).
In general:
If you are performing an UPDATE, DELETE or equivalent query,
OC_DB_StatementWrapper::execute() will already give you the number of
"affected rows" via \Doctrine\DBAL\Driver\Statement::rowCount(). This will
not work for SELECT queries, however.
If you want to know whether a table contains any rows matching your condition,
use "SELECT id FROM ... WHERE ... LIMIT 1".
If you want to know whether a table contains any rows matching your condition
and you also need the data, use "SELECT ... FROM ... WHERE ...", then use
one of the fetch() methods.
If you want to count the number of rows matching your condition, use use
"SELECT COUNT(...) AS number_of_rows FROM ... WHERE ...", then use one of the
fetch() methods.
2013-12-21 19:36:14 +01:00
c2e2c59ca7
Update user.php to fix duplicate session-duplicate
2013-12-22 01:31:04 +09:00
c6377e9125
Fixed apps loading order
...
On SQLite the app order can be arbitrary and cause strange bugs.
On MySQL, the app order seems to be always alphabetical.
This fix enforces alphabetical order to make sure that all environments
behave the same and to reduce bugs related to app loading order.
Fixes #6442
2013-12-20 17:16:57 +01:00
1c0b8ed214
Adding a random postfix to the part file.
2013-12-20 13:48:46 +01:00
ac85dea267
Fix migration import of user files
2013-12-20 12:22:49 +01:00
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
Thomas Müller
Vincent Petry
Morris Jobke
Nicolai Ehemann
Bjoern Schiessle
Robin Appelman
st3so
Georg Ehrke
Joan
Andreas Fischer
blizzz
Jörn Friedrich Dreyer
eduardo
tomneedham
ben-denham
icewind1991
Adam Williamson
lolozere
Niklas Sombert
Frank Karlitschek
nhirokinet
Bart Visscher
Oliver Gasser
Thomas Tanghus
Joas Schilling
Pellaeon Lin
Björn Schießle
Nico Kaiser
Alexander Bergolth
Owen Winkler
Simon Könnecke
Raghu Nayyar
ringmaster
Tom Needham
Oliver Gasser