Commit Graph

384 Commits

Author SHA1 Message Date
icewind1991 d7dde3cfbc Merge pull request #4467 from owncloud/storage-wrapper-quota
Move quota logic from filesystem proxy to storage wrapper
2013-08-19 03:38:55 -07:00
Robin Appelman d8c71ba734 merge master in storage-wrapper-quota 2013-08-18 11:34:56 +02:00
Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again
Conflicts:
	apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
Markus Goetz 3972198b61 Cache OC_Util::checkServer() result in session
The return value almost never changes but this function
is called for every request.
2013-08-15 11:58:09 +02:00
Bjoern Schiessle 53bb89824d check if some encrypted files are left after the app was disabled and warn the user 2013-08-12 17:25:27 +02:00
Thomas Müller f658852276 Merge branch 'master' into fixing-testGetById-master 2013-07-30 00:37:05 +02:00
Thomas Müller 085fdfec2f adding unit tests for OC_Util::basename 2013-07-29 23:32:03 +02:00
Thomas Mueller e2d3225e5a implement a platform independent version of basename 2013-07-29 18:24:05 +02:00
kondou 8cd671c207 Also clean PHP 5.5 opcache 2013-07-28 16:33:03 +02:00
Robin Appelman e2f04b3b42 use storage wrapper for quota instead of a filesystem proxy 2013-07-25 16:01:37 +02:00
Bart Visscher 7d86e262e1 Use autoloader for Patchwork/PHP/Shim/Normalizer 2013-07-16 22:32:04 +02:00
Victor Dubiniuk 5a3fce12a4 Implement encodePath 2013-07-09 17:46:11 +03:00
Björn Schießle 9b9ea7cd8e Merge https://github.com/owncloud/core/pull/3827
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
2013-07-08 10:07:57 +02:00
Björn Schießle 3c1308fb6d eddition string should be empty by default 2013-07-04 10:12:07 +02:00
Björn Schießle 3c691c9ec9 move to non-static OC_Defaults
Conflicts:

	lib/mail.php
2013-07-04 10:11:16 +02:00
Björn Schießle 8406d3f7b1 also use the default theme if the theme is set to an empty string in the config.php 2013-06-19 11:58:29 +02:00
Thomas Mueller c8564c0795 Merge branch 'master' into move-maint-start
Conflicts:
	lib/util.php
2013-06-14 10:06:13 +02:00
Robin Appelman 251527c6e6 merge master into backgroundjob 2013-06-02 20:12:44 +02:00
Thomas Müller 1b3c9fe5ae Merge pull request #3454 from owncloud/fix_hasInternetConnection
isinternetconnectionworking should return false if OC_Config::getValue("has_internet_connection") is false
2013-05-31 17:05:45 -07:00
Thomas Mueller dd4a07321a fix method naming 2013-05-31 23:24:09 +02:00
icewind1991 94a6622bcd Merge pull request #3459 from owncloud/fix_for_2377
fix problems with german "Umlaut" in folder name
2013-05-31 14:00:02 -07:00
Robin Appelman 44f9af5a7f Use the new session wrapper 2013-05-28 01:04:09 +02:00
Georg Ehrke 557cc4c1ab make method names camelCase 2013-05-27 19:24:31 +02:00
Georg Ehrke d69b7e24d2 update comment 2013-05-27 19:20:29 +02:00
Georg Ehrke 58c9175a56 move check if internet connection is disabled on purpose to a dedicated method 2013-05-27 19:19:17 +02:00
Florin Peter adcafbde34 Merge branch 'master' into fix_for_2377 2013-05-25 20:37:28 +02:00
Michael Gapczynski 2893bb9543 Bump version for files_encryption changes 2013-05-25 11:42:28 -04:00
Michael Gapczynski 0a29d2029a Clear opcode caches after writing to the config file, fixes #3372 2013-05-25 11:25:43 -04:00
Florin Peter f6bf9de6de prevent for returning while false normalize string 2013-05-25 14:54:36 +02:00
Florin Peter 661b5501b0 added normalizeUnicode() method to OC_Util 2013-05-24 20:35:01 +02:00
Jörn Friedrich Dreyer 1b68c0c0cd allow install when only oracle is available 2013-05-22 13:56:57 +02:00
Georg Ehrke efb2e69230 fix return value of OC_Util::isinternetconnectionworking() 2013-05-22 12:21:11 +02:00
Robin Appelman 81fd1badc3 merge master into filecache_mtime 2013-05-21 23:35:19 +02:00
Florin Peter 03d8907df8 fix for tearDownFS, after filesystem::tearDown() the root is not mounted 2013-05-07 22:26:16 +02:00
Bart Visscher 398fbb61f8 Merge pull request #2813 from owncloud/improve-lib-check
added correct check for gd and check for php-intl
2013-05-07 06:12:40 -07:00
Morris Jobke 2b9da8a6c9 remove hard php-intl requirement 2013-05-07 13:51:30 +02:00
Morris Jobke 0e5eccbdbc Merge pull request #3146 from owncloud/restart-hint
web_server_restart needs to be true to display the hint
2013-04-27 08:19:08 -07:00
Morris Jobke 86455d6ac3 Merge pull request #3145 from owncloud/magic_quotes_gpc-check
Add check for Magic Quotes
2013-04-27 08:14:40 -07:00
Bart Visscher 7db5ec30c3 Add check for Magic Quotes 2013-04-26 16:32:58 +02:00
Bart Visscher f5b0d904fb web_server_restart needs to be true to display the hint 2013-04-26 16:21:56 +02:00
Robin Appelman 809b5f81f6 Further seperation of mount management logic 2013-04-26 00:01:36 +02:00
Bernhard Posselt a8075943c3 use variable instead of relative path to file 2013-04-24 14:17:52 +02:00
Bernhard Posselt b98b56e4a8 check if there is a default/ folder in the theme directory if no theme exists 2013-04-24 13:45:40 +02:00
Robin Appelman db0ea9780b Add database table for backgroundjob 2013-04-21 00:04:58 +02:00
Bart Visscher 7ac49dd52a Cleaner isWebDAVWorking reason, otherwise people overlook the reason 2013-04-19 12:44:54 +02:00
Thomas Tanghus 44668b36a7 Remove not null constraint. Fix #2976 2013-04-17 14:08:45 +02:00
Bernhard Posselt 16b513e4dc added correct check for gd and check for php-intl 2013-04-09 12:22:55 +02:00
Thomas Mueller 46722d8282 fixes #2789 - no internet connectivity check if there is non on purpose 2013-04-08 22:41:20 +02:00
Birk Borkason d6253696cb Fix indentation in util.php. 2013-04-05 21:49:57 +03:00
Lukas Reschke 877ff9358f Don't expose the server installation time 2013-04-04 01:33:18 +03:00