Commit Graph

883 Commits

Author SHA1 Message Date
Frank Karlitschek 0b4607321f Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-03-01 15:21:12 +01:00
Frank Karlitschek d29a02a65a undo the change of the webroot detection. seams to be buggy 2012-03-01 15:19:44 +01:00
Robin Appelman e76e4e7540 add touch() to all storage backands, and make parameter optional 2012-02-29 23:44:05 +01:00
Robin Appelman b23b5aae7f remove debug output 2012-02-29 23:17:49 +01:00
Michael Gapczynski baffa03fa5 Fix opendir for folders aka Google Docs collections 2012-02-29 13:18:33 -05:00
Michael Gapczynski 02f15e9a03 More work on Google Docs storage backend 2012-02-28 19:16:52 -05:00
Bartek Przybylski 2754cac21f dialogs library for apps 2012-02-28 23:02:30 +01:00
Frank Karlitschek 0a9b0ee382 change the detection of the webroot. it is simpler now and also works for app directories outside the owncloud folder. works for me and hopefully for everybody else too 2012-02-28 18:21:23 +01:00
Robin Appelman a829ce69c5 make sure the streamwrappers are registered early 2012-02-28 17:25:15 +01:00
Frank Karlitschek 5e9d268c21 never try to load an non existing template,css,img.
do propper checking, error reporting and motivate the developerto fix it ;-)
2012-02-28 16:14:12 +01:00
Robin Appelman d1c3aa3112 add test case for getLocalFile 2012-02-28 12:06:34 +01:00
Robin Appelman de37bafa5c use in-memory files for the datase scheme during installation 2012-02-28 11:39:39 +01:00
Robin Appelman 3e0bb3e7c4 use temporary file managment 2012-02-28 11:33:59 +01:00
Robin Appelman a76ff563d6 fix temporary file creation 2012-02-28 11:32:45 +01:00
Robin Appelman 273d7fb4fd fix copy/paste error in common filestorage 2012-02-28 11:16:41 +01:00
Robin Appelman 77b51f03e3 add temporary file managment 2012-02-28 11:16:19 +01:00
Michael Gapczynski d190ebee48 Initial work on Google Docs storage backend 2012-02-27 15:00:17 -05:00
Frank Karlitschek 5943af17e7 spaces -> tabs
Thanks to Jakob for reminding me
2012-02-27 18:01:43 +01:00
Robin Appelman d8d4420f22 some cleanup in filestorage 2012-02-27 12:20:37 +01:00
Robin Appelman cef230c141 extend filestorage common and provide test implementation 2012-02-27 12:04:42 +01:00
Robin Appelman e2721fc93c make OC_FileStorage abstract 2012-02-27 11:28:11 +01:00
Frank Karlitschek ab96fa67c8 first part of the abstraction work of the apps folder. more to come 2012-02-26 18:26:41 +01:00
Robin Appelman 857535403c add more valid fopen modes 2012-02-26 15:32:58 +01:00
Robin Appelman d4d09b06f8 merge master into encryption 2012-02-26 14:21:06 +01:00
Robin Appelman 62cd89da14 improved password hashing based one phpass
old passwords are automatically upgraded on login
2012-02-26 14:12:50 +01:00
Georg Ehrke 92c7b2717d add OC_Geo class 2012-02-26 13:45:20 +01:00
Robin Appelman 6c501f90bb hopefully a fix for webroot detection 2012-02-26 04:09:48 +01:00
Robin Appelman c8c3b8a63e chunked implementation for readfile
prevents memory issues when downloading large files
2012-02-26 03:54:21 +01:00
Robin Appelman fe0832746b intval() of a number seems unnecessary
and it could cause 32bit integer overflow issues
2012-02-26 03:31:04 +01:00
Robin Appelman 797e921b9a improve log browsing 2012-02-26 03:10:29 +01:00
Robin Appelman 4f627c428e some more error reporting during filesystem scan 2012-02-25 20:27:16 +01:00
Robin Appelman dda79a90cf don't limit ourselfs to 32bit integers 2012-02-25 16:51:59 +01:00
Robin Appelman ea8f71a19c Merge branch 'master' into encryption 2012-02-25 16:36:58 +01:00
Robin Appelman 8b93a9a237 add javascript bindings for OC_AppConfig 2012-02-25 16:35:40 +01:00
Robin Appelman 9dcf29ff51 fix bug in group mangement 2012-02-24 23:54:38 +01:00
Robin Appelman 9f5bce81b0 add a default user quota 2012-02-24 23:54:38 +01:00
Robin Appelman e039015ca1 prevent errors when a user backends gives an invalid result 2012-02-24 23:54:38 +01:00
Arthur Schiwon ca874a3ad7 remove limit from configvalue for long config values 2012-02-24 14:18:09 +01:00
Bartek Przybylski a02d5d1a3d log typo fix 2012-02-23 19:29:11 +01:00
Georg Ehrke 3e756407a0 check if the tempfile was created successfully 2012-02-23 18:23:09 +01:00
Frank Karlitschek a62e109e8c make the location of the 3rdparty folder flexible.
It´s automatically search in the owncloud folder and in the parent folder.
override with an option in config.php is also possible
2012-02-23 15:37:38 +01:00
Robin Appelman 2e05bd69f5 add javascript bindings for OC_AppConfig 2012-02-22 22:20:11 +01:00
Thomas Tanghus 9794e7e427 Fix merge conflict. 2012-02-22 11:20:57 +01:00
Robin Appelman c20319d377 fix incorrect information in the filecache when using encryption 2012-02-21 20:48:49 +01:00
Robin Appelman d9c7e4c333 proper mimetypes for encrypted files 2012-02-21 20:48:48 +01:00
Robin Appelman 325858e9e2 add stream wrapper for in-memory files and dont use global variables for the fakedir stream wrapper 2012-02-21 20:48:48 +01:00
Robin Appelman c121a1a1e7 implement file_put_contents with stream data using fopen 2012-02-21 20:48:48 +01:00
Robin Appelman 95459d068e non existing files can never be updated 2012-02-21 20:48:48 +01:00
Robin Appelman 1cffeefa06 move implementation of from/toTmpFile from the file storage to the filesystem 2012-02-21 20:48:48 +01:00
Robin Appelman 6658f51098 provide early file system when using webdav 2012-02-21 20:48:48 +01:00
Robin Appelman b3a974d8bb only trigger hooks for the default filesystem view 2012-02-21 20:48:48 +01:00
Robin Appelman 501678f981 always mount the root filesystem, sometimes we need the filesystem when not logged in 2012-02-21 20:48:48 +01:00
Robin Appelman f1cbb9effc initial integration of encryption 2012-02-21 20:48:48 +01:00
Robin Appelman e53e7990c4 improve get_temp_dir() implementation 2012-02-21 20:48:48 +01:00
Robin Appelman fd4b30ac6f no post hooks for fopen 2012-02-21 20:48:48 +01:00
Robin Appelman e9af218562 use streams instead of temporary files for cross-storage copy and rename 2012-02-21 20:48:48 +01:00
Robin Appelman 82394f9527 add option to dissable fileproxies 2012-02-21 20:48:47 +01:00
Robin Appelman 3d67cd51c2 encryption proxy wip 2012-02-21 20:48:47 +01:00
Robin Appelman abc749feeb make documentation reflect reality a bit better 2012-02-21 20:48:47 +01:00
Robin Appelman b6ed61eab2 pass paramters to file proxies by reference so they can be modified 2012-02-21 20:48:47 +01:00
Bart Visscher 987845c312 Move the redirect_url from linkTo function to the checkLoggedIn function 2012-02-21 20:09:24 +01:00
Alessandro Cosentino 36b7d819e5 restore redirect after checkLoggedIn 2012-02-21 10:22:17 -05:00
Thomas Tanghus be948a9baa Check for empty value in ctor and being conservative about configvalue name ;-) 2012-02-21 09:53:03 +01:00
Thomas Tanghus 7c7031df44 Forgot to assign param. 2012-02-21 00:02:27 +01:00
Bart Visscher 77ab89a7cb Review changes of OC_VCategory 2012-02-20 22:32:57 +01:00
Thomas Tanghus 430ccef09c Added OC_VCategories::rescan() 2012-02-20 13:16:51 +01:00
Thomas Tanghus 8a1b671fdd Switch from using separate db table to use OC_Preferences.
There is a limitation in that the the configvalue field in the preferences table is a varchar(255).
2012-02-19 17:00:07 +01:00
Thomas Tanghus adec09b075 Merge gitorious.org:owncloud/owncloud into vcategories 2012-02-19 13:11:13 +01:00
Thomas Tanghus 71aa36c3f1 ETags must be quoted. 2012-02-18 11:49:31 +01:00
Thomas Tanghus 0203f55fbf Added first draft of OC_VCategories. 2012-02-18 11:45:36 +01:00
Michael Gapczynski 6f1ed85f0b Temporary fix for sharing files 2012-02-17 21:56:20 -05:00
Bart Visscher 1fa05894d5 Move config.php writable test to update path
This should make it possible to use owncloud with a read-only config.php
2012-02-17 22:10:03 +01:00
Bart Visscher 45cff7b737 Move storing "last updated at" time to the app config
This way the config.php file is not changed every time you go to the
personal page. Step to make it possible to have a read-only config.php
most of the time
2012-02-17 22:10:03 +01:00
Bart Visscher bd7227bb93 Spelling fix hint text 2012-02-17 22:10:02 +01:00
Bart Visscher e8b69d45a3 Fixup use of OC_Helper::linkTo function 2012-02-17 22:07:14 +01:00
Bart Visscher f47444e1f7 Use separate function to make absolute urls 2012-02-17 22:07:14 +01:00
Bart Visscher f54c767d72 Fix parameter of OC_Response::sendFile 2012-02-17 22:07:13 +01:00
Bart Visscher bcbebe390b Document OC_Response 2012-02-17 22:07:13 +01:00
Thomas Tanghus 496c1581d7 ETags must be quoted. 2012-02-16 23:24:23 +01:00
Thomas Tanghus 0e2531ba57 Added method for loading from file handle. 2012-02-16 10:38:00 +01:00
Robin Appelman c2fb5fed02 use cached size for getting the size of a moved file 2012-02-15 14:43:06 +01:00
Frank Karlitschek 127c0c7033 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-02-14 16:34:33 +01:00
Frank Karlitschek d53ed4b40b make it possible to override every image and logo with a new version from within a theme. I think we have a very cool theming here. *self-praise* 2012-02-14 16:32:38 +01:00
Klaas Freitag 064f87680b Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-02-14 10:01:20 +01:00
Klaas Freitag 60a03580ff allow to set a files mtime through a PROPPATCH request on resource
'lastmodified'. Needed for syncing algorithms.
2012-02-14 09:59:54 +01:00
Robin Appelman 3c52ac7af3 make local filestorage comply with test cases 2012-02-14 01:00:41 +01:00
Bart Visscher 525306c1e2 Replace Expires and caching headers by OC_Response functions 2012-02-13 23:48:05 +01:00
Bart Visscher 29fc82c364 Send gallery album thumbnail with OC_Response::sendFile 2012-02-13 23:35:37 +01:00
Bart Visscher 594dcf13f2 Contacts+OC_Respone: Move enableCaching out of setEtagHeader and setLastModifiedHeader 2012-02-13 22:47:31 +01:00
Bart Visscher 0fd5252cfc OC_Image: Move Content-Type header to show function 2012-02-13 22:41:05 +01:00
Bart Visscher 363fdc40b8 OC_Response: Set Expire and Cache-Control headers in enableCaching 2012-02-13 22:37:27 +01:00
Bart Visscher 7208abf618 OC_Response: fix var name bugs 2012-02-13 22:35:48 +01:00
Bart Visscher a25bda8e41 Add application name to title 2012-02-12 21:56:01 +01:00
Bart Visscher 125cf79a37 OC_Response: add setExpiresHeader function 2012-02-12 20:40:52 +01:00
Bart Visscher 45bb6f5fd4 OC_Response: add redirect function 2012-02-12 20:40:52 +01:00
Robin Appelman 3579446930 use SimpleTest for unit testing
includes some tests for storage providers, more to come
2012-02-12 18:07:58 +01:00
Bart Visscher 0917bdecdd Contacts: Move response caching to OC_Response 2012-02-12 17:21:33 +01:00
Bart Visscher 3eff161bbf OC_Image: Use valid function instead of checking the resource 2012-02-12 15:14:24 +01:00
Bart Visscher 192b8906a3 Add copyright to OC_Connector_Sabre_Principal 2012-02-12 15:14:23 +01:00
Michael Gapczynski 6929652e14 Redirect to installer if not installed 2012-02-11 17:37:47 -05:00
Frank Karlitschek 26a5c13906 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-02-11 23:26:42 +01:00
Frank Karlitschek 340b6bf3ad add themeing support and support for autoselection of mobile/tablet and standalone css/jss files and templates 2012-02-11 23:25:35 +01:00
Bart Visscher b5418173e5 Derive the user principles from the owncloud users
The code for updating the principles table is still there. To make it easier to
revert this commit if that is necessary.
2012-02-11 21:09:51 +01:00
Tom Needham 2f80df1f9e Merge branch 'master' of gitorious.org:owncloud/owncloud into migration 2012-02-10 15:24:26 +00:00
Klaas Freitag 85853f9ec2 - Added the ability to change a files mtime via webdavs propset.
- Added some minor debug help to fscache
2012-02-10 11:30:38 +01:00
Bart Visscher 8684e847b0 OC_Image: change static vars to object vars 2012-02-09 22:44:26 +01:00
Robin Appelman b4d84bd9bb dont try to remove buffers, can cause trouble with strict warnings 2012-02-09 19:53:02 +01:00
Robin Appelman c4864b4a54 don't use PDO::inTransaction 2012-02-09 19:53:02 +01:00
Robin Appelman 25381ac5b1 fix filecache with MDB2 2012-02-08 21:39:09 +01:00
Robin Appelman 398fbe7b82 use fetchRow instead of fetch 2012-02-08 21:26:45 +01:00
Bart Visscher eb5de4d4f7 Change gallery thumbnail generation to OC_Image 2012-02-08 21:12:30 +01:00
Robin Appelman 24748ee10f add convinience function to get filesystem view for app storage 2012-02-08 21:01:09 +01:00
Robin Appelman bcebfbfbe2 bugfix in searching files by mimetype 2012-02-08 17:29:54 +01:00
Robin Appelman e50dfbc228 fix filecache when creating a new folder 2012-02-06 19:33:37 +01:00
Robin Appelman 9f3388ecbc store writable flag for files 2012-02-05 14:04:10 +01:00
Robin Appelman 30673e4786 writable not writeable 2012-02-05 14:03:44 +01:00
Robin Appelman 25e777ef5e watch for changes outside owncloud to the files 2012-02-05 03:06:33 +01:00
Robin Appelman 0bb48d814b fix bug in transactions with PDO 2012-02-05 01:23:41 +01:00
Tom Needham 1133eaa679 load bookmarks provider class 2012-02-03 21:28:58 +00:00
Tom Needham ee88ded463 more commenting out for debugging, added logging commands 2012-02-03 21:00:12 +00:00
Tom Needham 0bbc9ade7d fix syntax, add logging, debug xml output instead of zip 2012-02-03 20:48:32 +00:00
Tom Needham 5507db9b15 Initial migration code, and basic export for bookmarks 2012-02-03 20:32:06 +00:00
Robin Appelman 05d76dcd67 allow the usage of the filecache outside of the users home folder 2012-02-02 19:04:13 +01:00
Robin Appelman a69d3c3346 only show what folder we are scanning to save bandwith 2012-02-01 15:25:00 +01:00
Robin Appelman 371b4642bb proper file sorting 2012-01-31 16:33:47 +01:00
Robin Appelman f1c5dce75c dont try to use something that isn't there 2012-01-31 16:33:36 +01:00
Robin Appelman c46f701771 use filesystem cache for searching 2012-01-31 16:12:49 +01:00
Robin Appelman 7ff86cfebe provide live feedback while scanning files 2012-01-31 13:56:58 +01:00
Robin Appelman 803f86e0fc dont try to use the filesystem when it isnt setup yet 2012-01-31 12:44:01 +01:00
Robin Appelman ffecc3e434 start of proper feedback during filessytem scan 2012-01-30 23:32:55 +01:00
Robin Appelman 1191b57b34 Merge branch 'master' into filesystem 2012-01-30 23:20:47 +01:00
Robin Appelman 6a1121ab2e provide server side close option for EventStream 2012-01-30 23:19:58 +01:00
Robin Appelman 4522d19b4c merge master into filesystem 2012-01-30 20:29:33 +01:00
Robin Appelman 45038af948 provide small wrapper around server side events and provide a fallback for IE 2012-01-30 20:21:16 +01:00
Frank Karlitschek 21bf8e99ee increase version number to 3. YeeHaw party!! 2012-01-27 17:39:55 +01:00
Frank Karlitschek 05f1fffddc fix appstore download. 2012-01-27 17:34:47 +01:00
Robin Appelman 500407dbe9 change https detection a bit, hopefully fixing an edge case 2012-01-27 00:37:11 +01:00
Robin Appelman 2f4a289782 fix non-absolute symbolic links 2012-01-27 00:21:15 +01:00
Robin Appelman 935b828427 initialize all storage backends when searching for a file, fixed searching in the Shared folder 2012-01-26 17:56:13 +01:00
Frank Karlitschek 5238a7812c bump version number 2012-01-21 17:33:43 +01:00
Robin Appelman 6866165a37 make oc_image work when php_exif isn't enabled 2012-01-20 17:13:49 +01:00
Robin Appelman 3552626358 Merge branch 'master' into filesystem 2012-01-20 00:48:03 +01:00
Robin Appelman 11c848b221 initial work on filesystemview 2012-01-20 00:48:00 +01:00
Robin Appelman 941f199caf dont complain about non existing config files 2012-01-16 20:17:45 +01:00
Robin Appelman d7ed456f96 forgot to merge something 2012-01-16 14:36:11 +01:00
Robin Appelman 96e2f15d8a merge master into filesystem 2012-01-16 03:06:11 +01:00
Robin Appelman ebe10870cf fix database upgrading for pgsql 2012-01-16 02:06:19 +01:00
Robin Appelman 907dd4d24d some aditional feedback during database upgrade 2012-01-16 01:15:43 +01:00
Robin Appelman ac188ec74b properly check for write permissions to the config file 2012-01-15 23:58:00 +01:00
Georg Ehrke 9c04858631 added vcards to the mimetype fix list and renamed the icon for vcards 2012-01-15 11:02:08 +01:00
Georg Ehrke 0c76884f98 add icon for log app 2012-01-14 23:39:05 +01:00
Bartek Przybylski ef69abd4dc constans for signals handling 2012-01-14 23:13:01 +01:00
Robin Appelman 36a2649e37 use admin icon for log menu enty untill we have a proper icon 2012-01-14 22:02:26 +01:00
Robin Appelman f4ce399162 fix issue with moving music files 2012-01-14 21:13:46 +01:00
Robin Appelman 7d53b6f106 remove temporary files after updating 2012-01-13 20:05:44 +01:00
Robin Appelman 6e0ea7aaae use absolute path for db_structure.xml when updating 2012-01-13 20:05:24 +01:00
Daniel Köb 37dbf48434 Connect to the newly created database when checking if it needs to be filled. 2012-01-13 04:38:59 +01:00
Thomas Tanghus e60860148c Don't chunk_split encoded image string.
Don't return json error but null if card can't be parsed.
Small check for non-parsable card in index.php.
2012-01-12 22:50:12 +01:00
Georg Ehrke 0fb73ec49d fix previous change 2012-01-12 21:54:58 +01:00
Georg Ehrke a1429085ee Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-12 21:43:32 +01:00
Georg Ehrke a0ff21a232 added a file to fix wrong recognised mime-types 2012-01-12 18:26:13 +01:00
Tom Needham fd4b63810d default table prefix to oc_ if not set 2012-01-10 14:41:08 +00:00
Thomas Tanghus 5f04b41ea6 Just a comment ;-) 2012-01-09 20:40:24 +01:00
Tom Needham 5e40653713 Missing line return 2012-01-08 21:18:21 +00:00
Robin Appelman fbb126cdd9 save updated version number of apps after updating 2012-01-08 19:58:20 +01:00
Tom Needham de3032fd00 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-08 17:02:07 +00:00
Robin Appelman ccc43f0ea0 merge master into filesystem 2012-01-08 18:01:33 +01:00
Robin Appelman 37f5a8cdb4 improve pgsql database detection 2012-01-08 17:49:53 +01:00
Tom Needham e5d3666280 Merge branch 'master' of gitorious.org:owncloud/owncloud into jqueryui 2012-01-08 16:45:28 +00:00
Robin Appelman 49337e0ad1 dont create a new user when it already exists 2012-01-08 14:25:38 +01:00
Robin Appelman ae711168c3 improve detection for mysql databases 2012-01-08 14:07:12 +01:00
Robin Appelman a4e14b49b1 load reverse driver when updating database 2012-01-08 13:16:11 +01:00
Robin Appelman 76b193c698 don't try to upgrade what isn't installed 2012-01-08 13:01:59 +01:00
Robin Appelman 034cf19159 allow changing database backends between PDO and MDB2 2012-01-08 02:57:52 +01:00
Michael Gapczynski 010bfa11e3 Fix updateApp() and add extra check to updateApps() 2012-01-08 02:12:52 +01:00
Robin Appelman fea68e08b4 update apps when their version number increases 2012-01-08 01:57:53 +01:00
Robin Appelman 001d06f2ff fix errors during database migration 2012-01-08 01:57:53 +01:00
Robin Appelman c6aa0f9854 set the installed version after updating the database 2012-01-08 01:57:53 +01:00
Robin Appelman 09a53170a3 fixes in the sqlite manager driver 2012-01-08 01:57:53 +01:00
Robin Appelman ecf6f2ca2f automatically upgrade the main database on version number increase (doesnt work with sqlite for now) 2012-01-08 01:57:53 +01:00
Robin Appelman 9a4e37483b small fix in sqlite3 driver 2012-01-08 01:57:53 +01:00
Robin Appelman 91a9688d07 minor changes to mysql setup 2012-01-08 01:57:53 +01:00
Robin Appelman 6c09d9e0f8 some fixes in the sqlite3 driver 2012-01-08 01:57:53 +01:00
Robin Appelman 799a7db638 Merge branch 'filesystem' of gitorious.org:owncloud/owncloud into filesystem 2012-01-08 01:57:14 +01:00
Robin Appelman d1edc360d9 merge master into filesystem 2012-01-08 01:53:40 +01:00
Robin Appelman 8f8985c3e5 Merge branch 'database' 2012-01-08 01:45:18 +01:00
Frank Karlitschek 0d81014fa6 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-06 19:15:29 +01:00
Frank Karlitschek d485a70e7d finish the application store feature so that users can download and install ownCloud apps from our website. there is still a small problem with write permissions. will look into this later 2012-01-06 19:08:35 +01:00
Tom Needham 47a275f389 Use parameter 2012-01-06 18:04:24 +00:00
Frank Karlitschek f9db4249a3 add a formfactor session variable which is autodetected but can also manually overwritten via a get variable.
currently we have:
         * default -> the normal desktop browser interface
         * mobile -> interface for smartphones
         * tablet -> interface for tablets
         * standalone -> the default interface but without header, footer and sidebar. just the application. useful to use just a specific app on the desktop in a standalone window.
