summaryrefslogtreecommitdiffstats
path: root/lib/util.php
Commit message (Collapse)AuthorAgeFilesLines
* move the private namespace OC into lib/private - OCP will stay in lib/publicThomas Müller2013-09-301-1019/+0
| | | | | Conflicts: lib/private/vcategories.php
* Merge pull request #5012 from owncloud/check_keyfiles_existsMorris Jobke2013-09-301-8/+12
|\ | | | | check not only if the keyfile folder exists but also if it contains keyfiles
| * check not only if the keyfile folder exists but also if it contains keyfilesBjoern Schiessle2013-09-271-8/+12
| |
* | cURL does not honour default_socket_timeoutEvgeni Golov2013-09-301-9/+0
|/ | | | | | | | | | | | | SabreDAV uses cURL for the requests and as this does not honour default_socket_timeout, setting it is useless and confusing as people will expect the request to timeout faster than it actually will do. One has to use curl_setopt($curl, CURLOPT_TIMEOUT, x) or curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, x) but there is currently no way to make SabreDAV pass this to cURL.
* no further comment - which dev did not test this BEFORE submitting the pull ↵Thomas Müller2013-09-111-3/+3
| | | | | | request? which reviewer did not test the pull request?
* Merge branch 'master' into clean_up_utilkondou2013-09-021-1/+1
|\ | | | | | | | | Conflicts: lib/base.php
| * Merge branch 'master' into oc_previewGeorg Ehrke2013-08-231-2/+22
| |\
| * \ Merge master into oc_previewGeorg Ehrke2013-08-191-0/+24
| |\ \
| * | | update indexes of oc_permissionsGeorg Ehrke2013-08-091-1/+1
| | | |
| * | | allow permissions.user to be null as suggested by @butonicGeorg Ehrke2013-08-071-1/+1
| | | |
* | | | Fix some phpdoc and camelcasekondou2013-08-231-15/+17
| | | |
* | | | fixing typosThomas Müller2013-08-221-9/+10
| | | |
* | | | Merge branch 'master' into clean_up_utilkondou2013-08-201-2/+39
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: lib/util.php
| * | | Merge pull request #4467 from owncloud/storage-wrapper-quotaicewind19912013-08-191-2/+22
| |\ \ \ | | |_|/ | |/| | Move quota logic from filesystem proxy to storage wrapper
| | * | merge master in storage-wrapper-quotaRobin Appelman2013-08-181-0/+18
| | |\ \
| | * | | use storage wrapper for quota instead of a filesystem proxyRobin Appelman2013-07-251-2/+22
| | | | |
| * | | | Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-171-0/+18
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php
| * | | | check if some encrypted files are left after the app was disabled and warn ↵Bjoern Schiessle2013-08-121-0/+17
| | |/ / | |/| | | | | | | | | | the user
* | | | Fix some naming and spacing in lib/util.phpkondou2013-08-181-10/+15
| | | |
* | | | Clean up \OC\Utilkondou2013-08-151-195/+263
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | - Use camelCase - Add some phpdoc - Fix some indents - Use some more spacing
* | | Cache OC_Util::checkServer() result in sessionMarkus Goetz2013-08-151-0/+7
| |/ |/| | | | | | | The return value almost never changes but this function is called for every request.
* | Merge branch 'master' into fixing-testGetById-masterThomas Müller2013-07-301-2/+4
|\ \
| * | Also clean PHP 5.5 opcachekondou2013-07-281-0/+4
| |/
| * Use autoloader for Patchwork/PHP/Shim/NormalizerBart Visscher2013-07-161-2/+0
| |
* | adding unit tests for OC_Util::basenameThomas Müller2013-07-291-0/+1
| |
* | implement a platform independent version of basenameThomas Mueller2013-07-291-0/+6
|/
* Implement encodePathVictor Dubiniuk2013-07-091-1/+16
|
* Merge https://github.com/owncloud/core/pull/3827Björn Schießle2013-07-081-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit eed4b49cebcbcc252a75ed85097730b73213b0da Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 8 10:03:23 2013 +0200 initialize OC_Defaults only once commit bf6f07ccc8fb87535a069ca341789a590cb187ee Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 8 10:02:48 2013 +0200 link to doc in error messages commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2 Merge: e41af3d 3c1308f Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jul 4 11:10:56 2013 +0200 Merge branch 'master' into better-messages commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jul 4 11:10:41 2013 +0200 move to non-static defaults.php commit 9e4258b1905244bdf34943a825421f041cbed43d Author: Björn Schießle <schiessle@owncloud.com> Date: Tue Jul 2 10:32:13 2013 +0200 no sprintf here, lets t() handle it commit fe1df349e248667a137f70d78b04225e5b42a111 Merge: d8f6859 cb5811b Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 1 11:13:38 2013 +0200 Merge branch 'master' into better-messages commit d8f68595df2dc0e0917d916cbde511ec5333010b Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 1 11:10:57 2013 +0200 use document base url from defaults.php commit 6c5403748a45717125a2aa375550f05646317d72 Merge: bea6b1c 7b0e3e6 Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 1 11:00:15 2013 +0200 Merge branch 'master' into better-messages commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee Author: Jan-Christoph Borchardt <hey@jancborchardt.net> Date: Mon Jun 24 16:21:12 2013 +0200 link to docs in WebDAV message, ref #3791 commit 3119b364a1094769e711283d1ce9014505f64ab9 Author: Jan-Christoph Borchardt <hey@jancborchardt.net> Date: Mon Jun 24 16:10:21 2013 +0200 link to docs in error messages, fix #3819
* eddition string should be empty by defaultBjörn Schießle2013-07-041-1/+1
|
* move to non-static OC_DefaultsBjörn Schießle2013-07-041-1/+1
| | | | | | Conflicts: lib/mail.php
* also use the default theme if the theme is set to an empty string in the ↵Björn Schießle2013-06-191-2/+2
| | | | config.php
* Merge branch 'master' into move-maint-startThomas Mueller2013-06-141-14/+41
|\ | | | | | | | | Conflicts: lib/util.php
| * merge master into backgroundjobRobin Appelman2013-06-021-28/+82
| |\
| | * Merge pull request #3454 from owncloud/fix_hasInternetConnectionThomas Müller2013-05-311-5/+11
| | |\ | | | | | | | | isinternetconnectionworking should return false if OC_Config::getValue("has_internet_connection") is false
| | | * fix method namingThomas Mueller2013-05-311-3/+3
| | | |
| | | * make method names camelCaseGeorg Ehrke2013-05-271-3/+3
| | | |
| | | * update commentGeorg Ehrke2013-05-271-1/+1
| | | |
| | | * move check if internet connection is disabled on purpose to a dedicated methodGeorg Ehrke2013-05-271-2/+8
| | | |
| | | * fix return value of OC_Util::isinternetconnectionworking()Georg Ehrke2013-05-221-1/+1
| | | |
| | * | Merge pull request #3459 from owncloud/fix_for_2377icewind19912013-05-311-0/+19
| | |\ \ | | | | | | | | | | fix problems with german "Umlaut" in folder name
| | | * \ Merge branch 'master' into fix_for_2377Florin Peter2013-05-251-1/+1
| | | |\ \
| | | * | | prevent for returning while false normalize stringFlorin Peter2013-05-251-1/+6
| | | | | |
| | | * | | added normalizeUnicode() method to OC_UtilFlorin Peter2013-05-241-0/+14
| | | | | |
| | * | | | Use the new session wrapperRobin Appelman2013-05-281-7/+7
| | | |/ / | | |/| |
| | * | | Bump version for files_encryption changesMichael Gapczynski2013-05-251-1/+1
| | |/ /
| | * / allow install when only oracle is availableJörn Friedrich Dreyer2013-05-221-1/+2
| | |/
| | * merge master into filecache_mtimeRobin Appelman2013-05-211-34/+71
| | |\
| | * \ Merge branch 'master' into filecache_mtimeMichael Gapczynski2013-03-081-44/+61
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/files/view.php lib/util.php tests/lib/files/cache/cache.php
| | * \ \ merge master into filecache_mtimeRobin Appelman2013-02-151-39/+73
| | |\ \ \
| | * | | | Cache: add seccond mtime fieldRobin Appelman2013-02-101-1/+1
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 05:25:13 +0000