Commit Graph

2906 Commits

Author SHA1 Message Date
Lukas Reschke eab6d7eb23 Enhanced auth is totally unmaintained and broken
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
2013-01-14 21:39:49 +01:00
Sean Comeau 0132a0b2cf Rename TestException to DatabaseSetupException 2013-01-14 12:36:50 -08:00
Bart Visscher 8b2307ce4b Merge pull request #1172 from owncloud/isSubDirectory
Simplify the isSubDirectory() function
2013-01-14 12:36:38 -08:00
Sean Comeau 42cd99626e Use a custom exception instead of adding a delimiter to the error message 2013-01-14 11:57:40 -08:00
Lukas Reschke cc00c54f6a Remove uneeded returns 2013-01-14 20:18:08 +01:00
Lukas Reschke e8b45caa51 Remove uneeded return
Thx @Raydiation
2013-01-14 19:57:28 +01:00
Lukas Reschke 31b1a73e1f Check if user is admin - bool
There was no "isAdminUser()" function which returned bool. This is
irritiating as there were a loooooooot of places in the code which
checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not
use a function for this?
(Especially if you consider that we might change the group name in the
future, which would lead to problems then)

Additionally, @Raydiation needed such a method for his AppFramework :)
2013-01-14 19:45:17 +01:00
Lukas Reschke 99adfbdb86 Check for string position instead of string existence
otherwise /foo/bar would be detected as a subfolder of /bar

THX @icewind1991
2013-01-14 16:51:35 +01:00
Bart Visscher fa78fbe0c3 Merge pull request #1112 from Raydiation/master
This fixes a problem that prevented app routes from being loaded after ocs_api merge
2013-01-14 07:35:14 -08:00
Jenkins for ownCloud c29310aaef [tx-robot] updated from transifex 2013-01-14 00:18:21 +01:00
Lukas Reschke b7db967dc5 Commentblocks should begin with two * 2013-01-13 14:54:18 +01:00
Lukas Reschke c27833b143 Add @brief to description 2013-01-13 14:50:31 +01:00
Lukas Reschke e151210a62 Simplify the isSubDirectory() function
isSubDirectory() checks if a specified $sub is a subdirectory of the
$parent, this is needed to prevent file inclusions.

Actually, the current code is more kind of a "hack" which I always
struggle over if browsing through source. So this should be a much
better implementation.