In the future we should adapt the userinterface to the specific formfactor.
2012-01-06 17:21:24 +01:00
Thomas Tanghus 2f86a6203a Added fixOrientation method which rotates the image based on EXIF data. 2012-01-05 17:42:40 +01:00
Thomas Tanghus d80b477ab5 Wrong permission checking on file save. 2012-01-04 23:31:32 +01:00
Thomas Tanghus 48a8f2a793 Content type header was sent when saving image to disk. 2012-01-04 22:57:42 +01:00
Michael Gapczynski b6d66c4727 Remove the keys in preferences when a user is deleted - Thanks rogerc 2012-01-04 15:19:16 -05:00
Tom Needham 6dcabdc61c Fixed merge conflict in /files/ajax/move.php 2012-01-04 16:31:06 +00:00
prcrst 868a3b5364 Fix sqlite detection for Ubuntu 11.10 2012-01-03 15:58:48 +01:00
Robin Appelman 9e9bc1430b don't check if the target path is writable for operations that can create a new file
fixes file upload
2012-01-03 15:55:38 +01:00
Robin Appelman 4c8f17ad47 don't try to use mod_rewrite when it isn't enabled
having a broken web/card/caldav is much better as having no ownCloud at all :)
2012-01-03 04:55:57 +01:00
Thomas Tanghus b8cffbc0ee OC_Image::__invoke didn't return anything thus causing contacts/thumbnail.php to spit out lots of error messages. 2012-01-02 23:17:15 +01:00
Thomas Tanghus 2a184631d1 Merge git://gitorious.org/owncloud/owncloud into oc_image 2012-01-02 19:38:10 +01:00