Commit Graph

380 Commits

Author SHA1 Message Date
Thomas Tanghus 935d2169c8 Revert "Add indexes and primary keys."
This reverts commit 3b33712dc9.
2013-03-19 01:36:51 +01:00
Thomas Tanghus 3b33712dc9 Add indexes and primary keys. 2013-03-19 01:35:12 +01:00
Frank Karlitschek e6c2a91781 this is now 6.0 pre alpha 2013-03-09 20:19:34 +01:00
Frank Karlitschek 256595e7b2 5.0.0 2013-03-09 18:51:02 +01:00
Arthur Schiwon 988a67fc9a remove remaining br-tags that do not belong here 2013-03-09 13:45:37 +01:00
Michael Gapczynski d7beac6d6f Merge branch 'master' into filecache_mtime
Conflicts:
	lib/files/view.php
	lib/util.php
	tests/lib/files/cache/cache.php
2013-03-08 15:28:45 -05:00
Frank Karlitschek f9c24a0368 5.0.0 RC3 2013-03-08 10:01:22 +01:00
Arthur Schiwon 47d176ae69 Remove <br> from error messages, because they will be escaped and the used template has it's own <br> already 2013-03-07 17:28:28 +01:00
Frank Karlitschek 2b7ff7273d ownCloud 5 RC2 2013-03-02 04:06:27 +01:00
Lukas Reschke 3e3c039292 Escape the data only in the template 2013-03-02 20:21:51 +01:00
Thomas Mueller 39b9ed50d7 for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified. 2013-03-01 20:34:16 +01:00
Frank Karlitschek f7cb53b103 Merge pull request #2008 from owncloud/1999-requesttoken
Check if requesttoken exists in session
2013-03-01 06:12:09 -08:00
Lukas Reschke 93f15215c6 Check if requesttoken exists in session
Ref #1999
2013-03-01 14:59:51 +01:00
Lukas Reschke 630becb95f Style fixes 2013-03-01 14:59:24 +01:00
Frank Karlitschek 09dc15d2b1 5.0 RC 1 2013-03-01 07:53:14 +01:00
Bernhard Posselt 59835a9087 add checks for xml and dom when installing 2013-02-28 15:13:18 +01:00
Bart Visscher 4a26d63867 Fix using wrong quotes for breaking long lines
Fixes #1925
2013-02-26 20:48:01 +01:00
Lukas Reschke a2a1e8c2cb Merge pull request #1839 from owncloud/no_recursive_object_walking
Don't walk objects with array_walk_recursive()
2013-02-25 12:53:23 -08:00
Frank Karlitschek a533bb6dcd 5 beta 2 2013-02-25 20:00:40 +01:00
Bernhard Posselt 946a064fc6 Merge pull request #1891 from owncloud/set_timeout
use a 5 sec timeout for the webdav check
2013-02-25 08:27:20 -08:00
Frank Karlitschek 3009b43e3d use a 5 sec timeout for the webdav check 2013-02-25 16:30:11 +01:00
Thomas Mueller ebcb778a99 remove the check for session data folder - causes trouble on some environments
let's try to find another solution for =C6
2013-02-25 10:12:47 +01:00
Thomas Tanghus efe33c508e Don't walk objects with array_walk_recursive() 2013-02-22 00:51:54 +01:00
Bart Visscher 88bea55f97 Update hint by the internal version number.
So we don't repeat the 4.5 <=> 4.90 mixup
2013-02-21 21:30:25 +01:00
Frank Karlitschek c5e0dda887 add a safe_mode check 2013-02-21 11:09:00 +01:00
Thomas Mueller 7b7994b56b WebDAV-Testing:
- write the exception to the log
- in case curl is missing we should return true as well
2013-02-20 23:11:38 +01:00
Frank Karlitschek 59fd9b2bd2 5.0.0 beta 1 2013-02-20 19:09:58 +01:00
Robin Appelman 2ed850e05b merge master into filecache_mtime 2013-02-15 21:04:48 +01:00
Bart Visscher ffae6f4b84 Style-fix: Breakup long lines 2013-02-14 08:38:37 +01:00
Bart Visscher 2d6d0a4ad4 Whitespace indent fixes 2013-02-14 08:36:26 +01:00
Bart Visscher cd35d257bb Fix NoSpaceAfterComma and SpaceBeforeComma 2013-02-14 08:36:26 +01:00
Bart Visscher 5c4a804ddb Fix SpaceBeforeOpenBrace errors 2013-02-14 08:36:26 +01:00
Robin Appelman 9c1196d73e Cache: add seccond mtime field 2013-02-10 12:05:41 +01:00
Thomas Müller e68cf72458 Merge pull request #1543 from owncloud/utf8-locale-master
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-09 09:58:05 -08:00
Frank Karlitschek 5a0a9564ce alpha 1 2013-02-09 17:13:43 +01:00
Michael Gapczynski eeb409a6ec Merge branch 'master' into fix-shared-links 2013-02-10 19:10:06 -05:00
Michael Gapczynski 8e3b8c7f47 Proper fix for shared links 2013-02-10 19:09:58 -05:00
Robin Appelman 3292dc3eea Cache: allow file sizes >2GB 2013-02-10 16:44:00 +01:00
Thomas Müller 279cbeb001 Merge pull request #1481 from owncloud/fixing-1354-master
basic WebDAV test in place now
2013-02-09 05:13:33 -08:00
Thomas Müller 232a98524c some systems use en_US.UTF8 instead of en_US.UTF-8 2013-02-08 17:49:54 +01:00
Thomas Müller ea42014ba4 in case curl is not present we cannot test 2013-02-08 15:23:26 +01:00
Thomas Müller 0efcf33e2f Merge pull request #1451 from eMerzh/fix_1065
Add Redirect to getUrlContent fix #1065
2013-02-07 06:27:58 -08:00
Thomas Mueller 5788d36c8d Merge branch 'master' into fixing-1354-master
Conflicts:
	settings/admin.php
	settings/templates/admin.php