The implementation is really straightforward:
- [realpath()](http://php.net/manual/function.realpath.php) expands all
symbolic links and resolves references to '/./', '/../' and extra '/'
characters in the input path and return the canonicalized absolute
pathname.
- [strpos()](php.net/manual/function.strpos.php) returns FALSE if the
substring wasn't found.

Since this is an absolutely critical piece of code, I'd like to ensure
that this is absolutely safe!
2013-01-13 14:33:19 +01:00
Michael Gapczynski 094a852bff Wrap the etag in double quotes 2013-01-11 21:09:58 -05:00
Michael Gapczynski b30648cb7d Don't waste time making another call since we know it doesn't exist 2013-01-11 21:09:01 -05:00
Michael Gapczynski a00b9e0a03 Bump version 2013-01-11 21:01:28 -05:00
Michael Gapczynski 6f049d0889 Merge branch 'filesystem' into filesystem-etags 2013-01-11 21:00:02 -05:00
Michael Gapczynski 9e2f3a5324 Remove old create etag function 2013-01-11 20:59:53 -05:00
Michael Gapczynski 8a63bcc1e8 Don't use more entropy for etags 2013-01-11 20:56:36 -05:00
Thomas Mueller 364b1cd391 Merge branch 'master' into fixing-998-master
Conflicts:
	apps/files/js/files.js
2013-01-11 10:00:12 +01:00
Thomas Mueller 23896a7290 Merge branch 'master' into fixing-784-master
Conflicts:
	apps/files/js/files.js
2013-01-11 09:53:12 +01:00
Michael Gapczynski 4835525c46 Switch scan to scanFile for root of mount points 2013-01-10 22:28:50 -05:00
Thomas Müller 60489764f3 Merge pull request #1133 from owncloud/add_linebreaks_in_sharing
add more linebreaks, replace SQL LIMIT with param
2013-01-10 15:14:14 -08:00
Jenkins for ownCloud d03dce1283 [tx-robot] updated from transifex 2013-01-11 00:06:14 +01:00
Sean Comeau ba9c967435 Throw an exception when creating a MySQL user fails and display exception error text to user 2013-01-10 14:43:08 -08:00
Sam Tuke 3e83023bf6 Removed unnecessary line 2013-01-10 18:16:56 +00:00
Sam Tuke 9ca9124dc1 Merge branch 'master' into files_encryption 2013-01-10 18:07:15 +00:00
Michael Gapczynski aa15fcf22f Scan mount points in root before adding a entry 2013-01-10 12:09:55 -05:00
Thomas Müller 23dd7f1bea Merge pull request #1127 from owncloud/fixing-641-for-webdav-master
webdav returns "503 Service Unavailable" in case the ownCloud server is ...
2013-01-10 02:27:00 -08:00
Michael Gapczynski 106541361c Change length of mimetypes to 255, the maximum length according to RFC 4288 2013-01-09 22:57:42 -05:00
Jenkins for ownCloud 912050afa0 [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
Jörn Friedrich Dreyer 42e3eaf45a add more linebreaks, replace SQL LIMIT with param 2013-01-09 13:57:51 +01:00
Thomas Mueller ccdaec6296 webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode. 2013-01-09 00:37:50 +01:00
Björn Schießle 43415386a8 Upstream merged my patch to add additional ssl root certificates to the webdav client.
This means that OC_Connector_Sabre_Client is no longer needed
2013-01-08 17:44:28 +01:00
Michael Gapczynski e8b195bf10 Almost fix Shared scanner... 2013-01-07 20:52:51 -05:00
Bernhard Posselt 75dbe88664 added cleanup recommendations by including ocs in the cachedKey method and moving the ocs routes stuff at the end of the loadRoutes method 2013-01-07 21:57:13 +01:00
Michael Gapczynski 5174eda232 Fix permissions for mount point 2013-01-07 15:21:38 -05:00
Michael Gapczynski d39655e126 Move template parameters around so database error page is properly rendered 2013-01-07 14:15:51 -05:00
Michael Gapczynski 6801f82d09 Merge branch 'filesystem' into filesystem-etags
Conflicts:
	lib/files/cache/cache.php
2013-01-07 10:28:37 -05:00
Bernhard Posselt 5ccbfd9079 readded ocs routes 2013-01-07 15:48:45 +01:00
Bernhard Posselt f80bc4ed53 fixed error that displayed a white page and a warning that routes could not be loaded from apps that was caused by the ocs_api merge 2013-01-07 15:34:42 +01:00
Robin Appelman d0377b1951 Cache: normalize mimetypes 2013-01-07 02:09:21 +01:00
Robin Appelman 439578288f Cache: split permission cache scanning and cache scanning 2013-01-07 01:03:11 +01:00
Robin Appelman 457dc270f5 Fix messed up mounts 2013-01-07 00:36:39 +01:00
Robin Appelman 0ca5047da5 Autoload namespaced test classes 2013-01-07 00:36:01 +01:00
Robin Appelman e8d08d4930 merge master into filesystem 2013-01-07 00:16:10 +01:00
Thomas Mueller a21da9f9fd fixing returns 2013-01-06 23:59:02 +01:00
Thomas Mueller 1093cdd823 fixing returns 2013-01-06 23:57:27 +01:00
Thomas Mueller 19edb29cc3 add missing return 2013-01-06 23:54:18 +01:00
Thomas Mueller cdd28fcc46 fixing undefined variable $where 2013-01-06 23:48:04 +01:00
Thomas Mueller 408b2cba58 fixing undefined variable $result - should be $query I assume 2013-01-06 23:45:12 +01:00
Thomas Mueller 01cecc9522 initialize $result 2013-01-06 23:43:02 +01:00
Thomas Mueller 19e604c104 fixing call of OC_Log::write() - missing parameter 2013-01-06 23:30:17 +01:00
Thomas Mueller a143e77ee4 removing unused parameter $parameters
fixing undefined variable $useDir
2013-01-06 23:29:43 +01:00
Thomas Mueller bae1755184 Merge branch 'master' into fixing-784-master
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
	lib/helper.php
2013-01-06 22:40:35 +01:00
Sam Tuke a68b597e83 Merge branch 'master' into files_encryption 2013-01-06 18:53:32 +00:00
Thomas Mueller 7ebfcab49b Merge branch 'master' into fixing-998-master
Conflicts:
	lib/helper.php
2013-01-06 12:18:21 +01:00
Thomas Mueller 6806484c16 Merge branch 'master' into fixing-998-master 2013-01-06 10:36:14 +01:00
Michael Gapczynski 035d0aa9d5 Merge branch 'master' into update-progress 2013-01-05 12:24:21 -05:00
Sam Tuke 69e86c0213 Merge branch 'master' into files_encryption 2013-01-05 17:22:01 +00:00
Michael Gapczynski f6426cee04 Tweak failure message and throw exceptions from updateDbFromStructure() 2013-01-05 12:13:36 -05:00
Michael Gapczynski 89823ef4f9 Modify and include additional update messages from updating apps 2013-01-05 11:28:01 -05:00
Thomas Müller 0c6213a371 Merge pull request #1066 from owncloud/fix-388-master
workaround for 32-bit systems to handle filesizes bigger than 2GB
2013-01-05 06:21:28 -08:00
Michael Gapczynski 0b13b41189 Merge pull request #1053 from owncloud/ocs_api
External API for ownCloud based on OCS
2013-01-04 17:18:58 -08:00
Michael Gapczynski a94405b4e4 Only show the version updating to instead of worrying about converting internal to a formatted version 2013-01-04 20:13:00 -05:00
Thomas Mueller da28ae0069 remove duplicate return 2013-01-05 00:09:37 +01:00
Thomas Mueller 2cb6632752 enhanced log message 2013-01-04 23:44:01 +01:00
Thomas Mueller ac50c2f973 documentation adjusted on the way 2013-01-04 23:04:23 +01:00
Thomas Mueller cedec593ee Fallback to use COM or exec('stat ..') is only executed if stat or filesize return negative values.
Special case of BSD has been added as stat syntax differs
In addition unknown OS is logged
2013-01-04 23:03:26 +01:00
Thomas Mueller dfc8d757b5 OC_Helper::is_function_enabled() added to find out if a function is available
And some documentation adjusted on the way
2013-01-04 23:00:51 +01:00
Michael Gapczynski f2e6df807d Add back check if installed around background jobs 2013-01-04 14:16:59 -05:00
Michael Gapczynski e7eea3dd2e Use hooks to send updates from apps 2013-01-04 10:21:33 -05:00
Michael Gapczynski 7505837079 Basic update progress of database update only 2013-01-03 21:32:33 -05:00
Michael Gapczynski a52aa69ffe Rearrange code to prepare for updater feedback 2013-01-03 14:11:00 -05:00
Michael Gapczynski 1137723b2a Remove unnecessary length parameter from last commit 2013-01-03 12:13:45 -05:00
Michael Gapczynski 38876fc98a Update old storage classes names to the new namespace during mounting 2013-01-03 12:07:04 -05:00
Robin Appelman e40be93e87 merge master into filesystem 2013-01-03 15:59:17 +01:00
Michael Gapczynski ce443818d4 Check if oc_token cookie exists before trying to use it 2013-01-02 19:59:04 -05:00
Thomas Mueller 045c0acc92 workaround for 32-bit systems to handle filesizes bigger than 2GB 2013-01-03 00:38:44 +01:00
Thomas Mueller 34e5cb5070 fixing indent 2013-01-03 00:13:30 +01:00
Jenkins for ownCloud 3bcdd8c900 [tx-robot] updated from transifex 2013-01-03 00:05:19 +01:00
Thomas Müller 9dc5ea172e Merge pull request #975 from irgsmirx/patch-1
Update lib/util.php
2013-01-02 14:01:38 -08:00
Michael Gapczynski a068ddff64 Use the sub storage's permission cache for retrieving the correct permission 2013-01-02 14:40:06 -05:00
Thomas Mueller 1727b2e84d add smtp port configuration option 2013-01-02 19:04:08 +01:00
Sam Tuke bf69677933 Merge branch 'master' into files_encryption
Conflicts:
	apps/files/css/files.css
	apps/files/index.php
	apps/files/js/files.js
	apps/files/js/keyboardshortcuts.js
	apps/files/l10n/da.php
	apps/files/l10n/el.php
	apps/files/l10n/eu.php
	apps/files/l10n/hu_HU.php
	apps/files/l10n/mk.php
	apps/files/l10n/nb_NO.php
	apps/files/l10n/ro.php
	apps/files/l10n/ru.php
	apps/files/l10n/ru_RU.php
	apps/files/l10n/th_TH.php
	apps/files/l10n/tr.php
	apps/files/templates/admin.php
	apps/files/templates/index.php
	apps/files/templates/part.breadcrumb.php
	apps/files_encryption/appinfo/app.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/cryptstream.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/settings.php
	apps/files_encryption/templates/settings.php
	apps/files_encryption/tests/proxy.php
	apps/files_encryption/tests/stream.php
	apps/files_external/l10n/gl.php
	apps/files_external/l10n/uk.php
	apps/files_external/personal.php
	apps/files_external/settings.php
	apps/files_external/templates/settings.php
	apps/files_sharing/public.php
	apps/user_ldap/l10n/gl.php
	apps/user_ldap/l10n/uk.php
	apps/user_ldap/lib/access.php
	apps/user_webdavauth/l10n/eo.php
	apps/user_webdavauth/l10n/eu.php
	apps/user_webdavauth/l10n/fr.php
	apps/user_webdavauth/l10n/gl.php
	apps/user_webdavauth/l10n/sl.php
	apps/user_webdavauth/l10n/tr.php
	apps/user_webdavauth/l10n/uk.php
	apps/user_webdavauth/l10n/zh_CN.php
	core/ajax/share.php
	core/css/styles.css
	core/l10n/ca.php
	core/l10n/de.php
	core/l10n/de_DE.php
	core/l10n/el.php
	core/l10n/eo.php
	core/l10n/es.php
	core/l10n/eu.php
	core/l10n/fr.php
	core/l10n/gl.php
	core/l10n/he.php
	core/l10n/is.php
	core/l10n/it.php
	core/l10n/nl.php
	core/l10n/pl.php
	core/l10n/pt_PT.php
	core/l10n/ru.php
	core/l10n/sl.php
	core/l10n/tr.php
	core/l10n/uk.php
	core/l10n/zh_CN.php
	core/templates/installation.php
	core/templates/login.php
	l10n/ar/files_external.po
	l10n/ar/settings.po
	l10n/bg_BG/files_external.po
	l10n/bg_BG/settings.po
	l10n/ca/core.po
	l10n/ca/files_external.po
	l10n/ca/settings.po
	l10n/cs_CZ/files_external.po
	l10n/cs_CZ/settings.po
	l10n/da/files.po
	l10n/da/files_external.po
	l10n/da/settings.po
	l10n/de/core.po
	l10n/de/files_external.po
	l10n/de/settings.po
	l10n/de_DE/core.po
	l10n/de_DE/files_external.po
	l10n/de_DE/settings.po
	l10n/el/core.po
	l10n/el/files.po
	l10n/el/files_external.po
	l10n/el/settings.po
	l10n/eo/core.po
	l10n/eo/files_external.po
	l10n/eo/settings.po
	l10n/eo/user_webdavauth.po
	l10n/es/core.po
	l10n/es/files_external.po
	l10n/es/settings.po
	l10n/es_AR/core.po
	l10n/es_AR/files_external.po
	l10n/es_AR/settings.po
	l10n/et_EE/files_external.po
	l10n/et_EE/settings.po
	l10n/et_EE/user_webdavauth.po
	l10n/eu/core.po
	l10n/eu/files.po
	l10n/eu/files_external.po
	l10n/eu/settings.po
	l10n/eu/user_webdavauth.po
	l10n/fa/files_external.po
	l10n/fa/settings.po
	l10n/fi_FI/files_external.po
	l10n/fi_FI/settings.po
	l10n/fr/core.po
	l10n/fr/files_external.po
	l10n/fr/settings.po
	l10n/fr/user_webdavauth.po
	l10n/gl/core.po
	l10n/gl/files_external.po
	l10n/gl/settings.po
	l10n/gl/user_ldap.po
	l10n/gl/user_webdavauth.po
	l10n/he/core.po
	l10n/he/files_external.po
	l10n/he/settings.po
	l10n/hi/files_external.po
	l10n/hi/settings.po
	l10n/hr/files_external.po
	l10n/hr/settings.po
	l10n/hu_HU/files.po
	l10n/hu_HU/files_external.po
	l10n/hu_HU/settings.po
	l10n/ia/files_external.po
	l10n/ia/settings.po
	l10n/id/files_external.po
	l10n/id/settings.po
	l10n/is/core.po
	l10n/is/files.po
	l10n/is/files_encryption.po
	l10n/is/files_external.po
	l10n/is/files_sharing.po
	l10n/is/files_versions.po
	l10n/is/lib.po
	l10n/is/settings.po
	l10n/is/user_ldap.po
	l10n/is/user_webdavauth.po
	l10n/it/core.po
	l10n/it/files_external.po
	l10n/it/settings.po
	l10n/ja_JP/core.po
	l10n/ja_JP/files_external.po
	l10n/ja_JP/settings.po
	l10n/ka_GE/files_external.po
	l10n/ka_GE/settings.po
	l10n/ko/core.po
	l10n/ko/files_external.po
	l10n/ko/settings.po
	l10n/ko/user_ldap.po
	l10n/ko/user_webdavauth.po
	l10n/ku_IQ/files_external.po
	l10n/ku_IQ/settings.po
	l10n/lb/files_external.po
	l10n/lb/settings.po
	l10n/lt_LT/files_external.po
	l10n/lt_LT/settings.po
	l10n/lv/files_external.po
	l10n/lv/settings.po
	l10n/mk/files.po
	l10n/mk/files_external.po
	l10n/mk/settings.po
	l10n/ms_MY/files_external.po
	l10n/ms_MY/settings.po
	l10n/nb_NO/files.po
	l10n/nb_NO/files_external.po
	l10n/nb_NO/settings.po
	l10n/nl/core.po
	l10n/nl/files_external.po
	l10n/nl/settings.po
	l10n/nn_NO/files_external.po
	l10n/nn_NO/settings.po
	l10n/oc/files_external.po
	l10n/oc/settings.po
	l10n/pl/core.po
	l10n/pl/files_external.po
	l10n/pl/settings.po
	l10n/pl_PL/files_external.po
	l10n/pl_PL/settings.po
	l10n/pt_BR/core.po
	l10n/pt_BR/files_external.po
	l10n/pt_BR/settings.po
	l10n/pt_PT/core.po
	l10n/pt_PT/files_external.po
	l10n/pt_PT/settings.po
	l10n/ro/files.po
	l10n/ro/files_external.po
	l10n/ro/settings.po
	l10n/ru/core.po
	l10n/ru/files.po
	l10n/ru/files_external.po
	l10n/ru/settings.po
	l10n/ru_RU/files.po
	l10n/ru_RU/files_external.po
	l10n/ru_RU/settings.po
	l10n/si_LK/files_external.po
	l10n/si_LK/settings.po
	l10n/sk_SK/core.po
	l10n/sk_SK/files_external.po
	l10n/sk_SK/settings.po
	l10n/sk_SK/user_webdavauth.po
	l10n/sl/core.po
	l10n/sl/files_external.po
	l10n/sl/settings.po
	l10n/sl/user_webdavauth.po
	l10n/sq/core.po
	l10n/sq/files_external.po
	l10n/sq/settings.po
	l10n/sq/user_ldap.po
	l10n/sq/user_webdavauth.po
	l10n/sr/core.po
	l10n/sr/files_external.po
	l10n/sr/settings.po
	l10n/sr@latin/files_external.po
	l10n/sr@latin/settings.po
	l10n/sv/files_external.po
	l10n/sv/settings.po
	l10n/ta_LK/files_external.po
	l10n/ta_LK/settings.po
	l10n/ta_LK/user_ldap.po
	l10n/ta_LK/user_webdavauth.po
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot
	l10n/th_TH/core.po
	l10n/th_TH/files.po
	l10n/th_TH/files_external.po
	l10n/th_TH/settings.po
	l10n/th_TH/user_webdavauth.po
	l10n/tr/core.po
	l10n/tr/files.po
	l10n/tr/files_external.po
	l10n/tr/settings.po
	l10n/tr/user_webdavauth.po
	l10n/uk/core.po
	l10n/uk/files_external.po
	l10n/uk/settings.po
	l10n/uk/user_ldap.po
	l10n/uk/user_webdavauth.po
	l10n/vi/core.po
	l10n/vi/files_external.po
	l10n/vi/settings.po
	l10n/zh_CN.GB2312/files_external.po
	l10n/zh_CN.GB2312/settings.po
	l10n/zh_CN/core.po
	l10n/zh_CN/files_external.po
	l10n/zh_CN/settings.po
	l10n/zh_CN/user_webdavauth.po
	l10n/zh_HK/core.po
	l10n/zh_HK/files_external.po
	l10n/zh_HK/settings.po
	l10n/zh_HK/user_ldap.po
	l10n/zh_HK/user_webdavauth.po
	l10n/zh_TW/core.po
	l10n/zh_TW/files_external.po
	l10n/zh_TW/settings.po
	l10n/zh_TW/user_ldap.po
	l10n/zh_TW/user_webdavauth.po
	l10n/zu_ZA/files_external.po
	l10n/zu_ZA/settings.po
	lib/base.php
	lib/filecache.php
	lib/files.php
	lib/helper.php
	lib/l10n.php
	lib/request.php
	lib/util.php
	settings/ajax/togglegroups.php
	settings/js/users.js
	settings/l10n/ar.php
	settings/l10n/de_DE.php
	settings/l10n/el.php
	settings/l10n/eo.php
	settings/l10n/es_AR.php
	settings/l10n/eu.php
	settings/l10n/fa.php
	settings/l10n/gl.php
	settings/l10n/he.php
	settings/l10n/hi.php
	settings/l10n/ko.php
	settings/l10n/si_LK.php
	settings/l10n/sk_SK.php
	settings/l10n/sl.php
	settings/l10n/sr.php
	settings/l10n/ta_LK.php
	settings/l10n/th_TH.php
	settings/l10n/tr.php
	settings/l10n/uk.php
	settings/l10n/vi.php
	settings/l10n/zh_CN.php
	settings/l10n/zh_TW.php
	settings/templates/help.php
2013-01-02 17:14:23 +00:00
Robin Appelman 54f6f1e6b7 phpdoc fixes for public api 2013-01-02 16:38:20 +01:00
Thomas Mueller 2d36a20a1d moving storage calculation code to OC_Helper::getStorageInfo() 2013-01-02 14:35:45 +01:00
Robin Appelman a164fd160f Cache: provide path hints to getCache/etc where available 2013-01-01 20:20:20 +01:00
Robin Appelman 04f83e3b53 Cache: optional path argument for getCache/Scanner/etc 2013-01-01 20:20:20 +01:00
Michael Gapczynski f4e4a06826 Forgot to select storage from filecache 2013-01-01 12:17:54 -05:00
Robin Appelman b41189de44 Cache: allow storage backends to overwrite Watcher 2013-01-01 18:04:29 +01:00
Michael Gapczynski f2ca7023e1 Fix Shared root problems with Watcher and Quota proxy 2013-01-01 11:19:33 -05:00
Michael Gapczynski d0a50fae83 Fix eTagUpdate and add tests 2012-12-31 18:16:44 -05:00
Tom Needham 8a5f583cac Remove WIP OAuth code 2012-12-31 16:19:46 +00:00
Tom Needham 9626d9ce31 Code cleanup and add copyright info 2012-12-31 16:08:21 +00:00
Tom Needham 6eb194b702 Merge branch 'master' into ocs_api
Conflicts:
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot
2012-12-31 15:47:15 +00:00
Tom Needham 218a5ea890 Remove unused methods 2012-12-31 14:16:29 +00:00
Michael Gapczynski aea8b0ff5c Merge branch 'filesystem' into filesystem-etags
Conflicts:
	lib/files/cache/updater.php
2012-12-30 21:26:48 -05:00
Michael Gapczynski 96e08a1d96 Fix function name 2012-12-30 21:23:17 -05:00
Michael Gapczynski 3ee3323b87 Fix retrieving of cache and scanner in Updater class 2012-12-30 20:27:38 -05:00
Michael Gapczynski 77f12c526b Update etags in parent folders 2012-12-30 19:54:51 -05:00
Michael Gapczynski 83064aca51 Remove old etag code 2012-12-30 19:23:31 -05:00
Michael Gapczynski a5cb7363a5 Use etags from file cache in SabreDAV connector 2012-12-30 19:18:05 -05:00
Jenkins for ownCloud 329bddab48 [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00
Michael Gapczynski 2c23e143d3 Store etags in the file cache 2012-12-30 16:32:55 -05:00
Jenkins for ownCloud 66e57f5fb1 [tx-robot] updated from transifex 2012-12-30 00:05:52 +01:00
Michael Gapczynski 7980bccaab Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826 2012-12-29 19:30:31 +00:00
Michael Gapczynski cfc3526b25 Fix data for shared root folder 2012-12-29 11:45:13 -05:00
Michael Gapczynski 8bdfb04056 Fix shared folders 2012-12-28 15:06:12 -05:00
Jenkins for ownCloud e9c51b319e [tx-robot] updated from transifex 2012-12-28 00:20:34 +01:00
Michael Gapczynski b035626709 Retrieve storage correctly, filename is not the mountpoint 2012-12-27 16:53:32 -05:00
Michael Gapczynski 65f1e52107 Change old is_readable to isReadable, fixes downloads 2012-12-27 15:49:48 -05:00
Jenkins for ownCloud 27f9ea2abb [tx-robot] updated from transifex 2012-12-27 00:05:17 +01:00
Michael Gapczynski 1910057900 Fix shared statuses inside folders 2012-12-26 16:20:10 -05:00
Michael Gapczynski b4515d874e Only folders have Create permission 2012-12-26 15:36:50 -05:00
Robin Appelman 7e36f730ec merge master into filesystem 2012-12-25 14:29:29 +01:00
Jenkins for ownCloud 7d52c39419 [tx-robot] updated from transifex 2012-12-24 00:12:16 +01:00
Frank Karlitschek 15da11effe Merge pull request #845 from owncloud/sqlite_error
Try to fix #836
2012-12-22 15:22:09 -08:00
Thomas Müller 986f5d9f3e fixing variable name 2012-12-21 00:04:58 +01:00
Thomas Müller 39d874cd90 the maximum upload size is now part of the response of the upload and delete operation.
the maximum upload size is updated within the browser once an upload or delete operation has been finished
2012-12-20 17:16:53 +01:00
irgsmirx 1e3231c732 Update lib/util.php
getUrlContent should take proxy setting into consideration when not using curl, as well
2012-12-20 12:01:11 +01:00
Thomas Müller 7d811e57e6 setting the timezone is now part of the login process and true part of the core. 2012-12-20 11:10:45 +01:00
root a64a923d56 call it "proxy" instead of "curlproxy"
Thanks Bart for the hint.
This also switches "==" to "<>" and not the code actually works ;-)
2012-12-19 18:50:19 +01:00
Frank Karlitschek f012135992 make it more readable as deepdiver suggested 2012-12-19 18:50:19 +01:00
Frank Karlitschek 019da9943a add curl proxy support. Fixes #504
https://github.com/owncloud/core/issues/504
2012-12-19 18:50:19 +01:00
Frank Karlitschek b162e72f94 Merge pull request #961 from owncloud/check_locale
add a check and a warning if setlocale is working
2012-12-19 08:53:43 -08:00
Frank Karlitschek d7fbe47583 Merge pull request #868 from owncloud/new_doc_system
New doc system
2012-12-19 06:40:37 -08:00
Frank Karlitschek 196f1c3786 add a check and a warning if setlocale is working 2012-12-19 15:10:33 +01:00
Thomas Mueller 186147d1ee refs #933 send content length header - this will allow the browser to show the progressbar 2012-12-19 11:22:01 +01:00
Randolph Carter d2828bab07 fixes default email sender address 2012-12-19 01:09:14 +01:00
Jenkins for ownCloud a4b0df419e [tx-robot] updated from transifex 2012-12-18 00:14:58 +01:00
Jörn Friedrich Dreyer b6eb95349e fix utf8 filenames in ie download response header according to rfc5987, see http://stackoverflow.com/questions/93551/how-to-encode-the-filename-parameter-of-content-disposition-header-in-http 2012-12-17 16:46:07 +01:00
Michael Gapczynski 39eebebd99 Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826 2012-12-16 19:43:32 -05:00
Tom Needham 3c98f36121 Merge branch 'master' into ocs_api 2012-12-16 22:29:00 +00:00
Robin Appelman 4301cd7f61 wrap hooks into a try, catch to prevent a faulty app from crashing the request 2012-12-16 20:29:36 +01:00
Michael Gapczynski bf05ff351f Initial support for file sharing with filesystem branch 2012-12-15 19:44:59 -05:00
Robin Appelman b12abb2c94 use numeric ids for storages in the filecache 2012-12-15 23:35:07 +01:00
Michael Gapczynski 8951769cae Check sub storage isn't null or false 2012-12-15 17:16:26 -05:00
Tom Needham 39b5199775 API: PUT and DELETE variables are now accessed from the parameters array 2012-12-15 12:37:44 +00:00
Robin Appelman cf3665057c make sure folders that are not fully scanned are at least shallow scanned when we open them
the fact that they are in the cache does not mean they are scanned
2012-12-15 03:21:39 +01:00
Robin Appelman 4be039e6cb Filecache Watcher: use scan or scanFile based on the current item, not the cached item 2012-12-15 03:10:56 +01:00
Robin Appelman bc52f12162 dont insert and entry in the filecache during upgrade if the id already exists in the filecache
most likely the result from an incompelte upgrade
2012-12-15 02:29:34 +01:00
Robin Appelman c6a5ce54a7 these functions should be static 2012-12-15 02:22:09 +01:00
Robin Appelman 946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Bart Visscher df7d6cb26c More style fixes 2012-12-15 00:43:46 +01:00
Bart Visscher 68562dafb4 More whitespace fixes 2012-12-15 00:43:46 +01:00
Bart Visscher 2ef2dc4dda Fix "There must be a single space between the closing parenthesis and the opening brace" 2012-12-15 00:43:46 +01:00
Bart Visscher 85bd28c508 Fix some of "Closing brace must be on a line by itself" 2012-12-15 00:43:46 +01:00
Bart Visscher f39454ed12 Fix "Line indented incorrectly" 2012-12-15 00:43:46 +01:00
Bart Visscher 8256650da8 Fix "No space found after comma in function call" 2012-12-15 00:43:46 +01:00