2013-02-07 10:44:28 +01:00
Lukas Reschke e969a78cf9 Merge pull request #1443 from owncloud/use-module-file-info-master
we get best results regarding mime type detection if we use fileinfo - l...
2013-02-06 11:53:13 -08:00
Thomas Müller efdaea4557 Merge pull request #1357 from owncloud/alternative-loging-master
add support for apps to register alternative login methods
2013-02-06 06:49:58 -08:00
Thomas Mueller 1adcc5fd23 basic WebDAV test in place now 2013-02-05 23:33:44 +01:00
Thomas Mueller ac11c842e6 setlocale test is pointless on Windows 2013-02-05 15:46:55 +01:00
Thomas Mueller d8084c132e new function \OC_Util::runningOnWindows() 2013-02-05 15:43:12 +01:00
Brice Maron c5079a63a8 Add Redirect to getUrlContent fix #1065 2013-02-04 23:38:10 +01:00
Thomas Müller a7e62b0366 Merge pull request #1444 from owncloud/writable-temp-folder-for-session-data-master
in case file based session handling in enabled - we need to make sure th...
2013-02-04 11:11:15 -08:00
Thomas Mueller 0a113600f7 in case file based session handling in enabled - we need to make sure the configured folder is writable 2013-02-04 15:32:01 +01:00
Thomas Mueller 6058c2f734 we get best results regarding mime type detection if we use fileinfo - let's tell the admin about that 2013-02-04 15:04:26 +01:00
Thomas Müller b20529ee44 Merge pull request #1171 from owncloud/move-datadirectory-checks
Move data directory permission checks after data directory existence checks
2013-01-31 14:54:46 -08:00
Stefan Herbrechtsmeier ab2b79cda6 add multiple domains reverse proxy support
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).

As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
2013-01-31 18:42:31 +01:00
Robin Appelman 6043789394 Bumb version number for displayname db upgrade 2013-01-30 19:37:02 +01:00
Robin Appelman 207aa22d12 merge master into filesystem 2013-01-30 19:24:24 +01:00
Björn Schießle 007bddceba version dump to trigger db update 2013-01-29 21:04:28 +01:00
Thomas Mueller 825cdf8560 add support for apps to register alternative login methods
below the standard login a list of icons/button will be displayed
2013-01-29 17:28:08 +01:00
Robin Appelman 8ede3290ae Cache: add database indexes for mimetype and mimepart 2013-01-21 22:31:44 +01:00
Michael Gapczynski 9e28f924c2 Merge branch 'master' into move-datadirectory-checks 2013-01-18 23:31:06 -05:00
Michael Gapczynski da34e58589 Move permissions check to new function checkDataDirectoryPermissions() 2013-01-18 23:30:56 -05:00
Robin Appelman 9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Lukas Reschke ab287d2ba4 Move { to same line 2013-01-14 22:04:31 +01:00
Lukas Reschke c845e75693 Expand if to multiple lines
Oneliners are ugly.
2013-01-14 22:01:52 +01:00
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
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
Michael Gapczynski ebcf41b420 Move data directory permission checks after data directory existence checks 2013-01-12 23:35:13 -05:00
Michael Gapczynski a00b9e0a03 Bump version 2013-01-11 21:01:28 -05: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
Robin Appelman d0377b1951 Cache: normalize mimetypes 2013-01-07 02:09:21 +01:00
Robin Appelman e40be93e87 merge master into filesystem 2013-01-03 15:59:17 +01:00
Thomas Mueller 34e5cb5070 fixing indent 2013-01-03 00:13:30 +01:00
Michael Gapczynski 8bdfb04056 Fix shared folders 2012-12-28 15:06:12 -05:00
Robin Appelman 7e36f730ec merge master into filesystem 2012-12-25 14:29:29 +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
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
Robin Appelman b12abb2c94 use numeric ids for storages in the filecache 2012-12-15 23:35:07 +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 f39454ed12 Fix "Line indented incorrectly" 2012-12-15 00:43:46 +01:00
Frank Karlitschek 79b8d67627 remove PgeNavi. It's no longer used 2012-12-13 19:26:05 +01:00
Robin Appelman 7969d6e646 Merge branch 'master' into filesystem 2012-12-11 23:57:59 +01:00
Bart Visscher 1e062ea895 Merge pull request #182 from owncloud/fix-redirect
Make the redirect_url working again
2012-12-07 03:09:19 -08:00
Bart Visscher 271b8384e7 Fix warning about redirect_url not set 2012-12-07 12:07:56 +01:00
Robin Appelman d33f697a5f merge master into filesystem 2012-11-30 00:18:42 +01:00
Robin Appelman 59d5aa2cb7 add function to safely end output buffering 2012-11-29 17:58:24 +01:00
Michael Gapczynski b76d1afe19 Create public function initMountPoints() for initializing a specified user's mount points 2012-11-22 00:44:48 -05:00
Michael Gapczynski 77fdb16b7c Remove incorrect extra parameter for init() call 2012-11-22 00:23:11 -05:00
Robin Appelman 97380f3485 merge master into filesystem 2012-11-21 22:37:14 +01:00
Jörn Friedrich Dreyer d8a171df26 implement share via link token 2012-11-20 15:03:12 +01:00
Brice Maron 8fa7d6a48a Fix typo in getUrlContent fix #514 2012-11-19 17:13:07 +00:00
Robin Appelman a922eb756e merge master into filesystem 2012-11-18 14:07:52 +01:00
Brice Maron 4337e0fb99 Little case fix 2012-11-17 22:12:24 +00:00
Brice Maron 71adad8817 Add User agent when OC does a request 2012-11-17 21:08:58 +00:00
Thomas Müller ac3e962732 Merge pull request #375 from tdevos/master
Use curl to get remote file content
2012-11-17 12:31:25 -08:00