Commit Graph

17085 Commits

Author SHA1 Message Date
Michael Göhler 22fa23b4da extend configkey column to hold 128bit values 2012-10-14 22:37:05 +02:00
Michael Göhler ae1f33db54 implement fixed php session timeout and session id regeneration 2012-10-14 22:36:26 +02:00
Michael Göhler b92fd984aa removed username and password from token generation 2012-10-14 22:36:26 +02:00
Michael Göhler a6c4046f48 fixed typo and redundant method call 2012-10-14 22:36:25 +02:00
Michael Göhler d8fe6fbb40 added a warning message to the log when a cookie is rejected 2012-10-14 22:36:25 +02:00
Michael Göhler 382f8d060c fixed wrong variable usage 2012-10-14 22:36:25 +02:00
Michael Göhler 38b9bffaea call unsetMagicInCookie if token is invalid 2012-10-14 22:36:25 +02:00
Michael Göhler eb79ccafe3 forgot a class name 2012-10-14 22:36:25 +02:00
Michael Göhler 2ea06f67bd delete all tokens on password change 2012-10-14 22:36:25 +02:00
Michael Göhler 45f1c3f120 further improvements on multiple login token support
outdated tokens are deleted before checking against cookies
if an invalid token is used we delete all stored tokens for saveness
used token will be replaced by a new one after successful authentication
2012-10-14 22:36:25 +02:00
Michael Göhler ee5d0f328f improve token security
switched from time() to internal method OC_Util::generate_random_bytes()
2012-10-14 22:36:25 +02:00
Bart Visscher 4b799a6982 Make the lifetime of the remember login cookie 2012-10-14 22:36:25 +02:00
Bart Visscher 7f3e0b5566 Cleanup login tokens on login success 2012-10-14 22:36:25 +02:00
Bart Visscher 1012d317e3 Add support for multiple login cookie tokens 2012-10-14 22:36:25 +02:00
Bart Visscher 4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Michael Göhler 7095b3a083 extend logon page to display multiple error messages 2012-10-14 19:57:24 +02:00
Lukas Reschke 2c427f050e Show a warning in the installer if no secure RNG is available 2012-10-14 17:18:30 +02:00
Lukas Reschke d6c4b83f13 Fallback to /dev/random if openssl_random_pseudo_bytes not available 2012-10-14 16:14:45 +02:00
Jenkins for ownCloud c88cf5cae5 [tx-robot] updated from transifex 2012-10-14 02:08:47 +02:00
Bart Visscher 5686183e43 Use Doctrine for schema changes 2012-10-13 15:17:21 +02:00
Bart Visscher 24b10be762 Basic support for Doctrine\DBAL 2012-10-13 15:17:21 +02:00
Bart Visscher 44133a07d6 Add doctrine-common and doctrine-dbal 2012-10-13 15:17:21 +02:00
Robin Appelman 93cbd96662 don't increase the size of the users home folder twice 2012-10-13 14:52:58 +02:00
Robin Appelman 11e9ce25e6 merge master into filesystem 2012-10-13 04:29:20 +02:00
Jenkins for ownCloud d386bc8737 [tx-robot] updated from transifex 2012-10-13 02:08:50 +02:00
Lukas Reschke 77fbdb2ca8 Fix the require path 2012-10-13 01:10:04 +02:00
Björn Schießle e38b736a1e fix bug #1977: remove etags from database after version rollback so that the client can detect the changes 2012-10-12 17:37:59 +02:00
Björn Schießle 079f0788d2 this is no longer needed, commit cb91e27ab3 should fix the issue 2012-10-12 17:35:57 +02:00
Björn Schießle d4fd83301a remove unneeded variable 2012-10-12 16:33:57 +02:00
Björn Schießle cb91e27ab3 check if directory already exist before executing mkdir 2012-10-12 16:31:03 +02:00
Bart Visscher 9a35bd76fb Use resolved path for require_once in autoloader 2012-10-12 15:47:41 +02:00
Bart Visscher 351f724193 whitespace fixes 2012-10-12 15:47:41 +02:00
Robin Appelman d589869a34 disable log when running tests 2012-10-12 15:45:05 +02:00
Björn Schießle d7f43945e7 nortmalize path before adding it to the fscache to avoid multiple fscache entries for the same file 2012-10-12 10:26:49 +02:00
Jenkins for ownCloud b761143047 [tx-robot] updated from transifex 2012-10-12 02:07:10 +02:00
Robin Appelman fb2d2bc201 merge master into filesystem 2012-10-11 22:54:39 +02:00
Thomas Tanghus c721eefe8e Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-11 22:25:20 +02:00
Björn Schießle 86d978be78 add *.ai files to the mimetypes list 2012-10-11 16:14:29 +02:00
Björn Schießle 4d451f649d fixed offset calculation (bug #1961) 2012-10-11 12:42:57 +02:00
Thomas Tanghus 7a30f46543 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-10 23:00:46 +02:00
Bart Visscher 2c3674ea87 Add logging when stripping apps from autoload include path 2012-10-10 21:06:15 +02:00
Bart Visscher d4feb77eaf Remove unused search code 2012-10-10 21:06:15 +02:00
Bart Visscher c5983d37ad No need to use array_search 2012-10-10 21:06:15 +02:00
Bart Visscher fe40277ec2 Use __DIR__ instead of __FILE__ to get SERVERROOT 2012-10-10 21:06:15 +02:00
Sam Tuke 4da67b0a08 Development snapshot; encryption stream wrapper now successfully writes files, and passes unit tests 2012-10-10 18:40:59 +01:00
Lukas Reschke d525654fcd Correct indentation 2012-10-10 19:01:32 +02:00
Lukas Reschke cda2135966 Send a HSTS HTTP header to enforce SSL 2012-10-10 18:56:14 +02:00
Robin Appelman 5c6e9518ed drop Filesystem::getInternalPath and Filesystem::getStorage in favor of Filesystem::resolvePath 2012-10-10 17:46:29 +02:00
Frank Karlitschek fe5b4d2fba marks as 5.0 pre alpha 2012-10-10 15:35:19 +02:00
Robin Appelman aaa1b73364 don't use depricated OC_Filesystem 2012-10-10 13:18:36 +02:00
Robin Appelman c88c54bbb0 make sure we can do our tests again 2012-10-10 12:51:15 +02:00
Robin Appelman 4b9fbf46e5 add depricated OC_Filessystem for compatibility 2012-10-10 12:50:57 +02:00
Robin Appelman 07c5384189 fix namespaces in filesystem and filesystemview 2012-10-10 12:25:46 +02:00
Robin Appelman 9df60d27bd move some code around 2012-10-10 11:54:44 +02:00
Robin Appelman d717a5e55c remove old filecache 2012-10-10 11:51:14 +02:00
Robin Appelman 13e7e82d19 merge master into filesystem 2012-10-10 11:30:44 +02:00
Björn Schießle 38e9bc2adb extract the right parent directory from the path
add parent directory to the file cache if it does not exist yet.
2012-10-09 16:24:49 +02:00
Frank Karlitschek 8e0676a66b 4.5 final 2012-10-09 16:02:01 +02:00
Björn Schießle 2bd4035076 $CONFIG_DBTYPE was never assigned but used in this function 2012-10-09 11:17:10 +02:00
Björn Schießle 003241e847 fix for bug #1942: Allow user to share with every group if "allow users to share with anyone" is set 2012-10-09 10:36:24 +02:00
Frank Karlitschek 67a4aa7cf0 RC 3 2012-10-08 23:58:17 +02:00
Robin Appelman 035d83fe91 don't use the workaround for shared files on the /Shared folder 2012-10-08 23:37:50 +02:00
Michael Gapczynski 025d308929 Actually fix shared webdav access 2012-10-08 17:21:52 -04:00
Michael Gapczynski 33d1906f23 Fix getting file info for subfolders in shared folders 2012-10-08 16:05:57 -04:00
Jörn Friedrich Dreyer dc116b994d reenable hack to use CURRENT_TIMESTAMP for postgresql when creating the database, fixes oc-1852
TODO for OC5: use CURRENT_TIMESTAMP for all databases. mysql supports it as a default for DATETIME since 5.6.5 [1]
as a fallback we could use <default>0000-01-01 00:00:00</default> everywhere
[1] http://bugs.mysql.com/bug.php?id=27645
http://dev.mysql.com/doc/refman/5.0/en/timestamp-initialization.html
http://www.postgresql.org/docs/8.1/static/functions-datetime.html
http://www.sqlite.org/lang_createtable.html
http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions037.htm
2012-10-08 17:24:15 +02:00
Frank Karlitschek b296328c61 put all the calls into one function and use tabs instead of spaces. Thanks to danimo for bugging me :-) 2012-10-08 15:58:50 +02:00
Frank Karlitschek c701bed2e3 fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally 2012-10-08 15:49:48 +02:00
Robin Appelman 13515effc9 add Cache::getStatus 2012-10-08 14:58:21 +02:00
Robin Appelman e7899e17de merge phpunit into filesystem 2012-10-08 13:53:53 +02:00
Arthur Schiwon 3affeb5bd7 destroy invalid sessions 2012-10-08 13:36:11 +02:00
Björn Schießle 8357754ff1 added "uid_owner" to select statement 2012-10-08 13:22:08 +02:00
Frank Karlitschek e9f04bedd4 add a sane socket timeout so that the interface stays responsive with a slow or not working internet connection 2012-10-08 12:00:29 +02:00
Frank Karlitschek b7a5cc2fda use socket timeout of 10 sec to stay responsive even with a slow internet connection or a not working server 2012-10-08 11:53:00 +02:00
Michael Gapczynski 5f462ec6f7 Fix - "Correct checking item source for share from same owner when generating item target" 2012-10-06 18:13:11 -04:00
Frank Karlitschek 5eaf95eedd check for SimpleXML which seems to bw non default on Free BSD 2012-10-06 17:37:38 +02:00
Robin Appelman 5d196f14db set folder size to 0 when scanning the filesystem 2012-10-05 22:35:51 +02:00
Bart Visscher c2b4e53453 Add API description to OC_Route and OC_Router 2012-10-05 17:42:46 +02:00
Jörn Friedrich Dreyer ee6d96b7a8 really fix checkstyle on archive tar 2012-10-05 12:54:18 +02:00
Jörn Friedrich Dreyer b5f11195af fix checkstyle on archive zip/tar 2012-10-05 12:42:11 +02:00
Jörn Friedrich Dreyer 00b34a09ea cache tar archive headers 2012-10-05 12:29:36 +02:00
Björn Schießle f493e97f5d always generate access token, also for forms shown to anonymous users (e.g. public shares) 2012-10-05 10:32:38 +02:00
Bart Visscher f3a211c03c Implement routing on javascript side 2012-10-05 09:42:36 +02:00
Thomas Tanghus ccf8df4405 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-05 02:11:30 +02:00
Jenkins for ownCloud 5c042d88ad [tx-robot] updated from transifex 2012-10-04 02:07:35 +02:00
Thomas Tanghus 667d60e133 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-03 17:44:34 +02:00
Robin Appelman b9b9fd9dba more tests and fixes for the filesystem scanner 2012-10-03 13:07:19 +02:00
Frank Karlitschek 2d86258fc3 RC2 2012-10-03 12:39:48 +02:00
Robin Appelman 85be00be65 add some more test cases for the scanner 2012-10-03 11:40:09 +02:00
Robin Appelman 3c8e5ea358 this index cant be unique due to collisions of the root of different storages 2012-10-03 11:31:13 +02:00
Robin Appelman e415e90c6d make filestorage scanner non-static and add a simple test case 2012-10-03 11:24:49 +02:00
Robin Appelman 96d7cd5997 correct namespace usage in common filestorage backend 2012-10-03 11:24:10 +02:00
Robin Appelman 636c75ce06 better parent path bahaviour for the filecache 2012-10-03 11:23:33 +02:00
Robin Appelman 6134e554f2 new filecache table 2012-10-02 23:46:35 +02:00
Robin Appelman 92555eff71 add encrypted column to the new filecache 2012-10-02 23:34:45 +02:00
Robin Appelman ac44506b40 Merge branch 'master' into filesystem 2012-10-02 23:29:13 +02:00
Thomas Tanghus 2c1c7eadaf Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-02 23:24:54 +02:00
Thomas Tanghus 6bfb2ca2a8 Added post_deleteUser hook to VCategories. Added methods for adding/removing object/category relations. 2012-10-02 22:47:59 +02:00
Michael Gapczynski 68c8faf39c Correct checking item source for share from same owner when generating item target 2012-10-02 16:37:39 -04:00
Björn Schießle 431d92e7b2 we are sharing the same file again if item_source of the already shared file and the newly shared file is the same. Therefore we can use the same target name 2012-10-02 21:37:10 +02:00
Björn Schießle db954f5aba remove unnecessary code and add missing items to select statement 2012-10-02 18:59:20 +02:00
Björn Schießle 3e3038cafc merge all possible conflicts into on array 2012-10-02 13:10:46 +02:00
Frank Karlitschek 3fdebaa5dc automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number.
Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5
2012-10-02 12:10:45 +02:00
Arthur Schiwon 783c02eda9 fix create folder and upload file issue on win, fixes oc-1747, solution follows suggestion from bug tracker 2012-10-02 11:45:47 +02:00
Björn Schießle c6c0fcc7c8 We can't rely on the assumption that if the matching target is from the same owner that the share type will be different.
Files in different folders can have the same name. Therefore also a unique name has to be generated if the matching
target it from the same user. Also for folders and files with the same name a unique target name has to be generated

If matching target is from the same owner, use the same target. The share type will be different so this isn't the sa
2012-10-02 11:41:26 +02:00
Thomas Tanghus 7d25443937 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-01 23:41:21 +02:00
Arthur Schiwon 68fa2b10da Search: fix Notice and thus broken search with activiated error reporting 2012-10-01 19:11:26 +02:00
Robin Appelman b7eb3f3dff merge master into filesystem 2012-10-01 14:21:49 +02:00
Robin Appelman 91d12a2f3d update the filecache by setting mtimes to 0 when the mount configuration has changed instead of clearing the cache 2012-09-30 16:12:16 +02:00
Robin Appelman 113c339c41 fix updating the filecache for when contents of a folder has changed 2012-09-30 16:11:01 +02:00
Thomas Tanghus 241862756e Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-09-30 06:51:40 +02:00
Robin Appelman 258782584e fix mimetype detection using the 'file' command in some edge cases 2012-09-30 03:58:58 +02:00
Robin Appelman f8eebcbb01 reload the current url when login in instead of always redirecting to the default app (oc-1873) 2012-09-30 03:47:37 +02:00
Lukas Reschke e8afb3d312 Fix a typo 2012-09-30 00:08:20 +03:00
Bart Visscher 210ea4d9d9 fix actioninclude 2012-09-29 18:03:34 +02:00
Lukas Reschke ef57e9294b Fallback for systems without openssl 2012-09-29 16:44:02 +02:00
Lukas Reschke 992c2c9d4b mt_rand() is not secure from a cryptographic point of view, let's use openssl_random_pseudo_bytes() here 2012-09-29 15:41:13 +02:00
Lukas Reschke 578aa4e425 Removed sectoken
This token is completly useless since an attacker can easily extract it
from the page.
2012-09-29 15:18:38 +02:00
Lukas Reschke bd804b74c4 mt_rand() is not secure from a security point of view and predictable. Let's use openssl_random_pseudo_bytes() instead.
Before: 26 bits entropy
After: 72 bits entropy
2012-09-29 15:03:09 +02:00
Jenkins for ownCloud dc66e94ee3 [tx-robot] updated from transifex 2012-09-29 02:04:55 +02:00
Bart Visscher d0bd2bbf27 Convert menu entries of settings pages to use router 2012-09-28 23:20:17 +02:00
Bart Visscher 22d22d19c0 Do urlencoding in linkTo functions 2012-09-28 22:27:52 +02:00
Bart Visscher dbdf3bde7c Implement route for download in OC_Search_Provider_File 2012-09-28 22:20:17 +02:00
Bart Visscher c9317b5a68 Merge branch 'master' into routing 2012-09-28 21:41:21 +02:00
Bart Visscher fed34aecfa Fix syntax error in removeETagHook 2012-09-28 21:30:06 +02:00
Bart Visscher 24bb7d16b7 urlencode filename in search result, fixes problems with & in name 2012-09-28 21:18:20 +02:00
Bart Visscher 366ae6661d Simplify generating file search results 2012-09-28 21:18:20 +02:00
Lukas Reschke cfc9839812 Merge pull request #19 from arkascha/master
Reimplementation of CSRF protection strategy
2012-09-28 10:54:11 -07:00
Christian Reiner 71454b1bca Fix to preserve backward compatibility for apps creating static links containing the request token (currently the contacts app and maybe some 3rd party implementations) 2012-09-28 18:57:20 +02:00
Björn Schießle 35357f3afb etag has to be removed after version rollback to enable the sync client to detect the changes (bug #1829) 2012-09-28 18:50:36 +02:00
Björn Schießle f8f73e2675 move back to "lastmodified" property since "getlastmodified" is protected by webdav 2012-09-28 18:50:36 +02:00
Bart Visscher bf1057143c Merge branch 'master' into routing
Conflicts:
	apps/files/js/filelist.js
	core/js/js.js
	lib/ocs.php
2012-09-28 15:38:49 +02:00
Christian Reiner 4dbd4c35c5 Merge branch 'master' of git://github.com/owncloud/core 2012-09-28 13:31:01 +02:00
Christian Reiner 743826bbf3 Reimplementation of CSRF protection including autorefresh 2012-09-28 13:30:44 +02:00
Jenkins for ownCloud 5144d26088 [tx-robot] updated from transifex 2012-09-28 02:06:03 +02:00
Robin Appelman e8df2eeefc some more sane column sizes for appconfig and preferences 2012-09-27 22:49:01 +02:00
Frank Karlitschek cf14ad2f7d RC 1 2012-09-27 04:10:19 +02:00
Robin Appelman 88bca9bc49 Merge branch 'master' into filesystem 2012-09-26 17:52:28 +02:00
Robin Appelman 522d7df860 convert Cache to a non-static class that handles the cache for a single storage backend 2012-09-26 17:52:02 +02:00
Björn Schießle a7292e897a The mtime in the file cache has to be updated after version rollback (copy from outside of the regular files root) (fixes bug #1720) 2012-09-26 17:03:54 +02:00
VicDeo 2b6869bcea Uncaught exception logging 2012-09-26 14:38:06 +03:00
Björn Schießle 50d7cfbbe7 prepare server for move of property name "lastmodified" to "getlastmodified" according to RFC4918.
Depreciated const can be removed after sync client update and release
2012-09-26 13:06:43 +02:00
Björn Schießle fcd70246db Merge branch 'master' of github.com:owncloud/core 2012-09-26 10:50:06 +02:00
Björn Schießle c3c6e52104 - take webdav namespace for properties into account
- change update routine to add the namesapce to all stored properties
2012-09-26 10:48:30 +02:00
Michael Gapczynski b4e40b1c21 Fix unsetting share expiration date 2012-09-26 00:09:35 -04:00
Michael Gapczynski f967bfc956 Properly format the share expiration time for the database, fixes bug oc-1779 2012-09-25 23:54:46 -04:00
Bart Visscher 737a6730db Add OC_Files::searchByMime function
Include shared files in result
2012-09-25 21:15:01 +02:00
Lukas Reschke c4fc291fa7 Passwords containing a ":" don't work with this explode
Thanks to mETz
2012-09-25 19:57:40 +02:00
Arthur Schiwon a8ff1505d6 backwards compat to older xcache versions, don't fail when trying to clear cache by prefix 2012-09-25 11:47:53 +02:00
Jenkins for ownCloud e5487376da [tx-robot] updated from transifex 2012-09-25 02:05:18 +02:00
Bart Visscher a80e0403a1 Fix getting individual shared file information 2012-09-24 21:12:32 +02:00
Jörn Friedrich Dreyer 1e2074b4eb use file instead of dir in search provider file fix result urls 2012-09-24 19:24:20 +02:00
Jenkins for ownCloud ecb90d72f3 [tx-robot] updated from transifex 2012-09-24 02:04:10 +02:00
Robin Appelman dcf995fff3 add Cache::getFolderContent 2012-09-23 15:25:03 +02:00
Robin Appelman eed1ccd164 Merge branch 'master' into filesystem 2012-09-23 02:41:31 +02:00
Robin Appelman 4131b205d4 fix some more phpdoc 2012-09-23 02:40:03 +02:00
Robin Appelman f71f731f1c fix phpdoc and handle some edges cases better in oc_db 2012-09-23 02:40:03 +02:00
Robin Appelman 6fafd5d4e9 this should be done elsewhere if needed 2012-09-23 01:46:52 +02:00
Robin Appelman 97b0eabc85 fix several problems in the new filecache in order to complete the tests 2012-09-22 15:43:48 +02:00
Robin Appelman 46896be0d4 fix namespace error in temporary storage backend 2012-09-22 15:03:17 +02:00
Robin Appelman b206d16b10 add support for loading namespaced test cases 2012-09-22 14:51:34 +02:00
Robin Appelman 153cd802a9 add partial file data to the result of Cache::get 2012-09-22 14:40:04 +02:00
Robin Appelman 93292516d9 Merge branch 'master' into filesystem 2012-09-22 14:28:14 +02:00
Lukas Reschke 80aa44565b Sanitize user input 2012-09-22 10:51:03 +02:00
Jenkins for ownCloud 01160d0fb4 [tx-robot] updated from transifex 2012-09-22 01:18:31 +02:00
Thomas Müller ac69974d73 Merge pull request #17 from scambra/4.5-l10n-fixes
Fix some untranslated strings
2012-09-21 16:09:30 -07:00
Bart Visscher 40a1899bd9 Catch exceptions when updating an app 2012-09-21 23:32:52 +02:00
Bart Visscher 4f4498e0d6 Fix undefined user var, use getUser 2012-09-21 21:29:37 +02:00
Bart Visscher 8820cd934a Forgot to return the fileinfo 2012-09-21 21:28:53 +02:00
Bart Visscher b6dc6c5bb9 Don't use OC_FileCache directly, but use the functions in OC_Files
This adds getFileInfo to OC_Files to also get fileinfo from shared files
2012-09-21 13:31:12 +02:00
scambra e48811017d fix translation for core/lostpassword 2012-09-21 11:54:47 +02:00
Jörn Friedrich Dreyer 59a00f95c3 use AL32UTF8 charset to connect to oracle, fixes file name encoding problems 2012-09-20 21:07:54 +02:00
Jörn Friedrich Dreyer a4082a526f escape user column in OC_FileCache::clear 2012-09-20 21:06:46 +02:00
Jenkins for ownCloud 7c42e88676 [tx-robot] updated from transifex 2012-09-20 02:09:31 +02:00
Robin Appelman 74ec2765b3 db indexes for appconfig and preferences 2012-09-20 01:36:52 +02:00
scambra 2b5133a1c4 check free space using folder's owner 2012-09-19 21:31:29 +02:00
Brice Maron 86c3761615 Catch unreadable app folder error 2012-09-19 19:26:57 +00:00
Frank Karlitschek fe7288b65a beta 4 2012-09-19 16:32:40 +02:00
Arthur Schiwon 93d0defe9a set configuvalue in table appconfig back to clob. Likely to break LDAP settings, probably responsible for some bugs with it. Might also cause damage in other apps. That's why it was once already set to clob 2012-09-19 12:55:07 +02:00
Jenkins for ownCloud b0e645fe13 [tx-robot] updated from transifex 2012-09-19 02:07:26 +02:00
Bart Visscher 703aff6c35 Run proxies and emit signals when finising chunked upload
Otherwise the file cache and the quota isn't checked
2012-09-18 20:23:17 +02:00
Tom Needham 30188847a3 Only try to delete migration.db if it was created. 2012-09-18 16:25:34 +00:00
Tom Needham be76a55ef0 Allow exporting of users from any user backend, fixed oc-1645 2012-09-18 16:24:39 +00:00
Sam Tuke 9df403f051 Added failsafes for retrieving remote apps on settings->apps page, in case categories or app data are not found 2012-09-18 16:55:03 +01:00
Björn Schießle 2570ea7114 don't interpret strpos '0' as 'false' in while loop 2012-09-18 16:14:04 +02:00
Sam Tuke dc0dc56d48 Merge branch 'master' of https://github.com/owncloud/core 2012-09-18 14:36:08 +01:00
Sam Tuke b765e883f3 Fixed bug with duplicate entries for installed 3rd party apps in settings->apps
Added method getAppstoreApps to OC_App
Added minor documentation
2012-09-18 14:35:27 +01:00
Jenkins for ownCloud 06e963c54f [tx-robot] updated from transifex 2012-09-18 02:04:26 +02:00
Robin Appelman 2a8ff8a0d4 fix problem with quota proxy when using copy 2012-09-17 22:16:07 +02:00
Robin Appelman 82ffefb99b dont trigger filesystem hooks when not using the default view 2012-09-17 22:16:07 +02:00
Bart Visscher b1bab6d113 Check format of chunked filename 2012-09-17 20:00:31 +02:00
Bart Visscher ce10e1c19a Fix return statement 2012-09-17 20:00:31 +02:00
Bart Visscher ab33578add Normalize path before calling removeETagPropertyForPath
This should also fix the dirname problem on windows
2012-09-17 20:00:31 +02:00
Björn Schießle 92413217b3 Merge branch 'master' of github.com:owncloud/core 2012-09-17 17:03:57 +02:00
Björn Schießle 1207ae1f99 add leading '?' to parameter list (fixes bug #1732) 2012-09-17 17:02:17 +02:00
Jörn Friedrich Dreyer 9da150cd3b use user name as db name for oracle connection made with service name 2012-09-17 16:32:24 +02:00
Thomas Tanghus 3273beb887 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-09-17 16:11:20 +02:00
Thomas Tanghus b1a6acde30 Added separate table for OC_VCategories and category/object (event/contact etc.) relations. 2012-09-17 16:03:15 +02:00
Thomas Tanghus ffe04182a8 Added methods OC_DB::insertIfNotExist() and OCP\DB::insertIfNotExist(). 2012-09-17 16:01:25 +02:00
Tom Needham 88b786e8dd Merge branch 'master' into ocs_api 2012-09-17 12:09:34 +00:00
Tom Needham 3ea01df1cd API: Parse PUT and DELETE variables 2012-09-17 12:08:17 +00:00
Tom Needham 8926038591 API: Fix merge conflict remnants 2012-09-17 12:07:42 +00:00
Frank Karlitschek a3718ca036 i just learned that we also have to check if directories are readable. it seams that is_readable also checks for 'x' right. 2012-09-16 22:49:03 +02:00
Robin Appelman 954596c251 rework filecache to work directly on storage backends wip 2012-09-16 16:52:32 +02:00
Jenkins for ownCloud fbdefd5601 [tx-robot] updated from transifex 2012-09-15 02:05:52 +02:00
Tom Needham 0f07226270 API: Allow admins to access SUBADMIN api methods 2012-09-14 13:41:06 +00:00
Jenkins for ownCloud e41ccd4344 [tx-robot] updated from transifex 2012-09-14 02:03:18 +02:00
Thomas Tanghus fdecee1bda Check if categories is an array. 2012-09-13 17:30:26 +02:00
Tom Needham a8c82440d0 API: Use http authentication, check the auth level required 2012-09-13 15:18:38 +00:00
Tom Needham 8b409dfe2a API: Default to user authentication level 2012-09-13 14:15:04 +00:00
Tom Needham b261c980c7 Fix autoloader merge conflict 2012-09-13 10:50:10 +00:00
Tom Needham 182f890110 Remove a merge conflict 2012-09-13 10:32:35 +00:00
Tom Needham 227ada3257 Fix merge conflicts 2012-09-13 10:23:41 +00:00
Tom Needham fa5dff22a0 API: Require api calls to register the required auth level 2012-09-13 09:41:20 +00:00
Frank Karlitschek 5a149dcfab mark as an updated beta 3 with some more fixes 2012-09-13 11:39:26 +02:00
Bart Visscher e3e4a2bec2 Enable post_write trigger
This is used when uploading a file with webdav. The trigger will add the file to the cache and make it show up in listings
2012-09-13 00:12:10 +02:00
Bart Visscher 78a022fda6 dirname can also return '.' for empty path 2012-09-13 00:09:00 +02:00
Robin Appelman c94fe38d39 add getPermissions to storage backends to get all permission flags in one go 2012-09-12 23:25:57 +02:00
Jörn Friedrich Dreyer d3553ce33d correctly calculate the MDB2 portability 2012-09-12 23:10:45 +02:00
Jörn Friedrich Dreyer c7054f374c log details for an error when upgrading the schema 2012-09-12 23:03:56 +02:00
Jörn Friedrich Dreyer b2d60ed6b7 add proper logging to filecache 2012-09-12 23:03:56 +02:00
Robin Appelman 68f65b657c add OC_Filesystem::resolvePath to get the storage backend and internal path for a file in one go 2012-09-12 22:53:10 +02:00
Robin Appelman e8d3a47685 add getId to storage backends 2012-09-12 22:50:10 +02:00
Victor Dubiniuk bbf8bb0bb3 Log PHP errors to the OC log 2012-09-12 22:30:04 +03:00
Bart Visscher 3efe1d3b24 Add linkToRoute functionality 2012-09-12 18:00:33 +02:00
Jörn Friedrich Dreyer 0fe3354c61 add proper error logging in OC_User database queries 2012-09-12 12:47:33 +02:00
Jörn Friedrich Dreyer e31dfb643a add getErrorMessage to OC_DB 2012-09-12 12:47:33 +02:00
Frank Karlitschek f31264a0c2 this is now 4.5 beta 3 2012-09-12 12:12:23 +02:00
Michael Gapczynski c5f9b887ff Don't call clearCache() for OC_Minimizer statically, create OC_Minimizer objects for both CSS and JS to clear cache after upgrade 2012-09-12 01:18:07 -04:00
Michael Gapczynski ca6322465d Treat getUsers() as case insensitive, helpful for showing proper results in the share with autocomplete 2012-09-12 01:12:25 -04:00
Michael Gapczynski 60feaf9abf Merge branch 'master' into share_expiration
Conflicts:
	core/js/share.js
	lib/util.php
2012-09-12 01:06:57 -04:00
Michael Gapczynski 8f0354bcdd Temporarily disable sharing with contacts and emails, will come in next release 2012-09-12 01:02:08 -04:00
Michael Gapczynski b194ac3dde Add expiration column to share table and bump version number 2012-09-12 01:01:45 -04:00
Jenkins for ownCloud 8c9c095d48 [tx-robot] updated from transifex 2012-09-12 02:02:58 +02:00
Thomas Mueller 5c1a79210f added hint to restart the web server in case recetly installed php modules are still not available 2012-09-11 23:51:12 +02:00
Jörn Friedrich Dreyer b6a106a920 allow using only dbname for oracle 2012-09-11 18:12:38 +02:00
Jörn Friedrich Dreyer bf2d1e78f2 don't set values with oc_appconfig when oc is not installed yet, allows to render guest page for installation again 2012-09-11 13:16:34 +02:00
Michael Gapczynski 37f0b85d3f Fix problem with non share collection item types being treated as collections 2012-09-11 00:37:31 -04:00
Jenkins for ownCloud 6a29bbda7a [tx-robot] updated from transifex 2012-09-11 02:03:53 +02:00
Georg Ehrke 463b48b2e1 fix file upload 2012-09-10 14:41:27 +02:00
Jörn Friedrich Dreyer 86c3f9b8fe Merge branch 'master' of github.com:owncloud/core 2012-09-10 14:14:49 +02:00
Jörn Friedrich Dreyer db7a18455f use tabs for indentation 2012-09-10 14:14:36 +02:00
Thomas Müller 5a65c5a46c Respect coding style 2012-09-10 14:59:08 +03:00
Thomas Müller 0444877218 Respect coding style 2012-09-10 12:35:15 +03:00
Thomas Müller c6cd1b77d3 Respect coding style 2012-09-10 12:32:49 +03:00
Thomas Müller 5721bd2786 Respect coding style 2012-09-10 12:31:57 +03:00
Thomas Müller 1a10955644 Respect coding style 2012-09-10 12:29:35 +03:00
Thomas Müller 2271a97992 Respect coding style 2012-09-10 12:28:09 +03:00
Thomas Müller 9a2bc5255b Respect coding style 2012-09-10 12:26:20 +03:00
Thomas Müller 23f348c99f Respect coding style 2012-09-10 12:25:42 +03:00
Thomas Müller 87e1a27fde Respect coding style 2012-09-10 12:23:55 +03:00
Thomas Müller f34588d1ff Respect coding style 2012-09-10 12:21:54 +03:00
Michael Gapczynski 6c17a4cb77 Don't display actions for children in shared collections, show the parent collection the child is shared in 2012-09-09 14:44:08 -04:00
Michael Gapczynski 13d513c17c Fix shared collection item searching 2012-09-09 11:50:12 -04:00
Michael Gapczynski 3e7951e1e6 Normalize the file path for shared children as a precaution 2012-09-08 23:42:24 -04:00
Michael Gapczynski fe7f095b08 Insert id for unique user group share rows 2012-09-08 23:09:58 -04:00
Michael Gapczynski b163bd514f Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder 2012-09-08 23:09:57 -04:00
Michael Gapczynski f23f719d99 Fix unsharing from self for group shares and add test for it 2012-09-08 20:15:47 -04:00
Jenkins for ownCloud 5e790368bc [tx-robot] updated from transifex 2012-09-09 02:03:35 +02:00
Robin Appelman 46422e6dbe don't use regular expresions for a simple string replace 2012-09-08 23:40:23 +02:00
Robin Appelman 697061fa9f add OC_Image::fitIn 2012-09-08 23:26:19 +02:00
Thomas Tanghus abc930c57c Suppress error message which would send headers for hosted sited where disk_free_space() has been disabled for security. 2012-09-08 17:58:59 +02:00
Georg Ehrke 2b42893fa9 style fixes for public util api 2012-09-08 16:18:47 +02:00
Georg Ehrke 89f3afe2fe style fixes for public user api 2012-09-08 16:17:01 +02:00
Georg Ehrke 439ede2a1d style fixes for public response api 2012-09-08 16:15:42 +02:00
Georg Ehrke a16565a7fa style fixes for public json api 2012-09-08 16:14:06 +02:00
Georg Ehrke 89e5b85fa7 style fixes for public files api 2012-09-08 16:02:11 +02:00
Georg Ehrke 6b2b8b10ee style fixes for public db api 2012-09-08 16:00:32 +02:00
Georg Ehrke 221257d2fb style fixes for public config api 2012-09-08 15:58:28 +02:00
Georg Ehrke eca24f74f7 style fixes for public app api 2012-09-08 15:54:30 +02:00
Georg Ehrke c692dfc1ab style fixes for public app api 2012-09-08 15:52:29 +02:00
Jenkins for ownCloud d5d2e89622 [tx-robot] updated from transifex 2012-09-08 02:05:41 +02:00
Robin Appelman bd83422095 put filestorages in a namespace 2012-09-07 18:30:48 +02:00
Bart Visscher edcd297476 Move handling of core remotes to OC_TemplateLayout 2012-09-07 16:42:46 +02:00
Bart Visscher 631df21de6 Prevent loading all apps twice from overwriting the core scripts and styles 2012-09-07 16:20:13 +02:00
Bart Visscher ceec5e593c Remove redundant loadApps 2012-09-07 16:19:08 +02:00
Bart Visscher 5eba579827 Merge branch 'master' into routing
Conflicts:
	apps/files/js/fileactions.js
	lib/base.php
	lib/helper.php
	lib/ocs.php
2012-09-07 15:51:44 +02:00
Thomas Mueller 3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Bart Visscher 285c198c36 EOL fixes
apps/files_external/lib/config.php
apps/files_versions/lib/versions.php
lib/connector/sabre/client.php
2012-09-07 14:10:00 +02:00
Bart Visscher 5e55b4d6e7 Whitespace fixes in lib 2012-09-07 14:08:29 +02:00
Bart Visscher 386d1ac49f Fix setEtagHeader function 2012-09-07 13:42:22 +02:00
Bart Visscher cd4b8dbacd Change caching checks for minimized files
Only use a ETag, but include last modified time into this
Also added the filesize to this. And used the ETag for the
internal cache.
2012-09-07 13:42:22 +02:00
Bart Visscher ff42da58b9 Global file cache should also be able to clear with prefix 2012-09-07 13:42:22 +02:00
Bart Visscher 9ea7817a40 Remove core.{css,js} cache on upgrade 2012-09-07 13:42:22 +02:00
Michael Gapczynski 73d726d1b2 Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions 2012-09-07 00:02:22 -04:00
Jenkins for ownCloud a94b56b57b [tx-robot] updated from transifex 2012-09-07 02:07:22 +02:00
Frank Karlitschek 294cff27a7 add check for zlib 2012-09-07 01:39:11 +02:00
Robin Appelman d4fd47d43f clear user filecache after the user mount configuration has changed 2012-09-06 23:14:43 +02:00
Robin Appelman 2144b2f37a clear the filecache if the mount configuration has changed 2012-09-06 23:10:33 +02:00
Bart Visscher 39577495e1 Add a directory separator to filter app directories with the same
prefix.

Fixes: oc-1663
2012-09-06 22:27:56 +02:00
Michael Gapczynski 837eb1871d Don't delete the file anymore to replace it in the UI, just overwrite it 2012-09-05 22:13:50 -04:00
Jenkins for ownCloud af3e767489 [tx-robot] updated from transifex 2012-09-06 02:06:37 +02:00
Thomas Mueller ebb28412ca no more require_once() 2012-09-05 23:28:59 +02:00
Thomas Müller 24977d0fd0 Respect coding style 2012-09-05 15:49:42 +03:00
Thomas Müller e5cb638c09 Respect coding style 2012-09-05 15:42:06 +03:00
Thomas Müller d5fd5cd584 Respect coding style 2012-09-05 15:40:21 +03:00
Tom Needham 28a11959d7 API: Fix /person/check api method 2012-09-05 12:32:54 +00:00
Thomas Müller 9eccc0121a Respect coding style 2012-09-05 13:22:38 +03:00
Tom Needham 470b87f625 Fix ocs/person/check 2012-09-05 09:07:15 +00:00
Jenkins for ownCloud e8fcc71129 [tx-robot] updated from transifex 2012-09-05 02:05:39 +02:00
Thomas Mueller 1e2d582123 fixing button to add additional site 2012-09-04 23:42:49 +02:00
Bart Visscher 41f135daee Remove () from return statement 2012-09-04 21:27:36 +02:00
Thomas Müller 69ee842521 Fixing: http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-1617 2012-09-04 17:13:34 +03:00
Tom Needham 4224eb8831 API: remove OAuth auth check, respond in ocs formatted xml/json 2012-09-04 13:50:56 +00:00
Thomas Müller 7901fc33a8 fixing syntax error 2012-09-04 15:54:38 +03:00
Thomas Müller aff08925c1 fixing syntax error - sorry for that 2012-09-04 15:46:43 +03:00
Thomas Müller 2028500c0a fixing syntax error - sorry for that 2012-09-04 15:42:58 +03:00
Thomas Müller e4e0b5a822 Respect coding style 2012-09-04 15:34:09 +03:00
Thomas Müller d14f8fa681 Respect coding style 2012-09-04 15:21:52 +03:00
Tom Needham 37bb16becb API: Add callback_fail, add OC_OAuth::init and bespoke request token method 2012-09-04 11:10:42 +00:00
Thomas Müller 9760b5e153 Respect coding style 2012-09-04 13:32:27 +03:00
Jenkins for ownCloud b867b738e8 [tx-robot] updated from transifex 2012-09-04 02:03:21 +02:00
Bart Visscher 5153b8b293 Add url-params to url with new parameter in linkTo function 2012-09-03 21:51:32 +02:00
Bart Visscher 1a46192433 Add args parameter to linkTo(Absolute) function, to append the args automaticly 2012-09-03 21:51:32 +02:00
Frank Karlitschek bb65e173d4 4.5 beta 2 2012-09-03 20:38:50 +02:00
Jenkins for ownCloud d386e0172a [tx-robot] updated from transifex 2012-09-03 02:07:40 +02:00
Michael Gapczynski 4c065deb55 Listen to post_deleteGroup hook in Share API 2012-09-02 20:01:09 -04:00
Michael Gapczynski dc569ea300 Fix some warnings from Jenkins in the Share API 2012-09-02 19:30:01 -04:00
Michael Gapczynski db37a454b3 Add parameter documentation 2012-09-02 18:29:55 -04:00
Michael Gapczynski f0f2d93908 Restructure generateTarget for the post_addToGroup hook 2012-09-02 18:23:19 -04:00
Michael Gapczynski a77c16371f Make item targets be based off of the parent item target for reshares 2012-09-02 18:23:19 -04:00
Thomas Mueller 5f2751c672 in some cases no translations are loaded because $this->lang is empty not null 2012-09-02 14:15:03 +02:00
Robin Appelman 3c784ede83 use str_ireplace instead of duplicate str_replace 2012-09-02 13:58:01 +02:00
Jenkins for ownCloud 2bb7cb9f64 [tx-robot] updated from transifex 2012-09-02 02:02:53 +02:00
Michael Gapczynski 6c29334b48 Add support for share expiration 2012-09-01 18:53:48 -04:00
Robin Appelman 2508f64efe set debug mode if an xdebug session is active 2012-09-01 20:52:13 +02:00
Jörn Friedrich Dreyer 2c1f732880 use null instead of -1 on all getUser() 2012-09-01 20:50:03 +02:00
Robin Appelman 828ca2ba36 translate UNIX_TIMESTAMP() into sqlite and pgsql equivilents 2012-09-01 20:38:14 +02:00
Robin Appelman 6d48f3fab8 we still need this for pgsql 2012-09-01 16:49:29 +02:00
Robin Appelman a7255181ad fix autoloader throwing errors for non-oc classes 2012-09-01 15:36:52 +02:00
Jenkins for ownCloud c0c48cb3ee [tx-robot] updated from transifex 2012-09-01 13:37:28 +02:00
Robin Appelman 3dacf149de allow configuring user backends in config.php 2012-09-01 02:50:27 +02:00
Robin Appelman f67aef608f load authentication apps on login 2012-09-01 02:50:27 +02:00
Robin Appelman ebd813ae95 don't throw errors in the autoloader when a class doesn't exist 2012-09-01 02:50:27 +02:00
Jenkins for ownCloud ab090d5277 [tx-robot] updated from transifex 2012-09-01 02:04:00 +02:00
Michael Gapczynski efa0478d2d Remove share permission for encrypted files 2012-08-31 17:31:28 -04:00
Frank Karlitschek 72e80bf6bd send the current owncloud version to the ocs server so that we can filter for compatible apps 2012-08-31 20:22:03 +02:00
Thomas Mueller 6f8efcfe61 l18n support lib/updater.php 2012-08-31 10:51:35 +02:00
Thomas Mueller bd809574dc fix translations within subfolder /lib 2012-08-31 00:43:50 +02:00
Thomas Mueller 58b1e841f1 fix translations within subfolder /lib 2012-08-30 23:51:44 +02:00
Robin Appelman b5234a4f34 allow html inside app descriptions 2012-08-30 22:17:54 +02:00
Bart Visscher b483f2aab8 Merge branch 'master' into routing
Conflicts:
	apps/contacts/js/contacts.js
	apps/contacts/lib/search.php
	apps/files_archive/js/archive.js
	apps/gallery/lib/tiles.php
	apps/gallery/templates/index.php
	lib/ocs.php
2012-08-30 21:49:28 +02:00
Tom Needham 67c2d56be8 Add ownCloud OAuth store backend. WIP 2012-08-30 14:02:31 +00:00
Tom Needham 0d1d2c0b61 Fix class name 2012-08-30 14:01:27 +00:00
Bart Visscher 598815b21e More info about not compatible apps (app id) 2012-08-29 22:38:06 +02:00
Bart Visscher c958d5ba80 Fix filesystem setup for shared public link with logged in user 2012-08-29 21:35:55 +02:00
Michael Gapczynski 301baf0215 $storage shouldn't be static in OC_Cache_File 2012-08-29 14:42:40 -04:00
Michael Gapczynski 8d490b9880 Fix shared storage working with user backend defined data directories 2012-08-29 14:39:13 -04:00
Bart Visscher db18218a1b Space before tab fixes 2012-08-29 20:34:44 +02:00
Bart Visscher 9e32e07306 Fix OC_Cache_File 2012-08-29 20:29:43 +02:00
Bart Visscher 0365f8fd01 Remove php close at end of file 2012-08-29 20:29:43 +02:00
Bart Visscher 52f2e7112e Whitespace fixes in lib 2012-08-29 20:28:45 +02:00
Bart Visscher cbaf858dea Merge remote-tracking branch 'gitorious/master' into routing
Conflicts:
	apps/files/js/fileactions.js
	apps/files_archive/js/archive.js
2012-08-29 20:16:39 +02:00
Michael Gapczynski 26501a0bc8 Delete old link if user sets a password 2012-08-29 14:06:55 -04:00
Michael Gapczynski e5cbc532c3 Fix password authentication for links and fix template problems for links by creating a new base layout 2012-08-29 11:54:49 -04:00
Thomas Mueller d786194ddc fixing: apps/files/ajax/scan.php 2012-08-29 01:39:42 +02:00
Bart Visscher 32721e7b07 Remember storage view in OC_Cache_File 2012-08-28 23:10:32 +02:00
Bart Visscher 53e51fe46b Clean user cache on login 2012-08-28 23:07:28 +02:00
Bart Visscher 8a02a8852f Add background job for global file cache cleanup 2012-08-28 23:07:28 +02:00
Michael Gapczynski ff076caeee Check usernames in the database as case insensitive, they are still stored case sensitive. Bug fix for oc-422 and oc-1514 2012-08-28 11:28:38 -04:00
Michael Gapczynski fd2ca21fc2 Allow share_with column to be null for links 2012-08-28 09:51:00 -04:00
Frank Karlitschek 70b71338cd beta 1 2012-08-28 07:22:31 +02:00
Michael Gapczynski 9cd55508c3 Add Share API settings to admin page 2012-08-27 20:39:31 -04:00
Michael Gapczynski 0ad16e84c5 Fix share collection query 2012-08-27 20:37:38 -04:00
Michael Gapczynski 0a9d1ed3a6 Initial previewer for public links 2012-08-27 20:37:38 -04:00
Jörn Friedrich Dreyer 3b83c7fa74 update now(), current_timestamp and backtick replacement 2012-08-27 18:37:16 +02:00
Bjoern Schiessle 2e796b563f urldecode private- and public-key 2012-08-27 17:51:02 +02:00
Georg Ehrke ead7de6bff only mount every single homefolder when using sharing app 2012-08-27 16:10:37 +02:00
Georg Ehrke b56a46bdea fix filesharing for multiple data directories 2012-08-27 15:55:46 +02:00
Arthur Schiwon 0f379fd28a OC_User: getHome is an optional method, taking it out of the Interface 2012-08-27 14:07:28 +02:00
Jörn Friedrich Dreyer 3970d0e636 Merge branch 'master' of github.com:owncloud/core 2012-08-27 14:00:17 +02:00
Jörn Friedrich Dreyer 15cdde74d3 return standard SQL values (sqlite3 understands CURRENT_...) 2012-08-27 13:33:24 +02:00
Georg Ehrke 16aff1045d make use of OC_User::getHome in lib/migrate.php 2012-08-27 13:21:40 +02:00
Michael Gapczynski 18517f6adb Fix share getItems() limit 2012-08-26 21:34:37 -04:00
Georg Ehrke cd5c217c0d use OC_User::getHome in lib/filesystem.php 2012-08-26 22:24:08 +02:00
Georg Ehrke 045c94ec3e enable user backends to define their own place where to store the data 2012-08-26 22:04:31 +02:00
Georg Ehrke 5586054961 fix c&p fail from earlier commit today 2012-08-26 22:04:31 +02:00
Georg Ehrke 44f5033e29 Merge branch 'master' of github.com:owncloud/core 2012-08-26 16:30:30 +02:00
Georg Ehrke 8c8496aff9 don't allow group admins to change admin's accounts 2012-08-26 16:29:10 +02:00
Georg Ehrke 5a4854079f implement getHome in OC_User 2012-08-26 16:24:25 +02:00
Jörn Friedrich Dreyer 39a9a4e73e Merge branch 'master' of github.com:owncloud/core 2012-08-26 15:05:28 +02:00
jfd 9822cd30c0 fix sharing bug introduced with oracle support 2012-08-26 14:57:33 +02:00
Jenkins for ownCloud bae07faa34 [tx-robot] updated from transifex 2012-08-26 01:20:16 +02:00
Jörn Friedrich Dreyer 4f5eff2b6f Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support 2012-08-25 03:14:26 +02:00
jfd 1bfe26bb09 remove superflous LIMIT 2012-08-25 02:26:50 +02:00
jfd 379f27ed03 fix missing $ 2012-08-25 02:17:44 +02:00
jfd bc90a34b07 remove duplicate method 2012-08-25 02:13:32 +02:00
Jenkins for ownCloud f57d527a7c [tx-robot] updated from transifex 2012-08-25 02:08:36 +02:00
Jörn Friedrich Dreyer fa3497f6ed add backticks to SQL, use limit parameter instead of LIMIT SQL 2012-08-25 01:52:27 +02:00
Jörn Friedrich Dreyer fd5af9aff4 Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support 2012-08-25 00:06:20 +02:00
Jörn Friedrich Dreyer c8255a170c Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
Conflicts:
	3rdparty/Sabre/CardDAV/Plugin.php
	3rdparty/smb4php/smb.php
	apps/bookmarks/ajax/addBookmark.php
	apps/bookmarks/ajax/editBookmark.php
	apps/bookmarks/appinfo/migrate.php
	apps/calendar/ajax/calendar/edit.form.php
	apps/calendar/ajax/changeview.php
	apps/calendar/ajax/import/import.php
	apps/calendar/ajax/settings/guesstimezone.php
	apps/calendar/ajax/settings/setfirstday.php
	apps/calendar/ajax/settings/settimeformat.php
	apps/calendar/ajax/share/changepermission.php
	apps/calendar/ajax/share/share.php
	apps/calendar/ajax/share/unshare.php
	apps/calendar/appinfo/app.php
	apps/calendar/appinfo/remote.php
	apps/calendar/appinfo/update.php
	apps/calendar/appinfo/version
	apps/calendar/js/calendar.js
	apps/calendar/l10n/da.php
	apps/calendar/l10n/de.php
	apps/calendar/l10n/fi_FI.php
	apps/calendar/l10n/gl.php
	apps/calendar/l10n/he.php
	apps/calendar/l10n/hr.php
	apps/calendar/l10n/ja_JP.php
	apps/calendar/l10n/lb.php
	apps/calendar/l10n/lt_LT.php
	apps/calendar/l10n/nb_NO.php
	apps/calendar/l10n/pl.php
	apps/calendar/l10n/pt_PT.php
	apps/calendar/l10n/ro.php
	apps/calendar/l10n/ru.php
	apps/calendar/l10n/sv.php
	apps/calendar/l10n/zh_CN.php
	apps/calendar/l10n/zh_TW.php
	apps/calendar/lib/app.php
	apps/calendar/lib/calendar.php
	apps/calendar/lib/object.php
	apps/calendar/lib/share.php
	apps/calendar/templates/part.choosecalendar.rowfields.php
	apps/calendar/templates/part.import.php
	apps/calendar/templates/settings.php
	apps/contacts/ajax/activation.php
	apps/contacts/ajax/addressbook/delete.php
	apps/contacts/ajax/contact/add.php
	apps/contacts/ajax/contact/addproperty.php
	apps/contacts/ajax/contact/delete.php
	apps/contacts/ajax/contact/deleteproperty.php
	apps/contacts/ajax/contact/saveproperty.php
	apps/contacts/ajax/createaddressbook.php
	apps/contacts/ajax/cropphoto.php
	apps/contacts/ajax/currentphoto.php
	apps/contacts/ajax/importaddressbook.php
	apps/contacts/ajax/oc_photo.php
	apps/contacts/ajax/savecrop.php
	apps/contacts/ajax/selectaddressbook.php
	apps/contacts/ajax/updateaddressbook.php
	apps/contacts/ajax/uploadimport.php
	apps/contacts/ajax/uploadphoto.php
	apps/contacts/appinfo/migrate.php
	apps/contacts/appinfo/remote.php
	apps/contacts/css/contacts.css
	apps/contacts/import.php
	apps/contacts/index.php
	apps/contacts/js/contacts.js
	apps/contacts/l10n/ca.php
	apps/contacts/l10n/cs_CZ.php
	apps/contacts/l10n/da.php
	apps/contacts/l10n/de.php
	apps/contacts/l10n/el.php
	apps/contacts/l10n/eo.php
	apps/contacts/l10n/es.php
	apps/contacts/l10n/et_EE.php
	apps/contacts/l10n/eu.php
	apps/contacts/l10n/fa.php
	apps/contacts/l10n/fi_FI.php
	apps/contacts/l10n/fr.php
	apps/contacts/l10n/he.php
	apps/contacts/l10n/hr.php
	apps/contacts/l10n/hu_HU.php
	apps/contacts/l10n/ia.php
	apps/contacts/l10n/it.php
	apps/contacts/l10n/ja_JP.php
	apps/contacts/l10n/ko.php
	apps/contacts/l10n/lb.php
	apps/contacts/l10n/mk.php
	apps/contacts/l10n/nb_NO.php
	apps/contacts/l10n/nl.php
	apps/contacts/l10n/pl.php
	apps/contacts/l10n/pt_BR.php
	apps/contacts/l10n/pt_PT.php
	apps/contacts/l10n/ro.php
	apps/contacts/l10n/ru.php
	apps/contacts/l10n/sk_SK.php
	apps/contacts/l10n/sl.php
	apps/contacts/l10n/sv.php
	apps/contacts/l10n/th_TH.php
	apps/contacts/l10n/tr.php
	apps/contacts/l10n/zh_CN.php
	apps/contacts/l10n/zh_TW.php
	apps/contacts/lib/addressbook.php
	apps/contacts/lib/hooks.php
	apps/contacts/lib/vcard.php
	apps/contacts/photo.php
	apps/contacts/templates/part.contact.php
	apps/contacts/templates/part.contacts.php
	apps/contacts/templates/part.cropphoto.php
	apps/contacts/templates/part.importaddressbook.php
	apps/contacts/templates/part.selectaddressbook.php
	apps/contacts/thumbnail.php
	apps/files/ajax/download.php
	apps/files/ajax/newfile.php
	apps/files/ajax/timezone.php
	apps/files/appinfo/update.php
	apps/files/appinfo/version
	apps/files/index.php
	apps/files/js/fileactions.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/l10n/ar.php
	apps/files/l10n/bg_BG.php
	apps/files/l10n/ca.php
	apps/files/l10n/cs_CZ.php
	apps/files/l10n/da.php
	apps/files/l10n/de.php
	apps/files/l10n/el.php
	apps/files/l10n/eo.php
	apps/files/l10n/es.php
	apps/files/l10n/et_EE.php
	apps/files/l10n/eu.php
	apps/files/l10n/fa.php
	apps/files/l10n/fi_FI.php
	apps/files/l10n/fr.php
	apps/files/l10n/gl.php
	apps/files/l10n/he.php
	apps/files/l10n/hr.php
	apps/files/l10n/hu_HU.php
	apps/files/l10n/ia.php
	apps/files/l10n/id.php
	apps/files/l10n/it.php
	apps/files/l10n/ja_JP.php
	apps/files/l10n/ko.php
	apps/files/l10n/lb.php
	apps/files/l10n/lt_LT.php
	apps/files/l10n/mk.php
	apps/files/l10n/ms_MY.php
	apps/files/l10n/nb_NO.php
	apps/files/l10n/nl.php
	apps/files/l10n/nn_NO.php
	apps/files/l10n/pl.php
	apps/files/l10n/pt_BR.php
	apps/files/l10n/pt_PT.php
	apps/files/l10n/ro.php
	apps/files/l10n/ru.php
	apps/files/l10n/sk_SK.php
	apps/files/l10n/sl.php
	apps/files/l10n/sr.php
	apps/files/l10n/sr@latin.php
	apps/files/l10n/sv.php
	apps/files/l10n/th_TH.php
	apps/files/l10n/tr.php
	apps/files/l10n/uk.php
	apps/files/l10n/zh_CN.php
	apps/files/l10n/zh_TW.php
	apps/files_archive/js/archive.js
	apps/files_encryption/lib/cryptstream.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/tests/proxy.php
	apps/files_external/appinfo/app.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/streamwrapper.php
	apps/files_external/tests/config.php
	apps/files_external/tests/smb.php
	apps/files_sharing/ajax/email.php
	apps/files_sharing/ajax/getitem.php
	apps/files_sharing/ajax/setpermissions.php
	apps/files_sharing/ajax/share.php
	apps/files_sharing/ajax/toggleresharing.php
	apps/files_sharing/ajax/unshare.php
	apps/files_sharing/ajax/userautocomplete.php
	apps/files_sharing/js/settings.js
	apps/files_sharing/js/share.js
	apps/files_sharing/lib_share.php
	apps/files_sharing/settings.php
	apps/files_sharing/sharedstorage.php
	apps/files_sharing/templates/settings.php
	apps/files_versions/ajax/rollbackVersion.php
	apps/files_versions/versions.php
	apps/gallery/ajax/thumbnail.php
	apps/gallery/appinfo/app.php
	apps/gallery/appinfo/update.php
	apps/gallery/appinfo/version
	apps/gallery/css/styles.css
	apps/gallery/index.php
	apps/gallery/js/pictures.js
	apps/gallery/l10n/ca.php
	apps/gallery/l10n/cs_CZ.php
	apps/gallery/l10n/de.php
	apps/gallery/l10n/el.php
	apps/gallery/l10n/es.php
	apps/gallery/l10n/fi_FI.php
	apps/gallery/l10n/fr.php
	apps/gallery/l10n/it.php
	apps/gallery/l10n/pl.php
	apps/gallery/l10n/pt_PT.php
	apps/gallery/l10n/ru.php
	apps/gallery/l10n/sl.php
	apps/gallery/l10n/sv.php
	apps/gallery/l10n/th_TH.php
	apps/gallery/l10n/tr.php
	apps/gallery/l10n/zh_CN.php
	apps/gallery/lib/album.php
	apps/gallery/lib/hooks_handlers.php
	apps/gallery/lib/managers.php
	apps/gallery/lib/photo.php
	apps/gallery/lib/tiles.php
	apps/gallery/lib/tiles_test.php
	apps/gallery/templates/index.php
	apps/media/lib_ampache.php
	apps/media/lib_collection.php
	apps/media/lib_media.php
	apps/remoteStorage/lib_remoteStorage.php
	apps/tasks/ajax/addtaskform.php
	apps/tasks/ajax/edittask.php
	apps/user_ldap/appinfo/update.php
	apps/user_ldap/group_ldap.php
	apps/user_ldap/lib_ldap.php
	apps/user_ldap/settings.php
	apps/user_ldap/templates/settings.php
	apps/user_ldap/user_ldap.php
	apps/user_migrate/appinfo/app.php
	apps/user_migrate/templates/settings.php
	apps/user_webfinger/host-meta.php
	config/config.sample.php
	core/js/js.js
	core/l10n/da.php
	core/l10n/de.php
	core/l10n/fi_FI.php
	core/l10n/gl.php
	core/l10n/he.php
	core/l10n/hr.php
	core/l10n/id.php
	core/l10n/ja_JP.php
	core/l10n/lb.php
	core/l10n/lt_LT.php
	core/l10n/nb_NO.php
	core/l10n/pl.php
	core/l10n/pt_PT.php
	core/l10n/ro.php
	core/l10n/ru.php
	core/l10n/sv.php
	core/lostpassword/index.php
	core/templates/layout.user.php
	core/templates/login.php
	db_structure.xml
	index.php
	l10n/af/calendar.po
	l10n/af/contacts.po
	l10n/af/core.po
	l10n/af/files.po
	l10n/af/settings.po
	l10n/ar/calendar.po
	l10n/ar/contacts.po
	l10n/ar/core.po
	l10n/ar/files.po
	l10n/ar/media.po
	l10n/ar/settings.po
	l10n/bg_BG/calendar.po
	l10n/bg_BG/contacts.po
	l10n/bg_BG/core.po
	l10n/bg_BG/files.po
	l10n/bg_BG/media.po
	l10n/bg_BG/settings.po
	l10n/ca/calendar.po
	l10n/ca/contacts.po
	l10n/ca/core.po
	l10n/ca/files.po
	l10n/ca/gallery.po
	l10n/ca/settings.po
	l10n/cs_CZ/calendar.po
	l10n/cs_CZ/contacts.po
	l10n/cs_CZ/core.po
	l10n/cs_CZ/files.po
	l10n/cs_CZ/gallery.po
	l10n/cs_CZ/settings.po
	l10n/da/calendar.po
	l10n/da/contacts.po
	l10n/da/core.po
	l10n/da/files.po
	l10n/da/settings.po
	l10n/de/calendar.po
	l10n/de/contacts.po
	l10n/de/core.po
	l10n/de/files.po
	l10n/de/gallery.po
	l10n/de/settings.po
	l10n/el/calendar.po
	l10n/el/contacts.po
	l10n/el/core.po
	l10n/el/files.po
	l10n/el/gallery.po
	l10n/el/settings.po
	l10n/eo/calendar.po
	l10n/eo/contacts.po
	l10n/eo/core.po
	l10n/eo/files.po
	l10n/eo/media.po
	l10n/eo/settings.po
	l10n/es/calendar.po
	l10n/es/contacts.po
	l10n/es/core.po
	l10n/es/files.po
	l10n/es/gallery.po
	l10n/es/settings.po
	l10n/et_EE/calendar.po
	l10n/et_EE/contacts.po
	l10n/et_EE/core.po
	l10n/et_EE/files.po
	l10n/et_EE/settings.po
	l10n/eu/calendar.po
	l10n/eu/contacts.po
	l10n/eu/core.po
	l10n/eu/files.po
	l10n/eu/settings.po
	l10n/fa/calendar.po
	l10n/fa/contacts.po
	l10n/fa/core.po
	l10n/fa/files.po
	l10n/fa/settings.po
	l10n/fi_FI/calendar.po
	l10n/fi_FI/contacts.po
	l10n/fi_FI/core.po
	l10n/fi_FI/files.po
	l10n/fi_FI/gallery.po
	l10n/fi_FI/settings.po
	l10n/fr/calendar.po
	l10n/fr/contacts.po
	l10n/fr/core.po
	l10n/fr/files.po
	l10n/fr/gallery.po
	l10n/fr/media.po
	l10n/fr/settings.po
	l10n/gl/calendar.po
	l10n/gl/contacts.po
	l10n/gl/core.po
	l10n/gl/files.po
	l10n/gl/settings.po
	l10n/he/calendar.po
	l10n/he/contacts.po
	l10n/he/core.po
	l10n/he/files.po
	l10n/he/settings.po
	l10n/hr/calendar.po
	l10n/hr/contacts.po
	l10n/hr/core.po
	l10n/hr/files.po
	l10n/hr/settings.po
	l10n/hu_HU/calendar.po
	l10n/hu_HU/contacts.po
	l10n/hu_HU/core.po
	l10n/hu_HU/files.po
	l10n/hu_HU/settings.po
	l10n/hy/calendar.po
	l10n/hy/contacts.po
	l10n/hy/core.po
	l10n/hy/files.po
	l10n/hy/settings.po
	l10n/ia/calendar.po
	l10n/ia/contacts.po
	l10n/ia/core.po
	l10n/ia/files.po
	l10n/ia/settings.po
	l10n/id/calendar.po
	l10n/id/contacts.po
	l10n/id/core.po
	l10n/id/files.po
	l10n/id/settings.po
	l10n/it/calendar.po
	l10n/it/contacts.po
	l10n/it/core.po
	l10n/it/files.po
	l10n/it/gallery.po
	l10n/it/settings.po
	l10n/ja_JP/calendar.po
	l10n/ja_JP/contacts.po
	l10n/ja_JP/core.po
	l10n/ja_JP/files.po
	l10n/ja_JP/settings.po
	l10n/ko/calendar.po
	l10n/ko/contacts.po
	l10n/ko/core.po
	l10n/ko/files.po
	l10n/ko/settings.po
	l10n/lb/calendar.po
	l10n/lb/contacts.po
	l10n/lb/core.po
	l10n/lb/files.po
	l10n/lb/settings.po
	l10n/lt_LT/calendar.po
	l10n/lt_LT/contacts.po
	l10n/lt_LT/core.po
	l10n/lt_LT/files.po
	l10n/lt_LT/settings.po
	l10n/mk/calendar.po
	l10n/mk/contacts.po
	l10n/mk/core.po
	l10n/mk/files.po
	l10n/mk/settings.po
	l10n/ms_MY/calendar.po
	l10n/ms_MY/contacts.po
	l10n/ms_MY/core.po
	l10n/ms_MY/files.po
	l10n/ms_MY/settings.po
	l10n/nb_NO/calendar.po
	l10n/nb_NO/contacts.po
	l10n/nb_NO/core.po
	l10n/nb_NO/files.po
	l10n/nb_NO/settings.po
	l10n/nl/calendar.po
	l10n/nl/contacts.po
	l10n/nl/core.po
	l10n/nl/files.po
	l10n/nl/settings.po
	l10n/nn_NO/calendar.po
	l10n/nn_NO/contacts.po
	l10n/nn_NO/core.po
	l10n/nn_NO/files.po
	l10n/nn_NO/settings.po
	l10n/pl/calendar.po
	l10n/pl/contacts.po
	l10n/pl/core.po
	l10n/pl/files.po
	l10n/pl/gallery.po
	l10n/pl/settings.po
	l10n/pt_BR/calendar.po
	l10n/pt_BR/contacts.po
	l10n/pt_BR/core.po
	l10n/pt_BR/files.po
	l10n/pt_BR/settings.po
	l10n/pt_PT/calendar.po
	l10n/pt_PT/contacts.po
	l10n/pt_PT/core.po
	l10n/pt_PT/files.po
	l10n/pt_PT/gallery.po
	l10n/pt_PT/settings.po
	l10n/ro/calendar.po
	l10n/ro/contacts.po
	l10n/ro/core.po
	l10n/ro/files.po
	l10n/ro/settings.po
	l10n/ru/calendar.po
	l10n/ru/contacts.po
	l10n/ru/core.po
	l10n/ru/files.po
	l10n/ru/gallery.po
	l10n/ru/settings.po
	l10n/sk_SK/calendar.po
	l10n/sk_SK/contacts.po
	l10n/sk_SK/core.po
	l10n/sk_SK/files.po
	l10n/sk_SK/settings.po
	l10n/sl/calendar.po
	l10n/sl/contacts.po
	l10n/sl/core.po
	l10n/sl/files.po
	l10n/sl/gallery.po
	l10n/sl/settings.po
	l10n/sr/calendar.po
	l10n/sr/contacts.po
	l10n/sr/core.po
	l10n/sr/files.po
	l10n/sr/settings.po
	l10n/sr@latin/calendar.po
	l10n/sr@latin/contacts.po
	l10n/sr@latin/core.po
	l10n/sr@latin/files.po
	l10n/sr@latin/settings.po
	l10n/sv/calendar.po
	l10n/sv/contacts.po
	l10n/sv/core.po
	l10n/sv/files.po
	l10n/sv/gallery.po
	l10n/sv/media.po
	l10n/sv/settings.po
	l10n/templates/bookmarks.pot
	l10n/templates/calendar.pot
	l10n/templates/contacts.pot
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/gallery.pot
	l10n/templates/media.pot
	l10n/templates/settings.pot
	l10n/th_TH/calendar.po
	l10n/th_TH/contacts.po
	l10n/th_TH/core.po
	l10n/th_TH/files.po
	l10n/th_TH/gallery.po
	l10n/th_TH/settings.po
	l10n/tr/calendar.po
	l10n/tr/contacts.po
	l10n/tr/core.po
	l10n/tr/files.po
	l10n/tr/gallery.po
	l10n/tr/settings.po
	l10n/uk/calendar.po
	l10n/uk/contacts.po
	l10n/uk/core.po
	l10n/uk/files.po
	l10n/uk/media.po
	l10n/uk/settings.po
	l10n/zh_CN/calendar.po
	l10n/zh_CN/contacts.po
	l10n/zh_CN/core.po
	l10n/zh_CN/files.po
	l10n/zh_CN/gallery.po
	l10n/zh_CN/settings.po
	l10n/zh_TW/calendar.po
	l10n/zh_TW/contacts.po
	l10n/zh_TW/core.po
	l10n/zh_TW/files.po
	l10n/zh_TW/settings.po
	lib/app.php
	lib/base.php
	lib/connector/sabre/file.php
	lib/connector/sabre/locks.php
	lib/connector/sabre/node.php
	lib/db.php
	lib/filecache.php
	lib/fileproxy/quota.php
	lib/files.php
	lib/filestorage/local.php
	lib/filesystemview.php
	lib/group/database.php
	lib/helper.php
	lib/installer.php
	lib/json.php
	lib/l10n.php
	lib/migrate.php
	lib/mimetypes.fixlist.php
	lib/ocs.php
	lib/preferences.php
	lib/public/json.php
	lib/public/util.php
	lib/template.php
	lib/user.php
	lib/user/database.php
	lib/util.php
	lib/vcategories.php
	ocs/providers.php
	settings/admin.php
	settings/ajax/lostpassword.php
	settings/ajax/removeuser.php
	settings/ajax/setbackgroundjobsmode.php
	settings/ajax/setlanguage.php
	settings/ajax/setquota.php
	settings/ajax/togglegroups.php
	settings/apps.php
	settings/css/settings.css
	settings/js/apps.js
	settings/js/users.js
	settings/l10n/bg_BG.php
	settings/l10n/ca.php
	settings/l10n/cs_CZ.php
	settings/l10n/da.php
	settings/l10n/de.php
	settings/l10n/el.php
	settings/l10n/eo.php
	settings/l10n/es.php
	settings/l10n/et_EE.php
	settings/l10n/eu.php
	settings/l10n/fa.php
	settings/l10n/fi_FI.php
	settings/l10n/fr.php
	settings/l10n/gl.php
	settings/l10n/he.php
	settings/l10n/hr.php
	settings/l10n/hu_HU.php
	settings/l10n/it.php
	settings/l10n/ja_JP.php
	settings/l10n/ko.php
	settings/l10n/lt_LT.php
	settings/l10n/mk.php
	settings/l10n/ms_MY.php
	settings/l10n/nb_NO.php
	settings/l10n/nl.php
	settings/l10n/nn_NO.php
	settings/l10n/pl.php
	settings/l10n/pt_BR.php
	settings/l10n/pt_PT.php
	settings/l10n/ru.php
	settings/l10n/sk_SK.php
	settings/l10n/sl.php
	settings/l10n/sv.php
	settings/l10n/th_TH.php
	settings/l10n/tr.php
	settings/l10n/zh_CN.php
	settings/personal.php
	settings/templates/admin.php
	settings/templates/users.php
2012-08-25 00:05:07 +02:00
Michael Gapczynski 36487246ed Switch to using file cache ids instead of paths for file sharing 2012-08-24 10:05:37 -04:00
jfd 0c0ae928dc escape all identifiers with backticks 2012-08-24 15:08:57 +02:00
Frank Karlitschek f86f4c8bfd 4.0.7
and remove some ^M while at it
2012-08-24 15:00:53 +02:00
Michael Gapczynski 12df81fe0b Check blacklist when renaming files 2012-08-24 15:00:52 +02:00
Lukas Reschke 5cb2d58c9f Also check some other files 2012-08-24 15:00:52 +02:00
Jakob Sack 1dfa6f3d8f Fix OC_Connector_Sabre_Locks for SQLite 2012-08-24 15:00:52 +02:00
Bjoern Schiessle 0ac8434670 fix for bug 879 - add parent directory to file cache if it does not exist yet.
For example this can happen if the sync client is used before the user created the root directory (e.g. through web login).
2012-08-24 14:58:47 +02:00
Jenkins for ownCloud 07a889631e [tx-robot] updated from transifex 2012-08-24 02:07:18 +02:00
Thomas Tanghus c90c358f0d Only load js and css once. 2012-08-23 05:02:30 +02:00
Jenkins for ownCloud 082ed4ab71 [tx-robot] updated from transifex 2012-08-23 02:07:35 +02:00
Michael Gapczynski 885b8c481b Check if files_sharing app is enabled, move file specific javascript to files_sharing app 2012-08-22 12:32:07 -04:00
Michael Gapczynski 3debb67458 Move share CSS to core, add script and style from inside Share API 2012-08-22 11:57:58 -04:00
Michael Gapczynski 9699ff03bd Revert using item name, no longer allowing the same item source exist for a user 2012-08-22 11:57:58 -04:00
Jenkins for ownCloud e6d87b2c4b [tx-robot] updated from transifex 2012-08-22 02:08:16 +02:00
Frank Karlitschek 1d7018158e 4.5 alpha 1 2012-08-21 18:47:26 +02:00
Michael Gapczynski 09e851a9c4 Fix share ajax calls to use itemName/itemSource, show who shared a file with you 2012-08-20 21:22:22 -04:00
Michael Gapczynski cb0464ca4e Bump version number for Share API 2012-08-19 22:36:19 -04:00
Michael Gapczynski 82d81e8d39 Merge branch 'share_api'
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files/index.php
	lib/files.php
2012-08-19 22:29:01 -04:00
Michael Gapczynski 5eca531f99 Refactor again so we can tell what item is being reshared in case the same source shows up. This is the end of the share_api branch, moving to master. 2012-08-19 22:14:38 -04:00
Michael Gapczynski f987e22d85 Large refactoring to allow for the same item to be shared to a group and again with a user in the group with different permissions 2012-08-19 16:30:38 -04:00
Robin Appelman 50cc5d5921 fix creating nested folders inside tar files 2012-08-19 05:54:16 +02:00
Robin Appelman 3da1339cd8 fix error when adding string data to an archive 2012-08-19 05:04:58 +02:00
Robin Appelman 154ce0f68d also add getLocalFolder to OC_Filsystem and OC_FilesystemView 2012-08-19 02:42:15 +02:00
Robin Appelman 9b44d0cb32 add OC_FileStorage::getLocalFolder 2012-08-19 02:30:33 +02:00
Robin Appelman 5962469892 add OC_Archive::addRecursive 2012-08-18 22:42:35 +02:00
Frank Karlitschek 850ee93711 add impress mimetype 2012-08-17 12:39:05 +02:00
Robin Appelman 53a888cc81 more path normalization 2012-08-17 01:22:54 +02:00
Michael Gapczynski df8a2e5361 File sharing cleanup, works perfectly I think :) 2012-08-16 12:20:14 -04:00
Jenkins for ownCloud 1e6dc67517 [tx-robot] updated from transifex 2012-08-16 02:09:15 +02:00
Michael Gapczynski 9cb3113f42 Fix problems exposed by tests 2012-08-15 11:59:08 -04:00
Michael Gapczynski 137e4cb342 Add tests for Share API, all tests passing :) 2012-08-15 11:55:54 -04:00
Bart Visscher 63af75586b Merge branch 'master' into routing 2012-08-15 17:39:00 +02:00
Bjoern Schiessle d039f11905 provide ocs calls and keymanager functions to get/set both keys (private, public) of a user together 2012-08-15 13:18:11 +02:00
Jenkins for ownCloud da3896808a [tx-robot] updated from transifex 2012-08-15 02:07:20 +02:00
Michael Gapczynski ddfa760a5e Change to correct function call getItemSharedWithBySource() 2012-08-14 17:06:41 -04:00
Michael Gapczynski b440dfc67e Remove setTarget() function, changing target names only leads to confusion 2012-08-14 17:05:38 -04:00
Michael Gapczynski 9661a63a72 Ensure permissions can't be escalated during a reshare 2012-08-14 16:54:38 -04:00
Michael Gapczynski 028c79fc9d Use if instead of switch for detecting share type and throw exceptions when setting permissions 2012-08-14 16:30:13 -04:00
Michael Gapczynski 937d1b29d8 Retrieve all file dependent items when looking for file item type 2012-08-14 11:02:29 -04:00
Michael Gapczynski 4c7fd8cd01 Merge branch 'master' into share_api
Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php
2012-08-14 10:22:13 -04:00
Robin Appelman 1522f7f211 fix some minor problems with path noramlization 2012-08-14 03:07:14 +02:00
Robin Appelman 0c8ce0bb32 some basic path normalization 2012-08-14 02:44:45 +02:00
Michael Gapczynski 863d3a43b2 Catch exceptions and write to log when creating storage object fails 2012-08-13 17:10:58 -04:00
Bjoern Schiessle 34f93ac765 check if user has write access to a given file before updating the filekey 2012-08-13 11:31:15 +02:00
Lukas Reschke e72a57f595 Also check for some other files 2012-08-13 00:57:01 +02:00
Michael Gapczynski 64ef1e2181 Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a constructor... 2012-08-12 14:49:41 -04:00
Bart Visscher 16dacba490 Routing: And start using them from php 2012-08-12 16:53:00 +02:00
Bart Visscher db4111f6d5 Routing: Add some core routes 2012-08-12 16:52:36 +02:00
Bart Visscher 8c02494744 Routing: Prepare load funtions to be called from OC_Router 2012-08-12 16:16:22 +02:00
Jakob Sack 4d3d4522f9 Backgroundjobs: Fix wrong var names 2012-08-12 12:14:27 +02:00
Jakob Sack deef1f73db Backgroundjobs: fix bug in QueuedTask 2012-08-12 09:02:20 +02:00
Michael Gapczynski a1c88a3e39 Add search, limit, offset parameters to usersInGroups() 2012-08-11 16:25:28 -04:00
Michael Gapczynski 4f1b3631ba Change limit parameter in OC_User as well 2012-08-11 16:25:28 -04:00
Michael Gapczynski 874f31b8d7 Make getting all users and groups the default 2012-08-11 16:25:27 -04:00
Michael Gapczynski 8d1eb674ec Add search, limit, and offset parameters to getUsers() and getGroups() 2012-08-11 16:25:27 -04:00
Jakob Sack 1d7e3071e0 bump version to reate new tables 2012-08-11 17:32:17 +02:00
Lukas Reschke 0d8df3f55c Revert "Combine install checks in lib/base.php"
This reverts commit aa9fbf6639.
2012-08-11 17:07:35 +02:00
Michael Gapczynski 465767670b Check blacklist when renaming files 2012-08-11 11:04:04 -04:00
Bart Visscher 1025e451a7 Add router match to OC::handleRequest 2012-08-11 01:36:16 +02:00
Bart Visscher 1763de08d0 Routing: Fix construction of RequestContext 2012-08-11 00:57:46 +02:00
Bart Visscher c2160433cd Merge branch 'master' into routing
Conflicts:
	lib/base.php
2012-08-11 00:43:26 +02:00
Bart Visscher 87d1cdb945 Fix for running doing routing in lib/ocs.php 2012-08-11 00:04:43 +02:00
Bart Visscher f63b9b44d8 Routing: combine all routes into one set 2012-08-10 23:31:21 +02:00
Bart Visscher 72b2324b68 Move loading of routes to OC::getRouter function 2012-08-10 23:31:11 +02:00
Bart Visscher 3722928c46 Change access to router object to getter function 2012-08-10 23:30:04 +02:00
Bart Visscher ca1454ab1a Routing: Method needs to be uppercase 2012-08-10 23:27:58 +02:00
Bart Visscher 3e8b6e816a Create OC_Router in OC::init 2012-08-10 23:03:57 +02:00
Bart Visscher 9e80f0954d Add loading of routes in OC_Router 2012-08-10 23:03:19 +02:00
Lukas Reschke 8ec45870a3 Validate cookie properly and prevent auth bypass
BIG (!) thanks to Julien CAYSSOL
2012-08-10 15:28:59 +02:00
Jakob Sack 0ea4fa298c Backgroundjobs: don't try to access OC_Appconfig if ownCloud has not been installed 2012-08-10 13:53:40 +02:00
Jakob Sack 81b997b56e Merge branch 'backgroundjobs' 2012-08-10 13:00:51 +02:00
Bart Visscher 82b10954e7 Simplify loading app php script files 2012-08-10 12:27:37 +02:00
Bart Visscher 5e7086adc9 Move login handling to OC class 2012-08-10 12:17:13 +02:00
Bart Visscher 83403784d1 Always load when the requested file is css 2012-08-10 11:43:04 +02:00
Bart Visscher da07245f59 Move OC::loadfile and OC::loadapp next to OC::handleRequest 2012-08-10 11:43:04 +02:00
Bart Visscher e3c732040b Make OC::loadfile and OC::loadapp protected, only used in OC::handleRequest 2012-08-10 11:43:04 +02:00
Bart Visscher 0973969386 Cleanup OC::loadfile 2012-08-10 11:43:04 +02:00
Bart Visscher 667cd318fe Use OC_Util::displayLoginPage and cleanup the function 2012-08-10 11:43:04 +02:00
Bart Visscher aa9fbf6639 Combine install checks in lib/base.php 2012-08-10 11:43:04 +02:00
Jakob Sack f46fdfd814 Backgroundjobs: Add reset counter in worker 2012-08-09 22:30:11 +02:00
Jakob Sack a6a1f892f0 BackgroundJobs: fix bug 2012-08-09 22:07:18 +02:00
Michael Gapczynski be03ee29f0 Bump up version number 2012-08-09 13:55:36 -04:00
Jakob Sack 28c1ec19ea BackgroundJob: forgot to rename file 2012-08-09 19:26:49 +02:00
Jakob Sack ceda0ae052 Backgroundjobs: rename ScheduledTask to QueuedTask 2012-08-09 19:04:04 +02:00
Michael Gapczynski 78cd1153f0 Merge branch 'master' into share_api
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files_sharing/sharedstorage.php
2012-08-09 11:38:22 -04:00
Robin Appelman acd8381094 fix scanning of archives in some cases 2012-08-09 16:36:16 +02:00
Georg Ehrke 10d0861872 remove unstable lib 2012-08-09 12:37:26 +02:00
Jakob Sack 889f0a1c6d rename appconfig keys for backgroundjobs 2012-08-09 10:40:39 +02:00
Michael Gapczynski b830b3e24b Start adding permission checks for addressbooks 2012-08-08 21:43:02 -04:00
Michael Gapczynski 2c5744f16c Add back getItemSharedWithBySource(), some situtations require this ability 2012-08-08 20:56:55 -04:00
Jakob Sack 37ee88aa6d Fixed bug in OC_BackgroundJob_Worker 2012-08-09 01:29:15 +02:00
Jakob Sack 13a0818fec Be more precise regarding backgroundjobs mode 2012-08-09 01:02:05 +02:00
Jakob Sack 4107273a79 fix license text 2012-08-09 00:46:50 +02:00
Jakob Sack 088b3ea0bc Add public interface to background jobs 2012-08-09 00:01:06 +02:00
Jakob Sack 443e198224 Renaming backgroundjobs on file system as well 2012-08-09 00:00:12 +02:00
Jakob Sack 6025d2ebc3 Rename Backgroundjobs to BackgroundJob 2012-08-08 23:59:30 +02:00
Jakob Sack 4f90860001 Add initial version of backgroundjobs library 2012-08-08 23:39:30 +02:00
Bart Visscher 3387454094 Move login code from index.php to OC class 2012-08-08 22:42:51 +02:00
Bart Visscher 9156fb73fd Move handling request of index.php to OC class 2012-08-08 22:42:50 +02:00
Bart Visscher 7522a23693 Remove unused RUNTIME_NOSETUPFS var 2012-08-08 22:42:50 +02:00
Bjoern Schiessle d4974b6d4a set default dependencies in keymanager.php
fix calls in ocs.php
2012-08-08 14:15:35 +02:00
Bjoern Schiessle 0bf2a3e6d6 while loop not needed because of recursive call of put() 2012-08-08 11:29:44 +02:00
Bjoern Schiessle dc927bd346 fix for bug 879 - add parent directory to file cache if it does not exist yet.
This can happen if the sync client is used before user created the root directory (e.g. through web login) for example.
2012-08-08 10:51:19 +02:00
Bart Visscher b287b11ff2 adjust the query generation in getItems, to use placeholders 2012-08-07 21:49:31 +02:00
Michael Gapczynski 3533f43d12 Implement groupExists in group database backend 2012-08-07 14:48:55 -04:00
Bart Visscher 31003b475e Decode the alternative path_info 2012-08-07 20:43:00 +02:00
Bart Visscher 7d20e98aec Move getting the path info to OC_Request 2012-08-07 20:43:00 +02:00
Bart Visscher 34c076e2a8 Add comments the other functions in OC_Request 2012-08-07 20:43:00 +02:00
Bart Visscher 99ce7ba1df Move serverHost and serverProtocol functions to OC_Request 2012-08-07 20:43:00 +02:00
Bart Visscher c4f1a1de5b Added function to make url absolute 2012-08-07 20:43:00 +02:00
Bart Visscher 6d0390dcca Fix rewriting GET parameters with ? in REQUESTEDAPP 2012-08-07 20:43:00 +02:00
Michael Gapczynski 8d56c42fde Add search and limit to getGroups search in groupExists implementation 2012-08-07 14:42:11 -04:00
Michael Gapczynski b6bbbb4c47 Remove undefined return variable 2012-08-07 14:38:02 -04:00
Michael Gapczynski a96a75c263 Select the correct column when searching for similar targets 2012-08-06 16:48:20 -04:00
Michael Gapczynski 5e95e2a131 Set filePath variable 2012-08-06 16:46:44 -04:00
Michael Gapczynski 1b21cde2b3 Throw more exceptions 2012-08-06 16:37:51 -04:00
Michael Gapczynski 14d13a740f Load icons for addressbooks, fix statuses for types other than files 2012-08-06 15:24:08 -04:00
Michael Gapczynski e954de6030 Make the file source path relative earlier 2012-08-06 14:15:37 -04:00
Michael Gapczynski e280e3ecc9 Throw more exceptions 2012-08-06 14:09:58 -04:00
Michael Gapczynski 1db1d40414 Add additional check for post_deleteUser so we don't delete any non-user shares with the same name 2012-08-06 13:58:26 -04:00
Michael Gapczynski ea23854328 Merge branch 'master' into share_api
Conflicts:
	apps/contacts/lib/app.php
	apps/contacts/templates/part.chooseaddressbook.rowfields.php
2012-08-06 13:49:54 -04:00
Bart Visscher fe6450002d Change hardcoded urls to use linkTo function 2012-08-06 18:51:41 +02:00
Michael Gapczynski 3b2c853916 Lots of refactoring to share API 2012-08-06 11:27:13 -04:00
Thomas Tanghus cc445e4e47 Small changes to allow updating main menu dynamically. 2012-08-05 01:42:17 +02:00
Thomas Tanghus 3b37181550 Use correct variable name. 2012-08-04 21:25:41 +02:00
Alessandro Cosentino a6ce497dd9 OC_App::getAppVersion return blank if version is not specified 2012-08-04 13:39:36 -04:00
Jenkins for ownCloud d7e77f6426 [tx-robot] updated from transifex 2012-08-04 02:04:21 +02:00
Michael Gapczynski 09bb3bfaf8 Preparing for proper collection implementation 2012-08-03 15:05:45 -04:00
Georg Ehrke fc4a542dd0 add iWork mimetypes 2012-08-03 20:06:29 +02:00
Tom Needham 21f8646ffc API: Fix merging of responses. Return 400 error when no OAuth operation sent. 2012-08-03 15:20:01 +00:00
Bart Visscher e36e00dc00 Merge branch 'chunked_upload' 2012-08-03 15:58:17 +02:00
Tom Needham 6047a5fe51 API: Check if the consumer has permissions to access the requested method 2012-08-03 11:56:11 +00:00
Bjoern Schiessle 773d7b119d OCS api calls cleanup 2012-08-03 13:52:41 +02:00
Tom Needham a7906d813a Move OAuth classes into lib/oauth 2012-08-03 11:47:05 +00:00
Bjoern Schiessle d5808f07ca return a list of all public keys for a given file 2012-08-03 11:49:55 +02:00
Jenkins for ownCloud 7dc799c167 [tx-robot] updated from transifex 2012-08-03 02:04:12 +02:00
Michael Gapczynski e3d88270cc OAuth server implementation using oauth library 2012-08-02 20:02:31 -04:00
Bart Visscher 4b9200f6f7 Routing: combine all routes into one set 2012-08-02 21:51:31 +02:00
Bart Visscher 6ba2623485 Move loading of routes to OC::getRouter function 2012-08-02 21:44:58 +02:00
Bart Visscher 37ef522b05 Quick fix for xml encoding arrays 2012-08-02 17:48:09 +02:00
Bart Visscher 7952c6a31c Change access to router object to getter function 2012-08-02 17:47:38 +02:00
Michael Gapczynski 6c7baacf89 Throw exception for items already shared in a collection 2012-08-01 20:08:18 -04:00
Michael Gapczynski 92d683587a Fix contact email share type redirection 2012-08-01 17:52:59 -04:00
Michael Gapczynski 4933128850 Throw exceptions in share API for UI to display 2012-08-01 17:52:29 -04:00
Michael Gapczynski 2201074e1f Basic setup for sharing with contacts 2012-08-01 17:17:28 -04:00
Jörn Friedrich Dreyer 14c5d08a3f reorder code for readability 2012-08-01 22:38:27 +02:00
Bart Visscher 93daa9e247 API: Complete respond function 2012-08-01 19:48:51 +02:00
Tom Needham c11c2d0fd4 Logout the user at the end of a call to be stateless 2012-08-01 13:39:05 +00:00
Tom Needham 2afe5f9b2b API: add OC_API::checkLoggedIn() 2012-08-01 13:37:00 +00:00
Jörn Friedrich Dreyer c7be0db853 use dbname for non privileged user 2012-08-01 15:00:54 +02:00
Jörn Friedrich Dreyer ab976863ae fix sql 2012-08-01 15:00:07 +02:00
Jörn Friedrich Dreyer e13f381189 add limit support to OC_DB & OCP/DB 2012-08-01 14:59:08 +02:00
Tom Needham e315384b4d Remove unnecessary include 2012-08-01 10:40:09 +01:00
Tom Needham e7f7693b2f Fix 3rdparty paths, initialise OAuth in correct order 2012-08-01 10:21:33 +01:00
Michael Gapczynski b6aa5d2875 Include contacts in share with search 2012-07-31 21:05:00 -04:00
Jakob Sack 1fe9892292 Fix #476 2012-07-31 23:31:25 +02:00
Bart Visscher 7426217e76 Fix /privatedata/getattribute route 2012-07-31 23:26:15 +02:00
Jenkins for ownCloud 36ccaf51ed [tx-robot] updated from transifex 2012-07-31 22:57:24 +02:00
Bart Visscher 71918a820f API: set request method for registered urls 2012-07-31 22:34:35 +02:00
Bart Visscher 9d6a09f589 Routing: Method needs to be uppercase 2012-07-31 22:33:11 +02:00
Bart Visscher 28537037ae Fixup OCS modules 2012-07-31 22:19:11 +02:00
Bart Visscher c2bdb5c716 Fix require 3rdpartypath 2012-07-31 22:18:16 +02:00
Michael Gapczynski 94ce8f2168 Merge branch 'master' into share_api
Conflicts:
	apps/contacts/lib/app.php
	apps/files_sharing/js/share.js
2012-07-31 15:00:04 -04:00
Michael Gapczynski 9e4c3b8342 Remove break, it broke the statuses :) 2012-07-31 14:21:46 -04:00
Jörn Friedrich Dreyer 795e78809f add oracle to install & setup 2012-07-31 19:34:30 +02:00
jfd ede464f058 escape all identifiers with backticks 2012-07-31 18:53:05 +02:00
Tom Needham fcf3dbcfc1 Require a username for OC_OAuth::registerConsumer() 2012-07-31 15:02:51 +01:00
Tom Needham ce41f3801e Actually login the user when using OAuth 2012-07-31 14:59:07 +01:00
Tom Needham 78bbcc8aea Basic OAuth class based on oauth-php. WIP 2012-07-31 14:35:07 +01:00
Tom Needham 5922599f48 Handle function not needed in lib/ocs.php 2012-07-31 14:35:07 +01:00
Bjoern Schiessle 9bab06537c update file encryption key over webdav properties for client side encryption 2012-07-31 15:03:28 +02:00
Tom Needham b05639e745 Fix error with namespacing 2012-07-31 10:10:15 +00:00
Tom Needham cc6911e1f7 Make method static 2012-07-31 09:28:12 +00:00
Frank Karlitschek aa60771736 4.0.6 2012-07-31 10:13:10 +02:00
Michael Gapczynski 2f1a990cad Add search, limit, and offset parameters to getUsers() and getGroups() 2012-07-30 20:20:46 -04:00
Jakob Sack 8a92cd21d6 Remove OC_App::register call in OCP\App::register 2012-07-30 21:26:14 +02:00
Bart Visscher 0a9ca42c34 Fix OC_OCS_Privatedata::privateDataGet 2012-07-30 21:19:03 +02:00
Bart Visscher 7a24f0cd8d Make calling ocs/v1.php/config work 2012-07-30 21:19:02 +02:00
Bart Visscher 180bd69dbb Fix OC_API::register 2012-07-30 21:19:02 +02:00
Bart Visscher 95d3b83a77 Create OC_Router in OC::init 2012-07-30 21:19:02 +02:00
Bart Visscher 0271bfa3b7 Move loading of routes to OC_Router 2012-07-30 21:19:02 +02:00
Tom Needham 2f84a8d746 Merge the responses recursively 2012-07-30 16:04:09 +00:00
Tom Needham 3a0e3708a5 Add public class for registering api calls 2012-07-30 14:26:15 +00:00
Michael Gapczynski b9bd54bd98 Add additional error handling for emailing private links 2012-07-30 10:07:20 -04:00
Michael Gapczynski 6b83470c96 Fix incorrect copy/paste for file_put_contents() 2012-07-30 10:07:19 -04:00
Michael Gapczynski 93c75f46e5 Forgot data parameter for file_put_contents() streams pre proxies 2012-07-30 10:07:19 -04:00
Michael Gapczynski ea18d70c60 Run pre and post proxies for file_put_contents() streams
Conflicts:
	lib/filesystemview.php
2012-07-30 10:07:19 -04:00
Michael Gapczynski f328f53ec1 Fix filesystem hash, no longer using basicOperation()
Conflicts:
	lib/filesystemview.php
2012-07-30 10:07:19 -04:00
Michael Gapczynski 099b16350f Delete old session files, suggested by Torben Nehmer, see bug oc-736 2012-07-30 10:07:19 -04:00
Michael Gapczynski 89027545a0 Check if user is already logged in for DAV auth, instead of logging in and creating new sessions for every request 2012-07-30 10:07:18 -04:00
Tom Needham c7c16ac49b Improve merging of api responses 2012-07-30 13:39:06 +00:00
Tom Needham b0dc4383e1 Clean code slightly 2012-07-30 12:57:35 +00:00
Tom Needham b563dff10a Record the app that is registering a call to use later with OAuth 2012-07-30 12:56:01 +00:00
Tom Needham 9ffaea480f Add the format parameter inside OC_API 2012-07-30 12:44:34 +00:00
Tom Needham 9072106048 Move OCS methods to lib/ocs/.php 2012-07-30 12:42:18 +00:00
Tom Needham e33174f115 Add core routes and include them in OC_API::call() 2012-07-30 10:56:21 +00:00
Bjoern Schiessle 1f2aa32d22 url needs to be case sensitive to be able to have files and paths as part of the URL 2012-07-30 12:39:28 +02:00
Bjoern Schiessle 23391b3694 get/set key files, take shared files into account 2012-07-30 12:38:38 +02:00
Bjoern Schiessle e5704bf8bf ocs call to get file key for client side enncryption 2012-07-30 10:07:52 +02:00
Jenkins for ownCloud 3430dcd367 [tx-robot] updated from transifex 2012-07-30 02:05:41 +02:00
Michael Gapczynski 5262cde6a6 Add additional error handling for emailing private links 2012-07-29 18:02:09 -04:00
Tom Needham 0836366d87 Methods to disable and enable users 2012-07-29 16:07:51 +00:00
Tom Needham 038af7e636 Add method to check if an app is shipped or not 2012-07-29 15:29:26 +00:00
Jenkins for ownCloud 18f6552a08 [tx-robot] updated from transifex 2012-07-29 02:06:29 +02:00
Tom Needham 9dbe5f3703 Load routes before calling actions 2012-07-28 21:57:24 +00:00
Tom Needham c375774fca Fix odd indentation issue 2012-07-28 21:50:40 +00:00
Tom Needham 20838bb9c2 Basic structure and functionality of api class 2012-07-28 21:40:11 +00:00
Jenkins for ownCloud fa4052d6f1 [tx-robot] updated from transifex 2012-07-28 02:05:38 +02:00
Bart Visscher 896d27de36 Chunked upload: Support reusing local chunks 2012-07-27 19:35:33 +02:00
Bart Visscher 1ea33ff36b Chunked upload: Refactor OC_FileChunking to object 2012-07-27 19:35:28 +02:00
Bart Visscher 2d85ef0e04 Chunked upload: Refactor to static class 2012-07-27 19:32:44 +02:00
Michael Gapczynski 4c822df28d Fix incorrect copy/paste for file_put_contents() 2012-07-27 09:37:47 -04:00
Bjoern Schiessle f752a27605 write keyfiles to server 2012-07-27 14:00:41 +02:00
Bart Visscher a7a5433108 Merge branch 'master' into chunked_upload
Conflicts:
	lib/connector/sabre/directory.php
2012-07-27 11:40:51 +02:00
Michael Gapczynski ea2e76eecc Forgot data parameter for file_put_contents() streams pre proxies 2012-07-26 23:10:21 -04:00
Michael Gapczynski d006a551f4 Run pre and post proxies for file_put_contents() streams 2012-07-26 22:53:55 -04:00
Georg Ehrke 16928f4d59 fix spelling fail 2012-07-26 18:50:59 +02:00
Bart Visscher d26f87e738 Smarter remove of etag properties for path 2012-07-26 17:56:32 +02:00
Bart Visscher 3725cd079b Fix oc-1362: post_rename has no path param but newpath and oldpath 2012-07-26 17:41:57 +02:00
Bjoern Schiessle bb229f7291 write private/public key from the client to the server 2012-07-26 17:19:55 +02:00
Georg Ehrke e1d14ab461 Merge branch 'master' into subadmin 2012-07-26 16:47:05 +02:00
Georg Ehrke e4679770c4 declare OCP\App::register as deprecated 2012-07-26 15:16:07 +02:00
Georg Ehrke 4e62e121a6 mark OCP\App::register as deprecated 2012-07-26 15:12:57 +02:00
Bjoern Schiessle cb5d935b82 implemented publicKeyGet() and privateKeyGet() calls 2012-07-26 13:57:50 +02:00
Michael Gapczynski 586fe8f940 Change is_writable() call to isUpdatable() 2012-07-25 17:39:28 -04:00
Bart Visscher 783d67be62 Create uniqid ETag for directories 2012-07-25 23:09:03 +02:00
Bart Visscher 381e493a8c Rename functions
getETagPropertyForFile -> getETagPropertyForPath
removeETagPropertyForFile -> removeETagPropertyForPath
2012-07-25 23:09:03 +02:00
Michael Gapczynski 30b58f5677 Merge branch 'master' into share_api
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
2012-07-25 17:08:18 -04:00
Michael Gapczynski f25ccaff59 Fix filesystem hash, no longer using basicOperation() 2012-07-25 16:55:01 -04:00
Michael Gapczynski 4d17ed2f71 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Bart Visscher b3848581bf Small cleanup 2012-07-25 18:00:03 +02:00
Bart Visscher 5a0d476ab1 Convert new actions 2012-07-25 17:59:50 +02:00
Bart Visscher d579defc66 Merge branch 'master' into routing 2012-07-25 17:51:36 +02:00
Bart Visscher ac9dbd4b83 Add functions for the common HTTP methods 2012-07-25 17:45:29 +02:00
Arthur Schiwon eefe6882f9 method not used externally, thus not needed in interface 2012-07-25 12:56:09 +02:00
Arthur Schiwon 6b320a2604 provide recursiveArraySearch as Helper function and make available through API 2012-07-25 12:56:08 +02:00
Arthur Schiwon 57c375ea24 Support for OCA namespace 2012-07-25 12:56:08 +02:00
Arthur Schiwon 81c0ca4ffb remove only internally used function from interface 2012-07-25 12:56:08 +02:00
Arthur Schiwon 0196e6eada Offer User and Group interfaces in public API 2012-07-25 12:56:08 +02:00
Arthur Schiwon e499bc37c8 define an interface for the Group Backend 2012-07-25 12:56:08 +02:00
Arthur Schiwon fdcbc23ed6 define an interface for the User Backend 2012-07-25 12:56:07 +02:00
Michael Gapczynski ede2b8a55f Missed a is_readable() call in local filestorage 2012-07-24 21:17:43 -04:00
Michael Gapczynski f7b89f0475 Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable() 2012-07-24 20:10:28 -04:00
Sam Tuke 9216289856 Wrote new methods for testing if a file is encrypted using AES or Blowfish
Added more unit tests for crypt class
Added new method for generating 16 character pseudo-random initialisation vectors
Started writing new methods for handling legacy keys and en/de/re cryption
Added comments to lib/filecache.php explaining expected $path type
2012-07-24 17:57:20 +01:00
Bart Visscher 0040b7109f Merge branch 'master' into routing
Conflicts:
	lib/ocs.php
2012-07-24 18:35:09 +02:00
Bjoern Schiessle e32b2c8121 moved to ocs.php from master and added dummy functions for the keyserver 2012-07-24 18:22:57 +02:00
Bjoern Schiessle 2cf64daec4 moved to ocs.php from master and added dummy functions for the keyserver 2012-07-24 18:21:50 +02:00
Frank Karlitschek d28be8de64 add the calls for the new keyserver. Still not connectect to the encryption system 2012-07-24 15:18:52 +02:00
Robin Appelman 856d9c0b54 some indention fixes 2012-07-24 00:39:59 +02:00
Robin Appelman e49666d36b add option to clear user backends 2012-07-23 22:31:48 +02:00
Frank Karlitschek 21631be2ff make it generic and implement a dummy call for quota set 2012-07-23 19:43:28 +02:00
Bart Visscher 768b44b9b6 Convert routing to ownCloud fluid interface 2012-07-23 18:58:52 +02:00
Frank Karlitschek e7e1f234dd first part of the new new OCS CLOUD module. So far only quota is implemented.
The specification is developed here:
http://www.freedesktop.org/wiki/Specifications/open-collaboration-services-1.7#CLOUD
will be moved to
http://www.freedesktop.org/wiki/Specifications/open-collaboration-services
as soon as everything is done.
2012-07-23 18:34:21 +02:00
Bjoern Schiessle 73734c98e0 - remove namespace from file property name (webdav)
- update script to fix broken properties in the database
2012-07-23 11:00:37 +02:00
Bjoern Schiessle bd63fddbf4 fix broken properties in the database 2012-07-23 10:34:01 +02:00
Bjoern Schiessle c0e37c7d69 quick fix for broken properties 2012-07-23 10:25:35 +02:00
Bart Visscher 9e70f64d44 Fix oc-1163: gzdecode function not always defined
This function is only found in newer php versions
2012-07-22 17:27:30 +02:00
Robin Appelman b1010160b3 CSRF protection for eventsource 2012-07-22 16:37:49 +02:00
Robin Appelman 59ab8b14c7 cache fileid's in oc_cache 2012-07-22 03:24:34 +02:00
Robin Appelman 6843beeae9 add option to only get fast cache 2012-07-22 03:21:20 +02:00
Robin Appelman 51566e87c7 add prefix option to OC_Cache::clear 2012-07-22 02:31:48 +02:00
Robin Appelman 2b74778958 add method to OC_Cache to check whether a fast cache (apc/xdebug/etc) is available 2012-07-22 02:23:24 +02:00
Robin Appelman 2a73678fef use file extension for determining mimetypes on default
should be more reliable for files that "look like" other types based on their magic numbers such as odf and docx files
also a lot faster then the old way
2012-07-22 01:53:20 +02:00
Thomas Tanghus 0eade1b0d5 Code style. One down... 2012-07-21 22:00:27 +02:00
Bart Visscher d0cae6a99a Very basic conversion of ocs to Symfony Routing Component 2012-07-21 19:43:50 +02:00
Georg Ehrke f9d3388854 Merge branch 'master' into calendar_import 2012-07-21 17:37:10 +02:00
Georg Ehrke 11725efd7e add some hooks for subadmins 2012-07-21 16:43:39 +02:00
Georg Ehrke 5508a95065 Merge branch 'master' into subadmin 2012-07-21 13:14:52 +02:00
Bart Visscher 5381cc7418 Fix missing parameter decleration, thanks Jenkins :-) 2012-07-21 01:18:51 +02:00
Robin Appelman 8a19e134df fix ununsed variables 2012-07-21 00:20:27 +02:00
Robin Appelman aa118a4c64 remove obsolete oc_filesystem::mountall 2012-07-21 00:20:26 +02:00
Bart Visscher 0b338a7a41 Add missing public to function definition 2012-07-21 00:13:30 +02:00
Bart Visscher 14af503374 Fix parameter order in OC_Filestorage_Common->hash 2012-07-21 00:13:30 +02:00
Bart Visscher cdd9ffc8a5 Add ETag support to the Sabre file connector.
This is based on the md5 of the file, can be changed later
2012-07-21 00:13:30 +02:00
Bjoern Schiessle 53bdb049cb adapted to new SabreDav version 2012-07-20 23:31:08 +02:00
Thomas Tanghus 0af454a23b Trying to get documentation to "Do The Right Thing" (TM) 2012-07-20 23:11:06 +02:00
Tom Needham 29d16f61fa Fix strict standards warnings 2012-07-20 19:27:51 +00:00
Thomas Tanghus de8ed98541 Added some more documentation to OCP\JSON. 2012-07-20 21:20:51 +02:00
Thomas Tanghus 10337c059c Added some documentation for OCP\JSON::callCheck() 2012-07-20 20:15:39 +02:00
Robin Appelman d393638cc8 forgot to make one function abstract 2012-07-20 19:03:33 +02:00
Robin Appelman c9be9ab251 remove unused variables 2012-07-20 18:56:18 +02:00
Robin Appelman 7152b8b4ee remove unused and depricated getFolderSize 2012-07-20 18:32:40 +02:00
Robin Appelman 39086ef63e dont try to create mountpoints automatically 2012-07-20 17:58:06 +02:00
Robin Appelman 48306a3c4f fix unused variables 2012-07-20 17:58:05 +02:00
Robin Appelman 0e111e1a17 fix increasing folder sizes in filecache for custom roots 2012-07-20 17:58:05 +02:00
Robin Appelman 57ed83f266 fix eventsource fallback when more then one eventsource is active 2012-07-20 17:58:05 +02:00
Georg Ehrke fdb167a046 Merge branch 'master' into subadmin 2012-07-20 17:20:14 +02:00
Robin Appelman 445f52ef8b dont check for filecache updates when getting quota info over webdav 2012-07-20 16:35:51 +02:00
Georg Ehrke ea79ff191c Merge branch 'master' into subadmin 2012-07-20 15:22:12 +02:00
Robin Appelman 98e769d269 dont use the mtimes stored in zip archives since they dont update correctly 2012-07-20 00:52:10 +02:00
Georg Ehrke abb9f52dd7 add isGroupAccessible in OC_SubAdmin 2012-07-19 19:17:01 +02:00
Robin Appelman e52ab59b40 Revert "use readfile() instead iof fopen() for file download over webdav."
This reverts commit 9af74a9c80.
2012-07-19 18:13:10 +02:00
Georg Ehrke 05bc541276 add some doc for lib/subadmin.php 2012-07-19 16:43:46 +02:00
Robin Appelman 33b8de91ea allow a more flexible way of using user backends 2012-07-19 16:31:55 +02:00
Georg Ehrke 6e139f16e4 add isUserAccessible method to OC_SubAdmin class 2012-07-19 16:30:58 +02:00
Frank Karlitschek 10bf36a6ae 4.0.5 2012-07-19 09:10:18 +02:00
Georg Ehrke a5bebb86a5 add checkSubAdminUser method to OC_JSON class 2012-07-18 17:11:09 +02:00
Georg Ehrke f0c82686fd Merge branch 'master' into subadmin 2012-07-18 00:04:17 +02:00
Robin Appelman f047fdbfaa revert to using fopen for webdav instead of readfile 2012-07-16 19:58:05 +02:00
Georg Ehrke ccb1c57745 add warning in log if OC_L10N::tA was called 2012-07-16 19:35:40 +02:00
Michael Gapczynski 72ebc2a32a Delete old session files, suggested by Torben Nehmer, see bug oc-736 2012-07-15 15:22:31 -04:00
Michael Gapczynski b1a7826d56 Check if user is already logged in for DAV auth, instead of logging in and creating new sessions for every request 2012-07-15 15:17:27 -04:00
Georg Ehrke d49b789348 Merge branch 'master' into calendar_import 2012-07-15 16:56:38 +02:00
Georg Ehrke 4700222ea9 Merge branch 'master' into subadmin 2012-07-15 16:33:17 +02:00
Georg Ehrke e707e94857 subadmins can now add users 2012-07-15 16:31:28 +02:00
Michael Gapczynski 1ff2dd8f63 Listen to post_deleteUser, post_addToGroup, and post_removeFromGroup hooks 2012-07-14 14:06:57 -04:00
Michael Gapczynski cc6c940b9a Implement post_removeFromGroup() 2012-07-14 11:55:22 -04:00
Michael Gapczynski 82dea705d4 Add option to delete() to check the owner of the first search of reshares 2012-07-14 11:53:02 -04:00
Michael Gapczynski 0e9ab5cf2a Fix post_deleteUser(), column name changed and item_source is no longer needed 2012-07-14 11:02:16 -04:00
Michael Gapczynski 459bcd8d5e Update documentation 2012-07-14 10:55:34 -04:00
Michael Gapczynski bbbfc2c565 Fix delete(), it was going in an infinite loop 2012-07-14 10:52:31 -04:00
Michael Gapczynski 8de69fcb18 Update documentation 2012-07-14 10:19:18 -04:00
Michael Gapczynski 51a4518396 Add support for CRUDS permissions 2012-07-14 09:35:39 -04:00
Robin Appelman b45d3ced79 fix remote and public.php 2012-07-13 22:44:35 +02:00
Thomas Mueller 967c6d7d3c allow command line based installation/setup 2012-07-13 13:25:43 +02:00
Bjoern Schiessle 80ed5412f1 if the '/Shared' was the modified directory, than scan it. 2012-07-13 11:57:14 +02:00
Michael Gapczynski f638340d1f Add check for folder item type as well 2012-07-12 14:29:51 -04:00
Michael Gapczynski 63b6f20e05 Move already shared with check out of user and group cases, and add check for already shared with inside a collection 2012-07-12 12:11:04 -04:00
Michael Gapczynski ecae3ea430 Rename parents to collectionTypes, getCollectionItemTypes() shouldn't include the original item type 2012-07-12 12:10:50 -04:00
Michael Gapczynski bdcfa4bb63 Add check if file is found in file cache 2012-07-11 20:43:48 -04:00
Michael Gapczynski 4bf13adff2 Merge branch 'master' into share_api
Conflicts:
	apps/contacts/lib/addressbook.php
	apps/files_sharing/js/share.js
	apps/files_sharing/sharedstorage.php
2012-07-11 20:25:59 -04:00
Michael Gapczynski 632fc6ec61 Fix log write() parameters in wrong order 2012-07-11 19:38:57 -04:00
Lukas Reschke ac5abc5603 Handling exceptions 2012-07-11 19:38:57 -04:00
Michael Gapczynski e887fd7ba8 Catch exceptions from PHPMailer 2012-07-11 19:38:57 -04:00
Michael Gapczynski 71491612e3 Move line counter so we only count lines towards the offset that are equal or above the log level 2012-07-11 19:38:56 -04:00
Michael Gapczynski bc3462f022 Improvements and bug fix for log reading, fixes bug oc-982 2012-07-11 19:38:56 -04:00
Michael Gapczynski 281bf62af9 Fix log write() parameters in wrong order 2012-07-11 15:56:18 -04:00
Lukas Reschke 8afcddf44f Handling exceptions 2012-07-11 21:52:51 +02:00
Michael Gapczynski 66da0a2151 Catch exceptions from PHPMailer 2012-07-11 15:36:27 -04:00
Michael Gapczynski ccb5e99395 Generate random token for private links (more entropy than past private links) 2012-07-11 12:18:59 -04:00
Bjoern Schiessle 9af74a9c80 use readfile() instead iof fopen() for file download over webdav.
fopen() didn't work for large files on some servers while readfile()
seems to work for all files on all configurations.
2012-07-11 12:04:20 +02:00
Georg Ehrke 0cb9f5e159 fix merge conflicts 2012-07-11 10:50:18 +02:00
Georg Ehrke 5575493900 Merge branch 'master' into calendar_import 2012-07-11 10:47:30 +02:00
Michael Gapczynski a7416b1cd8 Add back returning only the item if the limit is 1 and now check that the format is set to none 2012-07-10 21:30:16 -04:00
Michael Gapczynski c21ff29a53 Fix getItems() calls 2012-07-10 21:29:34 -04:00
Michael Gapczynski 7c908a0016 Sharing files working using share API 2012-07-10 18:56:22 -04:00
Bjoern Schiessle e7a0c4f0bb use readfile() instead iof fopen() for file download over webdav.
fopen() didn't work for large files on some servers while readfile()
seems to work for all files on all configurations.
2012-07-10 19:22:06 +02:00
Johannes Willnecker 570ea787f1 fixed typo 2012-07-10 16:58:37 +02:00
Johannes Willnecker 3e53bf4a86 Fix for oc-972, oc-1144 and oc-1191 2012-07-10 16:58:37 +02:00
Robin Appelman b470869114 when checking for updates in the filecache, explicitly state that we are querying a folder 2012-07-10 14:42:15 +02:00
Georg Ehrke d0b625352c some work on subadmins 2012-07-09 21:51:19 +02:00
Jörn Friedrich Dreyer e59a1806cf remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
Bjoern Schiessle 82a57f0ce3 revert performance improvements in userExists() because it breaks new user creation 2012-07-09 10:31:50 +02:00
Bjoern Schiessle 7d41d3aba8 webdav ssl cleanup 2012-07-09 09:40:33 +02:00
Thomas Tanghus 6116dc6b65 Added default parameter $reset to allow for incremental rescan. 2012-07-09 00:14:42 +02:00
Bart Visscher e8010209bb Custom chunking support 2012-07-08 22:11:36 +02:00
Lukas Reschke b46d3019ca Uninitialized variable 2012-07-07 15:52:49 +02:00
Lukas Reschke ec7bb86b28 Fixes a problem with the user creation ("User already existed" even if the user don't exists.) Thanks to Phil Reinhardt for pointing this out. 2012-07-07 15:00:02 +02:00
Michael Gapczynski f955e5e9b2 Move line counter so we only count lines towards the offset that are equal or above the log level 2012-07-06 17:29:45 -04:00
Michael Gapczynski 466d7c0d99 Improvements and bug fix for log reading, fixes bug oc-982 2012-07-06 15:51:01 -04:00
Bjoern Schiessle e91b4bc2ac allow user to upload his own root certificate for secure webdav mount 2012-07-06 15:58:38 +02:00
Bjoern Schiessle ba8dee0520 introduce subclassed client.php and revert changes to 3rdparty 2012-07-06 12:26:54 +02:00
Georg Ehrke 9a10efd80f Merge branch 'master' into calendar_import 2012-07-06 11:01:12 +02:00
Bjoern Schiessle 5bf050b13b moved performance improvement from isLoggedIn() to userExists() to avoid webdav problems 2012-07-05 15:55:46 +02:00
Georg Ehrke c067930856 Merge branch 'master' into subadmin 2012-07-05 11:32:59 +02:00
Georg Ehrke aa95cf2c98 Merge branch 'master' into calendar_import 2012-07-05 11:30:37 +02:00
Bart Visscher 280c59e914 More helpfull debug msg for redirectToDefaultPage 2012-07-04 17:51:07 +02:00
Bart Visscher 621b83df72 Remove referer check, this is unreliable. The header doesnt need te exist, or can be wrong 2012-07-04 17:51:07 +02:00
Georg Ehrke 657eef354a Merge branch 'master' into calendar_import 2012-07-04 13:03:30 +02:00
Brice Maron 3b09aa8578 Correct Postgresql connection with space in password. Work around php bug 2012-07-04 10:13:00 +00:00
Georg Ehrke f98bd1ad66 Merge branch 'master' into calendar_import 2012-07-03 22:35:46 +02:00
Michael Gapczynski 96dea9507a Return false for single item checks and an empty array for multiple item checks 2012-07-03 14:03:04 -04:00
Michael Gapczynski 5e8ef33190 Clean up in the dropdown for unsharing 2012-07-03 14:00:09 -04:00
Bjoern Schiessle aec6eea235 use filesystem abstraction layer to copy file versions 2012-07-03 18:25:49 +02:00
Michael Gapczynski 4185bd6292 Load shared addressbooks inside OC_Contacts_Addressbook instead of the index, add public functions getItemShared(With)BySource() for contacts app 2012-07-03 11:11:01 -04:00
Georg Ehrke 641e77327e Merge branch 'master' into calendar_import 2012-07-03 16:48:30 +02:00
Bjoern Schiessle 4bc9e4e012 wrong var name fixed 2012-07-03 16:43:57 +02:00
Georg Ehrke cfcfdd674e Merge branch 'master' into calendar_import 2012-07-03 13:43:52 +02:00
Brice Maron 8a1c279183 Escape pg connection string on setup 2012-07-03 09:20:42 +02:00
Michael Gapczynski 77b582e4e6 Change getItems() return to a 3-dimensional array to handle multiple shares of the same item 2012-07-02 15:29:34 -04:00
Arthur Schiwon 52822652bc provide multibyte aware helper functions mb_str_replace, mb_substr_replace and mb_array_change_key_case for handling with UTF 8 2012-07-02 20:31:19 +02:00
Michael Gapczynski dd56416a39 Remove the method getItemsSharedStatuses, it is easy enough to just pass the format instead 2012-07-02 14:23:13 -04:00
Lukas Reschke 90331a3fa1 Remove forced download 2012-07-02 12:20:43 +02:00
Lukas Reschke 0465129eba Remove the forced download§ 2012-07-02 12:19:48 +02:00
Lukas Reschke 47bad20132 Restoring stable4... 2012-07-02 10:47:45 +02:00
Lukas Reschke e29681e233 Applying the fix 2012-07-02 10:29:04 +02:00
Lukas Reschke 5223724809 Wrong file - Sorry! 2012-07-02 10:28:11 +02:00
Lukas Reschke f8cebed348 Don't display error messages 2012-07-02 10:24:22 +02:00
Georg Ehrke e4960c3bb4 fix a small PHP fail 2012-07-02 10:23:32 +02:00
Lukas Reschke 4235ce0b63 Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4 2012-07-02 10:22:33 +02:00
Lukas Reschke 134d5d93c8 Don't display error messages 2012-07-02 10:21:38 +02:00
Georg Ehrke 8b5cae3c6c fix a small PHP fail 2012-07-01 21:50:53 +02:00
Lukas Reschke fa7d4c2b39 Disable mimesniffing 2012-07-01 13:53:06 +02:00
Lukas Reschke 4e63981da9 Disable mimesniffing 2012-07-01 13:45:20 +02:00
Michael Gapczynski 3e8a34f906 Don't select all columns for FORMAT_STATUSES 2012-06-30 21:15:10 -04:00
Michael Gapczynski c073216d8d Don't overwrite the item variable when checking if the item is already shared 2012-06-30 20:57:31 -04:00
Tom Needham b2cb7d54d1 Fixed app path 2012-06-30 22:56:47 +00:00
Tom Needham cfc78d44bb Return correct json response, fix syntax 2012-06-30 22:56:47 +00:00
Michael Gapczynski 75c111a33b Have getItems() return an empty array instead of false, so apps only need to do an array_merge() 2012-06-30 18:00:01 -04:00
Michael Gapczynski 7a649fc65a Switch back to registering just the class and not the object, better for performance 2012-06-30 17:25:21 -04:00
Georg Ehrke 4890bbb30d Merge branch 'master' into calendar_import 2012-06-30 22:08:36 +02:00
Florian Hülsmann 4ed55315e7 fixed linkTo() 2012-06-30 16:53:41 +02:00
Georg Ehrke 246894243a Merge branch 'master' into calendar_import 2012-06-29 21:46:09 +02:00
Bjoern Schiessle 94add1c000 typo fixed 2012-06-29 16:49:22 +02:00
Bjoern Schiessle b95996c02c - when creating a new text file or directory which name already exist use the same pattern as for file uploads in such a case (add a (N) to the name)
- don't allow renaming if a file/directory with the name already exists
2012-06-29 15:23:04 +02:00
Bart Visscher 1ccbbfad53 Spelling fix 2012-06-28 22:11:04 +02:00
Bart Visscher bf09edcbf1 Remember the app root information. 2012-06-28 22:11:04 +02:00
Bart Visscher 19bb4e83c9 Remove redundant code from OC_Helper::linkTo 2012-06-28 22:11:04 +02:00
Brice Maron b2cbf1199d Pg setup enhancement
do not create a db if already existing .. and reset the user password instead of creating if the user already exists
2012-06-28 19:38:03 +00:00
Michael Gapczynski 45e964c7aa Return login errors for PostgreSQL setup 2012-06-27 20:25:46 -04:00
Michael Gapczynski 81953e7bb5 Return login errors for PostgreSQL setup 2012-06-27 20:24:06 -04:00
Tom Needham 7284e57c91 Migration: fix app paths 2012-06-27 20:43:33 +00:00
Brice Maron 2706988225 Set table prefix if not set in postgresql install 2012-06-27 16:08:46 -04:00
Bart Visscher 2d8a380a21 Fix recursion when running an update script 2012-06-27 14:56:34 +02:00
Georg Ehrke 726bec73f0 Merge branch 'master' into oc_error 2012-06-27 14:06:31 +02:00
Georg Ehrke 153ce2f9ab Merge branch 'master' into calendar_import 2012-06-27 14:02:05 +02:00
Robin Appelman 12f7cb8767 fix running tests from cli 2012-06-27 13:21:45 +02:00
Robin Appelman 420d23a875 fix webdav errors for empty folders 2012-06-27 13:08:16 +02:00
Michael Gapczynski cb19fdd55b Show users and groups shared with in dropdown 2012-06-27 01:05:37 +02:00
Michael Gapczynski d95d738723 Fix FORMAT_STATUSES 2012-06-27 01:05:36 +02:00
Michael Gapczynski 9fdfcc29fe Fix group sharing 2012-06-27 01:05:36 +02:00
Bart Visscher d332e1e9c1 Documentation fix 2012-06-27 01:05:36 +02:00
Michael Gapczynski c41cb192c9 Fix which line needs '' wrapped around the array values 2012-06-27 01:05:36 +02:00
Michael Gapczynski 243faf6334 Fix searching for parent item types, search for file source instead of item source for the file item type in case the item was converted 2012-06-27 01:05:36 +02:00
Michael Gapczynski 32f9901bcd Fix retrieving supported file extensions from backend and remove the dependsOn and supportedFileExtensions parameters from registerBackend() 2012-06-27 01:05:36 +02:00
Michael Gapczynski 28b7793d5b Fixes and change database table from sharing to share 2012-06-27 01:05:36 +02:00
Michael Gapczynski f21fdf14f9 Forgot I got rid of the class field backendTypes, use the array keys of the backends field instead 2012-06-27 01:05:36 +02:00
Michael Gapczynski bc68f14c4b Prepare drop down UI for share API 2012-06-27 01:05:36 +02:00
Michael Gapczynski 8198114615 Some more changes to getItems() and fixes in shared storage 2012-06-27 01:05:36 +02:00
Michael Gapczynski 5f1aa1b92e Fix additional getItems calls due to parameter change 2012-06-27 01:05:36 +02:00
Michael Gapczynski 71350bc618 I'm having trouble making up my mind... translateItem -> getItems() -> formatItems(). It may change again. Preparing shared storage for new api. 2012-06-27 01:05:36 +02:00
Michael Gapczynski 10986f00dc Use share type and share with in db instead of separate columns for user and group 2012-06-27 01:05:36 +02:00
Michael Gapczynski bd8769a7c5 Fixes for registering and fetching backends 2012-06-27 01:05:36 +02:00
Michael Gapczynski c7e0449a75 Finish parent folder implementation, change recursive delete process 2012-06-27 01:05:36 +02:00
Michael Gapczynski 0cc7ae904d Initial work on a share API 2012-06-27 01:05:36 +02:00
Bart Visscher dab58f3464 Cache result of OC_App::getAppVersions 2012-06-27 01:05:12 +02:00
Bart Visscher 2f0b4983e9 Move app upgrade check to loading of apps 2012-06-27 01:05:12 +02:00
Thomas Tanghus a25ae4b4b6 Make Categories a bit quieter. 2012-06-27 01:03:53 +02:00
Frank Karlitschek d163fe02cd 4.0.4 2012-06-26 21:51:32 +02:00
Georg Ehrke 4e53db3d9c Merge branch 'master' into oc_error 2012-06-26 14:17:32 +02:00
Thomas Tanghus ac4e19218e All is good ;-) 2012-06-26 02:47:59 +02:00
Bart Visscher c6b9f613bb Cache: try to set the fast cache in the Broker 2012-06-25 21:05:10 +02:00
Bart Visscher fe0f281b4f Fix setting ETag header on cache miss 2012-06-25 21:05:10 +02:00
Bart Visscher 531c1c509c Cache: Add APC and XCache to global cache handler 2012-06-25 21:05:10 +02:00
Bart Visscher 4e4a1a4274 Cache: Use getUserCache cache in OC_Cache 2012-06-25 21:05:10 +02:00
Bart Visscher cae089df91 Cache: Create global cache in OC_Cache 2012-06-25 21:05:10 +02:00
Thomas Tanghus b1f3364eee Maybe fix out of memory..? 2012-06-25 19:42:38 +02:00
Brice Maron 09a9f5400e Trim url and path of appsroot to have and standart type of path fix oc-1107 2012-06-25 15:50:27 +02:00
Frank Karlitschek a4c47c674d write sql errors into the error log for better debugging 2012-06-25 11:55:51 +02:00
Brice Maron 564cd82599 Fix the fix about filecache and postgres 2012-06-24 20:49:48 +00:00
Brice Maron 2a6a155e23 Correct File cache error with postgresql 2012-06-24 19:52:30 +00:00
Thomas Tanghus b182e6c86a Trim trailing whitespace from version. 2012-06-24 15:07:44 +02:00
Frank Karlitschek ac358ed1b3 4.0.3a
Two important fixes after 4.0.3
2012-06-24 11:38:54 +02:00
Robin Appelman 44e36ecf49 fix 'files' entries showing up in Files before the users files are scanned properly 2012-06-23 23:42:54 +02:00
Robin Appelman f1e4c845ce fix duplicates showing up in the filecache 2012-06-23 23:32:44 +02:00
Georg Ehrke 51c5e7035e Merge branch 'master' into oc_error 2012-06-23 19:54:20 +02:00
Florian Hülsmann d450560b39 remove trailing slash in %appswebroot% placeholder 2012-06-23 16:59:55 +02:00
Frank Karlitschek 2c1c1ba88c close only if exist 2012-06-23 16:21:47 +02:00
Frank Karlitschek a8868fa007 work with non existing apps directory. thanks toAntonio for the hint 2012-06-23 16:20:31 +02:00
Frank Karlitschek 7c5ff900d0 work with non existing apps directory. thanks to Antonio for the hint 2012-06-23 16:17:59 +02:00
Brice Maron d39d7fb9ff Remove references to /apps/ and correct inclusion of settings 2012-06-22 22:05:39 +00:00
Brice Maron 33165e3915 Do not close php tag on config file 2012-06-22 21:01:12 +00:00
Brice Maron b5e3e150eb Correction of path looking for apps and css 2012-06-22 20:58:52 +00:00
Georg Ehrke 243f910ae4 Merge branch 'master' into oc_error 2012-06-22 21:37:03 +02:00
Bart Visscher ebfc5b2762 Add compatability function for APC cache 2012-06-22 17:21:57 +02:00
Bart Visscher f655981baf Fix initialization of OC_Filesystem setup from DAV 2012-06-22 17:21:56 +02:00
Bart Visscher 50667dcb82 Convert OC_L10N_String to a string in OC_JSON::encodedPrint 2012-06-22 17:21:56 +02:00
Bart Visscher 432aa58bab Spelling fixes 2012-06-22 17:21:56 +02:00
Bart Visscher 60f558cdbb Fix initialization of OC_Filesystem setup from DAV 2012-06-22 17:20:10 +02:00
Brice Maron 2d2366bb57 Avoid fetch ocs info if the appstore is disabled 2012-06-22 16:06:46 +02:00
Brice Maron 06e20fe4b8 Correct css inclusion with minimizer 2012-06-22 15:21:44 +02:00
Brice Maron 115c30bdb4 Enhance hint about writable app directory 2012-06-22 13:57:54 +02:00
Brice Maron 8c2803a7c1 Correct image path and apps path replacement 2012-06-22 13:12:03 +02:00
Brice Maron 72fe463f7f Correct OC_Config writer. Use var_export (has support for array,...) 2012-06-22 12:46:21 +02:00
Brice Maron df60d6d5d2 Fixes for multi app dir :
Url should be given as relative path (to webroot)
Correct link construction from js
2012-06-22 12:24:56 +02:00
Brice Maron e5d458c068 Correct File cache error with postgresql 2012-06-22 10:46:49 +02:00
Thomas Mueller ba2d203a54 some path fixes for multi-dir app 2012-06-22 09:56:54 +02:00
Frank Karlitschek ca6339c480 4.0.3 2012-06-22 09:25:41 +02:00
Brice Maron b5953e7a83 Provide solution for smoother migration for apps to multi-app dir 2012-06-21 22:22:36 +00:00
Brice Maron f46623da6c Do not search apps if oc is not yet installed 2012-06-21 21:29:18 +00:00
Bart Visscher bae592d69b Prefer requested app before redirecting to default page 2012-06-21 20:15:23 +02:00
Bart Visscher a7e427a3cc Remember result of OC_User::isLoggedIn, can be very expensive to check 2012-06-21 20:14:53 +02:00
Bart Visscher 8aa7ed39a5 Only check for apps owncloud version requirment when there is a new owncloud version 2012-06-21 20:13:30 +02:00
Brice Maron a5938e4e37 Merge branch 'master' into multi_app_dir 2012-06-21 20:19:31 +00:00
Brice Maron 84b9ac2678 Correct writable check for app dir 2012-06-21 19:35:34 +00:00
Brice Maron d22f805b63 Correct inclusion paths 2012-06-21 19:19:39 +00:00
Brice Maron e5c56b2433 Merge branch 'master' into multi_app_dir
Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php
2012-06-21 17:15:35 +00:00
Sam Tuke a9a913c273 Implemented deleteAll() method in OC_FilesystemView (interface) and OC_Filestorage_Common (logic)
Made OC_Filestorage_Local and OC_Filestorage_Shared extend OC_Filestorage_Common
Set searchInDir() to protected instead of private in OC_Filestorage_Local and OC_Filestorage_Shared
Added class documentation to OC_Filestorage_Common
Cleaned up OCA_Versions::expireAll()
2012-06-21 18:15:22 +01:00
Robin Appelman 56de98ed8c fix saved file size for uploaded files 2012-06-21 18:22:18 +02:00
Robin Appelman da9107fe69 fix saved file size for uploaded files 2012-06-21 18:07:56 +02:00
Robin Appelman 7b4cb44af8 truncate decrypted files based on size 2012-06-21 17:51:54 +02:00
Robin Appelman d0455c5819 truncate decrypted files based on filelength 2012-06-21 17:38:00 +02:00
Frank Karlitschek 5212fa3fa7 check if the data directory is accessible via http. Show a big security warning if yes 2012-06-21 14:18:43 +02:00
Frank Karlitschek e95055b2bd check if the data directory is accessible via http. Show a big security warning if yes 2012-06-21 14:07:04 +02:00
Georg Ehrke 96d0b9834a fix mimetype for cdr files - bugfix for oc 559 2012-06-21 09:58:38 +02:00
Georg Ehrke 43674b1759 fix mimetype for cdr files - bugfix for oc 559 2012-06-21 09:58:04 +02:00
Georg Ehrke 4d312f7849 Merge branch 'master' into oc_error 2012-06-21 09:08:38 +02:00
Michael Gapczynski cc3835d657 Only call OC_FileCache::get('/Shared') if it exists in the file cache, prevents premature addition of the Shared folder to the file cache
Conflicts:

	lib/fileproxy/quota.php
2012-06-20 19:39:17 -04:00
Michael Gapczynski 6524f6ad30 Only call OC_FileCache::get('/Shared') if it exists in the file cache, prevents premature addition of the Shared folder to the file cache 2012-06-20 19:24:45 -04:00
Robin Appelman 9ba467d629 fix encryption for binary files 2012-06-20 20:18:42 +02:00
Robin Appelman e3f1507374 use absolute path for file proxies 2012-06-20 20:18:41 +02:00
Georg Ehrke 7d0d1ebd4f Merge branch 'master' into oc_error 2012-06-20 20:14:15 +02:00
Sam Tuke 72215a818d added new user settings interface for deleting old file versions
fixed OCA_VersionsexpireAll() to use native PHP readdir()
removed local storage implementation of readdir()
2012-06-20 18:25:12 +01:00
Sam Tuke d6bf62ea4e Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-20 16:26:02 +01:00
Sam Tuke c244daac89 removed readdir to fix bug oc-1054 2012-06-20 16:24:49 +01:00
Bart Visscher 0086639891 Merge branch 'audit' 2012-06-20 17:20:39 +02:00
Bart Visscher 7a3d606cac Prefer requested app before redirecting to default page 2012-06-20 17:10:49 +02:00
Bart Visscher 6404476bec Delay setup of FS until OC_Filesystem is used 2012-06-20 17:10:49 +02:00
Bart Visscher 5c8e774cea Small code reorder 2012-06-20 17:10:48 +02:00
Bjoern Schiessle 902c649dad use new sanitize HTML function backported
Conflicts:

	lib/template.php
2012-06-20 16:59:51 +02:00
Bjoern Schiessle d9607df26f backport of sanitizeHTML() function 2012-06-20 16:43:31 +02:00
Bjoern Schiessle 6644511124 remove unnecessary comment 2012-06-20 16:29:19 +02:00
Georg Ehrke a054541df4 Merge branch 'master' into oc_error 2012-06-20 13:29:17 +02:00
Robin Appelman c4d1363419 don't show other users file if the filesystem is not index already 2012-06-20 11:35:45 +02:00
Robin Appelman 13a9ef36fb don't show other users file if the filesystem is not index already 2012-06-20 11:34:17 +02:00
Bart Visscher 0524f6fd3c Fix webdav property name compare 2012-06-19 23:18:07 +02:00
Bart Visscher 2d4e1b45ce Load app before running update script 2012-06-19 23:17:40 +02:00
Bart Visscher cff1b6e699 Don't use substr to get first char of string 2012-06-19 23:16:17 +02:00
Bart Visscher bb649dd0d5 Smarter code for OC_FileProxy
Conflicts:

	lib/fileproxy.php
2012-06-19 23:15:33 +02:00
Bart Visscher 598a090db4 Add cache for getStorage and getInternalPath functions.
These are called for almost every file operation.
2012-06-19 23:13:24 +02:00
Bart Visscher e728635c8a Add stat cache to OC_Connector_Sabre_Node and OC_Connector_Sabre_File
Speeds up access of directories with large number of files.
2012-06-19 23:13:21 +02:00
Bart Visscher 98bc916016 Make check for writable apps dir configurable
Conflicts:

	config/config.sample.php
2012-06-19 23:11:14 +02:00
Bart Visscher f54ef5a464 Remove OC::$CONFIG_DATADIRECTORY, not used 2012-06-19 22:54:14 +02:00
Bart Visscher d8b32c2f0e Move check code from setupFS to checkServer 2012-06-19 22:54:13 +02:00
Thomas Mueller 637f8398ba fixes oc-668 2012-06-19 22:37:25 +02:00
Sam Tuke 28a72e0e3c Fixed deleteAll function for deleting all old versions of files (expireAll)
Added new readdir() method to all storage classes and handlers (only working implementation in local.php)
2012-06-19 19:42:40 +01:00
Bjoern Schiessle f11e4d7cd6 removing sanitizeHTML() function from template.php since I moved it to util.php
to make it more generic.
2012-06-19 19:29:43 +02:00
Bart Visscher 4b6f6291c5 Remember result of OC_User::isLoggedIn, can be very expensive to check 2012-06-19 17:54:19 +02:00
Bjoern Schiessle 089ae980c4 use new sanitize HTML function 2012-06-19 17:24:55 +02:00
Bjoern Schiessle d2936bd90c introducing a sanitize HTML function for the internal and the public API. This
allows to easily convert strings to HTML before displaying them on the web page
to reduce the risk of xss vulnerabilities.
2012-06-19 17:20:19 +02:00
Georg Ehrke ccacb6f918 Merge branch 'master' into oc_error 2012-06-19 11:30:18 +02:00
Bjoern Schiessle 1b142a1155 quota calculation fixed 2012-06-19 09:36:50 +02:00
Bjoern Schiessle 0469f529fa quota calculation fixed 2012-06-19 09:35:13 +02:00
Victor Dubiniuk db7542b640 Reverting 249190c89b. Fixed in master 2012-06-19 00:56:48 +03:00
Thomas Mueller c1df0539a0 fixes oc-668 2012-06-18 23:33:02 +02:00
Victor Dubiniuk 249190c89b Fix mime-type detection 2012-06-19 00:20:33 +03:00
Bart Visscher d4044d0283 Delay loading of translations until they are used 2012-06-18 23:07:32 +02:00
Brice Maron cfb3b633f5 Force sanitize function to use UTF8 (for php lower than 5.4) 2012-06-18 19:52:05 +00:00
Bjoern Schiessle 92bb59c95d fixed broken function call 2012-06-18 17:30:21 +02:00
Bjoern Schiessle 814cab97cf ignore "Shared"-directory when calculating free space
Conflicts:

	lib/fileproxy/quota.php
2012-06-18 17:27:42 +02:00
Bjoern Schiessle e6384251eb Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-18 17:25:00 +02:00
Bjoern Schiessle d496a5e19f ignore "Shared"-directory when calculating free space 2012-06-18 17:23:54 +02:00
Georg Ehrke 6bd0a158f7 Merge branch 'master' into oc_error 2012-06-18 15:59:39 +02:00
Bart Visscher 2f00384b51 Use TemplateLayout functions for finding js and css files in minimizer 2012-06-18 15:40:48 +02:00
Bart Visscher 3000e8f9d5 Prepare template js and css functions for use in the js and css minimizers 2012-06-18 15:40:48 +02:00
Bart Visscher 180243d92a Move page layout handling to its own class 2012-06-18 15:40:48 +02:00
Bart Visscher 332603a263 Move formfactor code to OC_Template 2012-06-18 15:40:48 +02:00
Georg Ehrke e31c9a7b6f Merge branch 'master' into oc_error 2012-06-18 14:34:49 +02:00
Bart Visscher 977cd0df6b Fix errors for minimizer 2012-06-18 11:33:24 +02:00
Bart Visscher a5a1a9fd4a Forgot a file 2012-06-18 11:12:53 +02:00
Bart Visscher 617de811f7 Cache the minimized output also on the server 2012-06-18 11:11:46 +02:00
Georg Ehrke 06c610c2ee Merge branch 'master' into oc_error 2012-06-17 08:36:33 +02:00
Robin Appelman 549541215e get the correct metadate from updated folders to put in the cache 2012-06-17 02:15:11 +02:00
Michael Gapczynski e8dd86ce0d Revert "Set default charset to utf-8."
This reverts commit 709dbd82a6.
2012-06-16 19:48:03 -04:00
Robin Appelman b38e46276f when checking if the content of a folder has been updated, exlicitly state that we are checking a folder
solves some issues with external storages not updating correctly
2012-06-17 01:31:57 +02:00
Bart Visscher 6f93176a4b Be smarter when checking single app language availability 2012-06-16 20:52:10 +02:00
Bart Visscher 6e9cd63fa1 Only check for apps owncloud version requirment when there is a new owncloud version 2012-06-16 20:52:10 +02:00
Georg Ehrke 12f6205fa8 Merge branch 'master' into oc_error 2012-06-16 17:10:53 +02:00
Thomas Tanghus 709dbd82a6 Set default charset to utf-8. 2012-06-16 17:01:12 +02:00
Georg Ehrke 14f6d4dcba Merge branch 'master' into oc_error 2012-06-16 09:35:57 +02:00
Tom Needham c1744d2eb6 Move user import to personal settings. Fix user migration between servers. 2012-06-15 23:17:31 +00:00
Tom Needham 8484e16516 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-15 23:14:48 +00:00
Tom Needham e37ef6dd47 Move user import to personal settings. Fix user migration between servers. 2012-06-15 23:14:40 +00:00
Bart Visscher 6d3ae575b6 Remove $DOCUMENTROOT, not used 2012-06-16 00:11:36 +02:00
Bart Visscher e11c5a23d5 Optimize WebDav access by preloading dav custom properties 2012-06-15 21:21:42 +02:00
Bart Visscher e905b14758 Spelling fix 2012-06-15 21:21:42 +02:00
Bart Visscher 463a506fcb Fix webdav property name compare 2012-06-15 21:21:42 +02:00
Bart Visscher 27efdbd58f Use setter for FileinfoCache 2012-06-15 21:21:42 +02:00
Georg Ehrke 2c8a61ae9c Merge branch 'master' into oc_error 2012-06-15 20:48:37 +02:00
Robin Appelman f06c08a637 cleanup oc_filecache, splitting it in several parts and using the new hasUpdated 2012-06-15 19:56:15 +02:00
Robin Appelman a9a424a519 also add hasUpdated to oc_filesystem and oc_filesystemview 2012-06-15 17:42:39 +02:00
Robin Appelman 449760f665 add hasUpdated to oc_filestorage 2012-06-15 16:43:24 +02:00
Bart Visscher 400769ab40 Optimize WebDav access using OC_FileCache 2012-06-15 16:04:07 +02:00
Bart Visscher 2b228fba34 Load app before running update script 2012-06-15 11:18:44 +02:00
Bart Visscher 0d3f5f736f Disable minizing when DEBUG is true 2012-06-15 11:18:44 +02:00
Brice Maron 4753cc3ebd Merge branch 'master' into multi_app_dir
Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
2012-06-14 21:16:59 +00:00
Brice Maron 6da5a2fdd4 Add possibility to choose the installation folder 2012-06-14 21:00:02 +00:00
Thomas Tanghus 625cd822c3 Backport CSRF prevention. 2012-06-14 13:52:22 +02:00
Thomas Tanghus 8fd9cbcc54 White-space fix. 2012-06-14 13:23:12 +02:00
Thomas Tanghus a34db3fbe0 Don't add slash if it's there already. 2012-06-14 13:23:12 +02:00
Bart Visscher 12b34d2dda Whitespace fix 2012-06-13 21:39:12 +02:00
Michael Gapczynski b5889d6ffe Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
Conflicts:
	apps/files_external/templates/settings.php
	lib/template.php
2012-06-13 15:17:46 -04:00
Thomas Tanghus 9e7c28835b Allow same host redirects (/somepath). 2012-06-13 18:32:07 +02:00
Thomas Tanghus 89464721c7 Added JSON methods for CSRF prevention. Make request token accessible from template and add js var. 2012-06-13 17:33:19 +02:00
Frank Karlitschek 9e9c40eabd fix time call 2012-06-13 17:27:49 +02:00
Georg Ehrke 9f82edc157 Merge branch 'master' into oc_error 2012-06-13 15:30:04 +02:00
Bartek Przybylski db1353655b check for view before trying to invoke method on object 2012-06-13 00:32:44 +02:00
Thomas Mueller 521294d0bf fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-987 2012-06-12 23:16:26 +02:00
Michael Gapczynski 790ae70e32 Create directory for mount point if it doesn't already exist 2012-06-12 15:25:34 -04:00
Lukas Reschke 2b22c538c8 Make some apps compatible 2012-06-11 19:07:51 +02:00
Lukas Reschke 6d68b7620c Check for string 2012-06-11 18:12:46 +02:00
Thomas Tanghus 2ee809fd86 Allow same host redirects (/somepath). 2012-06-11 15:21:37 +02:00
Lukas Reschke 18e44ba2f3 Some updates... 2012-06-11 15:03:45 +02:00
Lukas Reschke b63795ccb8 Handling arrays 2012-06-11 14:36:11 +02:00
Lukas Reschke c009bc4b87 Revert 2012-06-11 13:27:32 +02:00
Lukas Reschke 6817a6b102 First try of implementing assignHTML 2012-06-11 12:45:07 +02:00
Frank Karlitschek cd16c5e479 implement a simple request token session garbage collector 2012-06-11 12:13:08 +02:00
Thomas Tanghus a21fd725d6 Categories: Turned the debugging down a bit. 2012-06-11 03:07:20 +02:00
Thomas Tanghus 1cb1980d62 Categories: Turned the debugging down a bit. 2012-06-11 03:05:33 +02:00
Michael Gapczynski 3c57fb935b Mount personal mount points into filesystem 2012-06-10 16:34:44 -04:00
Frank Karlitschek cfea28101a 4.0.2 2012-06-10 20:31:31 +02:00
Georg Ehrke 82abbed883 Merge branch 'master' into oc_error 2012-06-10 18:38:38 +02:00
Bartek Przybylski c11f6cc3f9 fix variable name and undefined index notice 2012-06-10 17:25:50 +02:00
Bartek Przybylski 3970be3d7f fix variable name and undefined index notice 2012-06-10 17:25:19 +02:00
Bartek Przybylski f1250a3867 add function in filesystem to strip webroot 2012-06-10 13:19:10 +02:00
Bartek Przybylski e7d1af48fb handle encrypted images files in oc_image 2012-06-10 13:19:05 +02:00
Bartek Przybylski 7ee722e0da removing app access check, fix title for links in tiles 2012-06-10 13:18:55 +02:00
Bartek Przybylski 9b2b5e0f6d git status 2012-06-10 13:15:23 +02:00
Frank Karlitschek 689c8f5f09 paging not yet implemented. increasing pagesize to 100 as a temporary quickfix 2012-06-09 22:02:29 +02:00
Frank Karlitschek 3947aa3ef7 apps paging is not yet implemented. increase pagesize to 100 as a quickfix 2012-06-09 22:00:28 +02:00
Frank Karlitschek 061938cbb5 finally fix the updater. next is an automatic updater. but this is a bit more tricky. 2012-06-09 17:56:23 +02:00
Frank Karlitschek 897bfa8814 finally fix the updater. next is an automatic updater. but this is a bit more tricky. 2012-06-09 17:43:02 +02:00
Robin Appelman 601bac746d use absolute path for file proxies 2012-06-09 17:34:13 +02:00
Thomas Tanghus b16136642b Bump version to trigger db update. 2012-06-09 16:05:21 +02:00
Bartek Przybylski 43501309e3 add function in filesystem to strip webroot 2012-06-09 15:26:26 +02:00
Bartek Przybylski 120997112c handle encrypted images files in oc_image 2012-06-09 15:22:18 +02:00
Bartek Przybylski 001293a702 removing app access check, fix title for links in tiles 2012-06-09 15:12:50 +02:00
Frank Karlitschek 344299a074 add two csrf check calls. Review and lot´s of porting needed. 2012-06-09 15:05:14 +02:00
Robin Appelman 6e1ca36207 fix infinite redirect during setup for windows hosts 2012-06-09 14:38:50 +02:00
Robin Appelman 76de92477f fix infinite redirect during setup for windows hosts 2012-06-09 14:38:05 +02:00
Georg Ehrke cf1c3635ff fix loading of OC::$REQUESTEDAPP if WTFE the app parameter is given but empty aka /?app 2012-06-08 22:32:58 +02:00
Georg Ehrke bdd12df4a2 fix loading of OC::$REQUESTEDAPP if WTFE the app parameter is given but empty aka /?app 2012-06-08 22:31:44 +02:00
Bart Visscher ac36512102 Don't use substr to get first char of string 2012-06-08 21:38:10 +02:00
Bart Visscher b9a1524508 Smarter code for OC_FileProxy 2012-06-08 21:38:10 +02:00
Bart Visscher 6af980c20c Add cache for getStorage and getInternalPath functions.
These are called for almost every file operation.
2012-06-08 21:38:10 +02:00
Bart Visscher d9d6876be9 Add stat cache to OC_Connector_Sabre_Node and OC_Connector_Sabre_File
Speeds up access of directories with large number of files.
2012-06-08 21:38:10 +02:00
Bart Visscher 7c5c257bf6 Comment layout and spelling fixes 2012-06-08 21:38:10 +02:00
Frank Karlitschek a7a861b2c6 backport the password salting fix.
a salt is generated during setup and used to salt the user password hases in the database backend
2012-06-08 12:42:35 +02:00
Frank Karlitschek 6119f05ac0 generate a random salt during installation and store it in the config.php. use it to salt the password hashing. 2012-06-08 12:31:37 +02:00
Georg Ehrke f43fd1765e fix merge conflicts 2012-06-08 11:23:58 +02:00
Bart Visscher 0575d149b4 Use the default parameter of OC_Config::getValue to set defaults 2012-06-07 22:49:50 +02:00
Brice Maron 9ec68c819b Change parameter 'web' to 'url' and take array of array in config instead of : separated values 2012-06-07 20:36:55 +00:00
Bart Visscher 4260dce826 Better handling of core.css and core.js
Fixes calling remote.php on install.
Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
2012-06-07 21:35:40 +02:00
Brice Maron 9f1c46b6f6 Correct Minizer inclusions 2012-06-07 19:22:43 +00:00
Brice Maron 0f7fdd4148 ReAdd possibility to load existing app folders 2012-06-07 19:15:31 +00:00
Brice Maron cf02f3c107 Merge branch 'master' into multi_app_dir 2012-06-07 19:11:55 +00:00
Thomas Tanghus c696f449a2 Make it easier to subclass OC_L10N. 2012-06-07 17:26:28 +02:00
Brice Maron e8447e0bda Rework to fit with minizer 2012-06-06 21:11:15 +00:00
Bart Visscher 8dba47d466 Add layer to select fast or slow cache for storing values 2012-06-06 22:41:36 +02:00
Brice Maron 5c2b2fc842 Change app path logic in templates 2012-06-06 20:24:16 +00:00
Brice Maron 6a812644e4 Correct remote and public, and last occurence of OC:: 2012-06-06 20:24:15 +00:00
Brice Maron 6a250d0d20 Correct css file inclusion 2012-06-06 20:24:15 +00:00
Brice Maron cc494259d3 Unit path and webpath, correct some more 2012-06-06 20:24:15 +00:00
Brice Maron 6832aec60f Correct installer 2012-06-06 20:23:17 +00:00
Brice Maron b6c5ca126b First almost working version 2012-06-06 20:23:17 +00:00
Bartek Przybylski 6d211155ab git status 2012-06-06 22:13:48 +02:00
Arthur Schiwon 6ca2b49292 avoid too-early database access and thus make owncloud installable again 2012-06-06 17:29:57 +02:00
Frank Karlitschek 2ddb72bb58 fix wrong documentation 2012-06-06 14:18:30 +02:00
Georg Ehrke fa0c45b005 Merge branch 'master' into oc_error 2012-06-06 10:12:54 +02:00
Michael Gapczynski 826a439c15 Supress any warnings if log file does not exist 2012-06-05 18:42:16 -04:00
Michael Gapczynski 3ce6344d40 Supress any warnings if log file does not exist 2012-06-05 17:44:07 -04:00
Bart Visscher fc56a668ce Add OC_Cache implementation for APC 2012-06-05 23:19:28 +02:00
Bart Visscher ab788eaa23 OC_Cache_File ttl=0 indicates forever, but expire in a day to keep the cache clean 2012-06-05 23:09:49 +02:00
Bart Visscher 9984c2a593 Spelling fixes in XCache files 2012-06-05 23:07:11 +02:00
Robin Appelman f6298cb74f add hasKey for XCache backend 2012-06-05 20:54:07 +02:00
Thomas Tanghus 098beae751 Added hasKey() method to OC_Cache. 2012-06-05 20:34:12 +02:00
Thomas Tanghus 9dbb07b806 Added data() method to OC_Image to return raw image data. 2012-06-05 20:31:15 +02:00
Robin Appelman 301a14dcd6 add XCache backend and testcases for OC_Cache 2012-06-05 19:58:30 +02:00
Robin Appelman e11bf460e0 add OC_Cache::clear 2012-06-05 19:57:49 +02:00
Robin Appelman 10eef49c3c return null when a cache variable is not set 2012-06-05 19:33:15 +02:00
Robin Appelman dcf1eed816 add unique instance id 2012-06-05 19:32:48 +02:00
Bart Visscher eed0450351 Fix remap dir for CSS minimizer 2012-06-05 18:09:32 +02:00
Bart Visscher 9d936976a9 Make check for writable apps dir configurable 2012-06-05 17:51:52 +02:00
Bart Visscher 57326ea1f8 Move setting remote_core.* to after setup of OC, also check if it is not set yet 2012-06-05 17:51:52 +02:00
Bjoern Schiessle edecc5bca3 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-05 15:29:59 +02:00
Frank Karlitschek 4bc7387d7c fi login for hosts running n port 80 2012-06-05 15:28:00 +02:00
Frank Karlitschek e747fd794e fix login for hosts running on port 80 2012-06-05 15:26:31 +02:00
Frank Karlitschek 5c9325bbe0 CLI is no availabe in stable4 2012-06-05 14:10:50 +02:00
Arthur Schiwon 7621559d00 make groups not static, fixes oc-919 2012-06-05 14:02:13 +02:00
Frank Karlitschek d3bb01b598 more reliable host detection for reverse proxy scenarios 2012-06-05 12:53:48 +02:00
Frank Karlitschek e3031ae28b more reliable host detection for reverse proxy servers 2012-06-05 12:52:23 +02:00
Bjoern Schiessle 061abb88b5 write a warning to the log file if .htaccess is not writable instead of failing silently 2012-06-05 11:50:21 +02:00
Bart Visscher 4a5973662c Merge branch 'unstable'
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
2012-06-04 23:02:05 +02:00
Bart Visscher 091b343d5c Calendar & Contacts: Store import progress in OC_Cache
Convert calendar and contacts import to use a caching system
for storing the import progress percentage. OC_Cache can later
be made smarter about storing values.
2012-06-04 22:24:17 +02:00
Arthur Schiwon dfc90021ca load authentication apps before checking wether user exists. fixes oc-910 2012-06-04 21:40:32 +02:00
Arthur Schiwon b0d83d6d8d make it possible to load apps seperately. needed to fix oc-910 without breaking oc-863 2012-06-04 21:40:18 +02:00
Arthur Schiwon 454f81fb15 load authentication apps before checking wether user exists. fixes oc-910 2012-06-04 21:31:35 +02:00
Arthur Schiwon 773f3cf973 make it possible to load apps seperately. needed to fix oc-910 without breaking oc-863 2012-06-04 21:30:58 +02:00
Robin Appelman b117a1e3ec update file paths in filecache when the parent is renamed 2012-06-04 18:12:25 +02:00
Bjoern Schiessle ca64a4080f don't allow user to delete Shared dir via webdav and sync client (bug #774) 2012-06-04 18:08:51 +02:00
Bjoern Schiessle 6d70f42dd4 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-04 18:04:29 +02:00
Bjoern Schiessle c6a1d9491b don't allow user to delete Shared dir via webdav and sync client (bug #774) 2012-06-04 18:03:16 +02:00
Robin Appelman 59086fe082 update file paths in filecache when the parent is renamed 2012-06-04 17:59:42 +02:00
Bjoern Schiessle 7fbe306990 no move (rename) operation for "Shared" directory 2012-06-04 14:00:35 +02:00
Bjoern Schiessle c8f670dfab Don't allow user to delete, rename and re-share the "Shared" directory 2012-06-04 14:00:35 +02:00
Frank Karlitschek 64fe06710a add deprecated warning 2012-06-04 12:49:33 +02:00
Frank Karlitschek 8755fd88bb Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-04 12:46:22 +02:00
Frank Karlitschek 1e6802e567 add deprecated warning 2012-06-04 12:45:45 +02:00
Bjoern Schiessle 4eba41a2a0 no move (rename) operation for "Shared" directory 2012-06-04 11:04:05 +02:00
Bjoern Schiessle 2d80c148ba Don't allow user to delete, rename and re-share the "Shared" directory 2012-06-04 10:42:09 +02:00
Georg Ehrke b8275691e7 Merge branch 'master' into oc_error 2012-06-04 10:35:50 +02:00
Frank Karlitschek 300f6894e0 4.0.1 2012-06-03 21:06:07 +02:00
Robin Appelman e90cbcaf5b http user backend 2012-06-03 02:51:05 +02:00
Michael Gapczynski 0145c65bf3 Verify user exists when checking if logged in, fix for bug oc-863 2012-06-02 20:09:44 -04:00
Michael Gapczynski 993ebc4c90 Verify user exists when checking if logged in, fix for bug oc-863 2012-06-02 20:06:52 -04:00
Michael Gapczynski cc84bd2993 Fix typo in log message 2012-06-01 15:15:05 -04:00
Michael Gapczynski 4db5481ad5 Improve efficiency of retrieving log file entries 2012-06-01 14:42:14 -04:00
Michael Gapczynski 66f1957e3b Improve efficiency of retrieving log file entries 2012-06-01 14:39:50 -04:00
Frank Karlitschek 52b3305892 add a pdo check 2012-06-01 20:01:23 +02:00
Sam Tuke 3d7143c730 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-01 19:01:00 +01:00
Frank Karlitschek 4aa96de537 add a check for pdo 2012-06-01 20:00:33 +02:00
Sam Tuke 2ccf3da411 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-01 19:00:28 +01:00
Frank Karlitschek 07e1e3a945 check if apps folder is writable 2012-06-01 19:54:07 +02:00
Frank Karlitschek 3ef944521e add check if apps folder is writable. needed to install 3rd party apps 2012-06-01 19:52:45 +02:00
Sam Tuke 4b4d13165a Minor change to comment 2012-06-01 16:46:18 +01:00
Sam Tuke 7203f6951e Extended class comment 2012-06-01 16:34:09 +01:00
Frank Karlitschek aa9824d35b fix proper error reporting 2012-06-01 16:33:24 +02:00
Frank Karlitschek dcb06393a8 fix propper error reporting 2012-06-01 16:30:47 +02:00
Frank Karlitschek aa88ec81c7 sort users and groups. fixes oc-779 2012-06-01 14:21:24 +02:00
Frank Karlitschek ad6562d14f sort users and groups. fixes oc-779 2012-06-01 14:18:14 +02:00
Frank Karlitschek 0468f53f73 switch magic quotes off.
they are evil and deprecated
2012-06-01 12:42:50 +02:00
Frank Karlitschek 75d56f24f2 try to switch magic quotes off.
it´s evil and deprecated
2012-06-01 12:41:38 +02:00
Frank Karlitschek 1b34bda76b fix oc-874 2012-06-01 12:16:04 +02:00
Frank Karlitschek 93295994dc fix oc-769 2012-06-01 12:15:03 +02:00
Frank Karlitschek 0d2d613f59 added a serverProtocol function that correctly returns the used protocol even if the ssl connection is terminated at a reverse_proxy or at a load balancer 2012-06-01 11:06:49 +02:00
Frank Karlitschek 24d14783d7 added a serverProtocol function that correctly returns the used protocol even if the ssl connection is terminated at a reverse_proxy or at a load balancer 2012-06-01 10:38:44 +02:00
Frank Karlitschek a72e6cc113 fix oc-780 2012-05-31 21:28:58 +02:00
Frank Karlitschek 3a6341c880 fix oc-780 2012-05-31 21:27:46 +02:00
Frank Karlitschek d4ea853fcf use our own serverHost call so that ownCloud works with reverse proxy servers 2012-05-31 20:26:09 +02:00
Frank Karlitschek 5d425a9f79 use our own serverHost call so that ownCloud works with reverse proxy servers 2012-05-31 20:16:44 +02:00
Sam Tuke ec0c0f3907 Added & improved documentation 2012-05-31 17:57:34 +01:00
Sam Tuke ef60dcc23e fixed typo 2012-05-31 17:38:35 +01:00
Sam Tuke 6b3df8ae9c Improved class comment block 2012-05-31 17:32:34 +01:00
Sam Tuke 8744b09959 added extensive class comment based on icewind's January list email 2012-05-31 17:02:35 +01:00
Sam Tuke fc400e06c3 fixed typos in var names 2012-05-31 14:53:52 +01:00
Sam Tuke 43fcae0409 clarified comment 2012-05-31 14:50:41 +01:00
Bart Visscher a33f580db1 Remove OC_App::register function
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
2012-05-31 13:01:30 +02:00
Bart Visscher 4434016a8b Whitespace fixes 2012-05-31 13:01:30 +02:00
Georg Ehrke 54001ec7d8 Merge branch 'master' into oc_error 2012-05-31 12:21:06 +02:00
Frank Karlitschek 4dc7ed139b don´t hardcode /tmp 2012-05-30 14:18:47 +02:00
Frank Karlitschek 22a04d8e93 don´t hardcode /tmp 2012-05-30 14:14:32 +02:00
Frank Karlitschek c1f7d320e8 mark as 4.0.1 pre 2012-05-29 22:18:07 +02:00
Georg Ehrke 49689dbc7a Merge branch 'master' into oc_error 2012-05-29 19:48:07 +02:00
Michael Gapczynski 1d983c28aa Restrict requested app to apps directory 2012-05-29 12:35:52 -04:00
Michael Gapczynski fbe58755e5 Restrict requested app to apps directory 2012-05-29 12:31:47 -04:00
Brice Maron 2f8412defc Set table prefix if not set in postgresql install 2012-05-28 20:56:21 +00:00
Georg Ehrke 94c633b6b7 Merge branch 'master' into oc_error 2012-05-26 22:54:49 +02:00
Frank Karlitschek 54c421f384 check during ownCloud upgrade if all the installed apps are compatible with the new ownCloud version. Disable them if not 2012-05-26 20:40:12 +02:00
Frank Karlitschek 982cde0bb1 check during ownCloud upgrade if all the installed apps are compatible with the new ownCloud version. Disable them if not 2012-05-26 20:37:10 +02:00
Frank Karlitschek a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Frank Karlitschek dfd5a9759c only enable compatible apps 2012-05-25 11:31:46 +02:00
Brice Maron 2774ff1ad8 Add HEAD request management for files ajax/download.php 2012-05-25 11:19:38 +02:00
Georg Ehrke 79bf933319 Merge branch 'master' into oc_error 2012-05-25 10:30:44 +02:00
Brice Maron 9c2a6fb551 Add HEAD request management for files ajax/download.php 2012-05-24 22:48:10 +00:00
Frank Karlitschek 24318354f2 changed the default from Berlin to UTC.
Greetings form Berlin by the way ;-)
2012-05-24 00:49:21 +02:00
Frank Karlitschek f97f1b4266 use UTC instead of Berlin as default 2012-05-24 00:47:03 +02:00
Robin Appelman 60fdc13ae6 enable running unit tests from cli 2012-05-22 20:22:53 +02:00
Florian Hülsmann d2e2a2b2c0 prevent apps from printing output from app.php 2012-05-22 13:10:42 +02:00
Robin Appelman 3775c0d8b2 dont throw errors when apps dont have types configured 2012-05-20 18:52:44 +02:00
Robin Appelman 3b4c47c52e files app is always enabled 2012-05-20 18:52:27 +02:00
Robin Appelman cb23bae8d9 dont throw errors when apps dont have types configured 2012-05-20 18:52:03 +02:00
Robin Appelman f00b57f8be files app is always enabled 2012-05-20 18:52:03 +02:00
Frank Karlitschek c0db603d29 this is 5 pre alpha now 2012-05-19 18:21:33 +02:00
Frank Karlitschek 8a0dc774bc 4 2012-05-19 18:20:23 +02:00
Frank Karlitschek 7e49a33d64 getStorage belongs to files not to apps. 2012-05-19 10:44:08 +02:00
Frank Karlitschek 08f7d4c552 document the public classes a bit more 2012-05-19 10:36:57 +02:00
Robin Appelman a2cc772aa5 dont run update scripts for apps that arent enabled 2012-05-19 02:00:46 +02:00
Robin Appelman b096fd9ed8 log upgrades 2012-05-19 01:55:20 +02:00
Robin Appelman df64b9b0e9 strict standards fixes for sqlite3 2012-05-19 01:39:41 +02:00
Michael Gapczynski 90cbc32c77 Fix redirect after login, prevent open redirects 2012-05-18 16:56:48 -04:00
Frank Karlitschek 16224e5e8b "fopen(" interferes with our own classes.
remove it for now and let´s fix this later
2012-05-18 18:22:37 +02:00
Frank Karlitschek 2d3c709163 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-18 15:56:15 +02:00
Frank Karlitschek db77dc91bc only try to install apps that are compatible with oC4 2012-05-18 15:54:36 +02:00
Frank Karlitschek 2e9115efe0 increase to RC2 2012-05-18 15:54:17 +02:00
Michiel de Jong a6ff909911 this code looks wrong to me but i'm putting it back while we find out what the right code should look like 2012-05-18 15:39:28 +02:00
Michiel de Jong 1a874b4c56 make redirect safe by restricting it to current host 2012-05-18 15:32:41 +02:00
Michiel de Jong 9b5e8a2c63 fix redirect to desired page after login 2012-05-18 15:11:01 +02:00
Robin Appelman 48505c5626 improve tar archive backend 2012-05-18 01:54:59 +02:00
Georg Ehrke 3d713e711b Merge branch 'master' into oc_error 2012-05-17 22:17:31 +02:00
Robin Appelman c1ba4deb72 when scanning a folder that is a mountpoint, use the root of the mount for checking if a folder is writable instead of the folder 2012-05-17 01:47:58 +02:00
Robin Appelman aac9629e88 add support for custom ports for mysql/pgsql by adding :portnumber to the database host 2012-05-17 01:06:22 +02:00
Robin Appelman 5fe7200a7f update documentation of oc_user::checkpassword 2012-05-17 00:57:43 +02:00
Robin Appelman 2c99924f7d make sure the group exists in the backend before adding a user to it 2012-05-17 00:47:43 +02:00
Sam Tuke 22dd155e4d Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable 2012-05-16 18:30:35 +01:00
Sam Tuke 9acd1065b0 made initial testing version of expireAll for version control \ngave some old vars new camelcase names 2012-05-16 18:30:26 +01:00
Bart Visscher c645a7d0f8 Fix empty jsfiles and cssfiles in layout template 2012-05-16 18:53:46 +02:00
Bart Visscher ce1e4425c2 Combine and minimize core and default app js files 2012-05-16 18:53:46 +02:00
Bart Visscher f71fec8cdc Combine and minimize core and default app css files 2012-05-16 18:53:46 +02:00
Bart Visscher 2faae817f1 Template: Fix var name 2012-05-16 18:53:46 +02:00
Bart Visscher 6d20fe4012 Template: Make getFormFactorExtension function public 2012-05-16 18:53:46 +02:00
Bart Visscher b39f01fce6 Comment spelling fix 2012-05-16 18:52:40 +02:00
Bart Visscher 5d72681d10 Better place to check caching headers 2012-05-16 18:52:40 +02:00
Arthur Schiwon 01b366df80 avoid corrupt ZIP files on lighttpd, should fix oc-467 2012-05-15 11:57:24 +02:00
Thomas Mueller 583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Robin Appelman 6779f28af4 cache app types during install or update 2012-05-14 22:49:31 +02:00
Thomas Mueller bda2dbec1f Prevent Clickjacking by adding additional headers:
header('X-Frame-Options: Sameorigin');
                header('X-XSS-Protection: 1; mode=block');
                header('X-Content-Type-Options: nosniff');

Thanks to Lukas Reschke for reporting this issue (and many more).
2012-05-14 15:34:28 +02:00
Robin Appelman e7c106d91e selective app loading for remote/public 2012-05-14 00:28:28 +02:00
Michael Gapczynski a332c39472 Check if path_info is empty as well, fixes bug oc-632. Thanks to die3lustigen2. 2012-05-13 15:26:30 -04:00
Robin Appelman 8d475debe0 additional logging when db upgrade fails 2012-05-13 21:21:39 +02:00
Robin Appelman 1a2ab2ef68 prevent user creation with empty password 2012-05-13 20:53:56 +02:00
Georg Ehrke a5f0ac811f Merge branch 'master' into oc_error 2012-05-13 19:13:31 +02:00
Thomas Tanghus 3926e2d4f3 VCategories: Made a small check for categories that seems to resolv the problems in Calender. Also reverts the changes from 9e6221b229. 2012-05-13 15:07:07 +02:00
Thomas Tanghus 9e6221b229 VCategories: Suppress error messages stemming from import from file app. 2012-05-13 09:16:53 +02:00
Frank Karlitschek af77ce9a9b This is RC now 2012-05-13 05:11:10 +02:00
Robin Appelman 9eb91a111d update to jquery 1.7.2 2012-05-12 00:37:19 +02:00
Brice Maron 5b7c69f978 Change sqlite escaping of identifier to double quote. Fixing some issues 2012-05-11 19:45:53 +00:00
Bart Visscher 919681f3e6 Make processed css files cachable 2012-05-11 21:33:02 +02:00
Bart Visscher 97233b77cd Remove DOCUMENTROOT static var, and make SUBURI var private 2012-05-11 21:31:51 +02:00
Robin Appelman 847832ae77 also set remote/public paths on installing apps 2012-05-11 20:58:23 +02:00
Robin Appelman d12021e3c4 fix sqlite3 driver against updated MDB2 2012-05-11 20:56:02 +02:00
Robin Appelman cf3940425f don't do the initial scanning of the users home folder trough the update system 2012-05-11 20:49:19 +02:00
Robin Appelman 0622fa79ba add temporary filestorage backend for testing purposed 2012-05-11 20:33:56 +02:00
Robin Appelman b40f9670ae allow clearing hooks and fileproxies 2012-05-11 20:33:56 +02:00
Robin Appelman 736739bbbd load remote and public paths from info.xml during upgrade instead of setting them every time 2012-05-11 20:33:56 +02:00
Michiel de Jong c99d7dd94f the ',last' breaks all other rewrite rules and is also not there in the committed .htaccess, so removing it. anybody know why it was there? 2012-05-11 17:59:21 +02:00
Michiel de Jong 347ce2aafa match setup script to .htaccess from repo 2012-05-11 17:30:27 +02:00
Michiel de Jong 4462b26160 oops, typo in lib/setup.php 2012-05-11 17:09:10 +02:00
Michiel de Jong 2dff357a4e add new htaccess things into setup script too 2012-05-11 17:06:04 +02:00
Georg Ehrke 8f2217ca2e make default app choosable 2012-05-11 13:56:52 +02:00
Tom Needham 709b0a1ddc Check if app is enabled before exporting its data 2012-05-10 23:06:53 +00:00
Michael Gapczynski de95bf62a2 Prevent any null bytes related exploits, thanks to Lukas Reschke 2012-05-10 11:44:06 -04:00
Michael Gapczynski d9fbdae758 Prevent XSS exploit by checking if path-info is set, thanks to Lukas Reschke 2012-05-10 10:26:12 -04:00
Sam Tuke b055ebc1fc added documentation to OCP namespace 2012-05-10 14:19:17 +01:00
Bart Visscher c2230580c1 Remove unused OC static variable CONFIG_DATADIRECTORY_ROOT 2012-05-10 09:14:27 +02:00
Bart Visscher b022ccb863 Whitespace fixes 2012-05-10 09:14:26 +02:00
Bart Visscher e77ba0280a Implement default functions in OC_Group backend
Simplifies calling these functions, and makes code simpler

functions:
inGroup
getUserGroups
getGroups
usersInGroup
2012-05-10 09:14:26 +02:00
Bart Visscher ac2e0cd6e4 Implement default functions in OC_User backend
Simplifies calling these functions, and makes code simpler

functions:
deleteUser
getUsers
userExists
2012-05-10 09:14:26 +02:00
Bart Visscher a9d7c67bf2 The log message is not always shown in html
The log message can also be logged with syslog, here we don't want to have html-entities. Also the log messages through json are displayed as text not html.
2012-05-10 09:13:09 +02:00
Michael Gapczynski 798e6aa40b Merge commit 'refs/merge-requests/100' of git://gitorious.org/owncloud/owncloud into merge-requests/100 2012-05-09 17:50:14 -04:00
Robin Appelman 03f66c6351 also scan new folders when checking for updates
it might cause long load times but seems the best for now
2012-05-09 20:35:12 +02:00
Georg Ehrke bc60b8d87a fix bug in public api 2012-05-09 18:33:40 +02:00
Philipp Roggan bba434ca37 fixed typo in lib/public/util.php:106 (varname to ) 2012-05-09 15:17:40 +02:00
Michael Gapczynski 051442bc76 Sanitize redirect urls 2012-05-08 17:41:50 -04:00
Tom Needham 9c47346373 Protect admin from evil log messages 2012-05-08 19:41:31 +00:00
Georg Ehrke 52717d2a1b remove comments 2012-05-08 17:07:50 +02:00
Brice Maron 9921ca11b5 Add protection for non-authorized char in installation form 2012-05-07 22:12:30 +00:00
Frank Karlitschek 43978abd80 increase to 4 beta 2012-05-07 22:58:22 +02:00
Frank Karlitschek 10d291d6b3 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-07 22:56:34 +02:00
Frank Karlitschek 40b823bc8b some more docu fixes 2012-05-07 22:55:44 +02:00
Bart Visscher 4dbc2093c6 Create a function for linking to remote.php 2012-05-07 21:47:14 +02:00
Georg Ehrke 5b7cefb1e5 make ampache work with remote.php 2012-05-07 20:26:09 +02:00
Georg Ehrke d032345191 fix validation of getfile parameter - i hate this bloody merge conflicts 2012-05-07 13:23:55 +02:00
Bart Visscher 640ba1828f Start of audit app
Audit the filesystem action
2012-05-07 09:04:07 +02:00
Thomas Tanghus cde60dba0f Fix typo. 2012-05-07 04:46:09 +02:00
Michael Gapczynski aa0c3ddcfe Fix updateFolder() in OC_FileCache 2012-05-06 20:11:10 -04:00
Michael Gapczynski e0db22cc07 Provide feedback when user creation fails 2012-05-06 18:04:48 -04:00
Frank Karlitschek 1945cd6946 ported the oc_template class 2012-05-06 23:00:36 +02:00
Frank Karlitschek 5d55c709dd some more documentation cleanups. much more is needed.
And greeting from the Atlanta airport. ;-)
2012-05-06 22:02:16 +02:00
Frank Karlitschek 2edf59c026 first part of documentation update. lot´s more to come 2012-05-06 21:46:39 +02:00
Daniel 35177e00c0 Merge commit 'refs/merge-requests/109' of git://gitorious.org/owncloud/owncloud into merge-requests/109 2012-05-06 16:13:13 +02:00
Jernej Virag e459309511 Fixed escaping of filename when determining MIME type 2012-04-25 10:33:52 +02:00
Bart Visscher f991948a71 Fix loading by apptype in webdav 2012-05-05 21:58:10 +02:00
Thomas Müller d46bea8867 fixing file headers with copy right 2012-05-05 18:13:40 +02:00
Robin Appelman c0e67fa24a fix opening encrypted files from the browser 2012-05-05 16:49:48 +02:00
Frank Karlitschek 9bcc5c11a8 porting the hooks and starting with the templates 2012-05-05 10:18:45 +02:00
Brice Maron 4a89eb77c1 Escape strings for DB and User creation at setup. Fix oc-124 2012-05-04 22:54:55 +00:00
Frank Karlitschek eab4a05d78 implement missing getusers call 2012-05-04 11:13:07 +02:00
Robin Appelman a22a79cddd fix filecache for postgresql 2012-05-03 23:17:03 +02:00
Robin Appelman 9e03ea4a28 ensure the files app is always loaded 2012-05-03 20:47:18 +02:00
Frank Karlitschek 97a8af7f25 ported oc_db 2012-05-03 13:06:08 +02:00
Frank Karlitschek 43caa3b3b9 ported oc_json 2012-05-03 12:23:29 +02:00
Frank Karlitschek 351740601a port oc_response 2012-05-03 10:46:27 +02:00
Robin Appelman e5ef3e1340 move archive library to core so we can properly depend on it 2012-05-02 23:48:23 +02:00
Michael Gapczynski 31d623f426 Fix log viewing bug 2012-05-02 15:26:42 -04:00
Frank Karlitschek 10bbbc8cd2 new checkAppEnabled call 2012-05-02 18:54:31 +02:00
Georg Ehrke da03d05700 create folder 'remote' for the remote services like caldav, carddav and webdav 2012-05-02 16:41:23 +02:00
Frank Karlitschek 82a61e2e1a port oc_preferences 2012-05-02 15:54:34 +02:00
Frank Karlitschek ff66600bc0 port appconfig 2012-05-02 14:11:29 +02:00
Frank Karlitschek 8e99475886 first part of the config stuff 2012-05-02 13:28:56 +02:00
Frank Karlitschek 8c7f854671 move all the files stuff into a files class 2012-05-02 12:54:31 +02:00
Arthur Schiwon 6750998984 files is not internal any more, part II 2012-05-02 11:26:22 +02:00
Arthur Schiwon d71600213a files is not internal any more 2012-05-02 11:14:11 +02:00
Arthur Schiwon c9eaffd336 send downloadfile piece by piece. saves RAM and is better suited for large files. 2012-05-02 11:02:13 +02:00
Frank Karlitschek 2fe646dcec ported the oc_app calls 2012-05-02 00:50:26 +02:00
Frank Karlitschek 93b63cf375 ported the rest of the OC_Helper calls 2012-05-02 00:20:45 +02:00
Frank Karlitschek e48f511606 port linkto and serverHost 2012-05-01 23:19:39 +02:00
Frank Karlitschek 31e32e3c10 ported checkLoggedIn and checkAdmin 2012-05-01 22:59:38 +02:00
Frank Karlitschek e2fb094693 some more porting 2012-05-01 21:07:08 +02:00
Frank Karlitschek d0554bef06 finish porting of the LOG calls or the apps to the public api 2012-05-01 17:38:27 +02:00
Marvin Thomas Rabe 7ded9cf520 Checks if config folder is writable on begin of the installation. 2012-05-01 16:35:46 +02:00
Arthur Schiwon d3ce2cacd6 OC_User: handle success properly 2012-05-01 14:40:56 +02:00
Arthur Schiwon 8a69116e94 OC_User: don't say password changed when it is not true 2012-05-01 13:40:01 +02:00
Frank Karlitschek 0195d5b439 some more work on the public API 2012-05-01 09:39:12 +02:00
Frank Karlitschek 04c6582af1 load the files app in a way that doesn´t break oC3 configurations 2012-04-30 13:58:48 +02:00
Frank Karlitschek e1268cd5f4 we require php 5.3 now. so please notify the user if an old version is in use 2012-04-30 13:28:31 +02:00
Frank Karlitschek f0701f75a9 tiny typo 2012-04-30 13:08:08 +02:00
Thomas Mueller 07f2e316e4 removing executable bit from various files 2012-04-30 12:05:57 +02:00
Frank Karlitschek c7e7767f58 don´t hardcode files app. we have no a standard info.xml in files 2012-04-29 21:27:02 +02:00
Robin Appelman 4d3ef9a824 improve rescanning folders 2012-04-29 16:11:17 +02:00
Robin Appelman e3adbcb7d5 remove non existing files from the cache when rescanning a folder 2012-04-29 15:09:47 +02:00
Robin Appelman 09a5c59cca only install shipped apps on setup that should be enabled by default 2012-04-29 14:38:56 +02:00
Georg Ehrke 3aedbc5f95 remove debug message 2012-04-27 22:22:58 +02:00
Georg Ehrke 06e9ac8591 fix parsing of app parameter and fix external app 2012-04-27 22:22:03 +02:00
Georg Ehrke 993d655aad Merge branch 'master' into movable_apps_2 2012-04-27 10:30:50 +02:00
Frank Karlitschek ee0cb68f5e some csrf fixes. needs testing 2012-04-27 01:18:21 +02:00
Frank Karlitschek 74b5e22a68 some more csrf fixes 2012-04-26 23:17:46 +02:00
Georg Ehrke 5483c1be42 hide fails 2012-04-26 21:58:43 +02:00
Georg Ehrke 5fda0e4b3b make *DAV work with movable apps 2012-04-26 21:56:29 +02:00
Georg Ehrke 2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Georg Ehrke 40f95ffdf3 fix security check for the path of the requested file 2012-04-26 17:55:00 +02:00
Georg Ehrke ebcaa46482 fix loading of css files that are core related 2012-04-26 15:19:27 +02:00
Georg Ehrke 3f64eb25ab some fixes fore movable apps 2012-04-26 14:52:55 +02:00
Georg Ehrke d76552a009 Merge branch 'sabredav_1.6' 2012-04-25 10:39:31 +02:00
Georg Ehrke 476043ecb9 add a proper 404 2012-04-25 10:17:20 +02:00
Robin Appelman cc2bfd313d minor filecache improvements 2012-04-25 00:12:12 +02:00
Robin Appelman 9015c46e31 emit the correct hooks for file_put_contents and some readfile improvements 2012-04-25 00:12:12 +02:00
Robin Appelman 60b924c954 initial mount configuration work 2012-04-25 00:12:12 +02:00
Georg Ehrke f17eea506a fix merge conflicts 2012-04-24 21:59:56 +02:00
Georg Ehrke fb84d0aff8 fix php fail 2012-04-24 21:37:19 +02:00
Georg Ehrke 9b29bc96de remove debug message 2012-04-24 21:36:54 +02:00
Georg Ehrke 0b06eff3a0 another fix for linkto function 2012-04-24 20:17:00 +02:00
Georg Ehrke 29b9e27078 fix linkto function in OC_Helper 2012-04-24 20:14:42 +02:00
Thomas Tanghus 6848b069c9 OC_App::getStorage() failed if app dir didn't exist. 2012-04-24 01:44:07 +02:00
Georg Ehrke 95c220a246 remove debug code in lib base 2012-04-23 20:31:03 +02:00
Georg Ehrke 19109afa79 fix bug in lib base 2012-04-23 20:11:21 +02:00
Georg Ehrke 42a570788b Merge branch 'master' into movable_apps 2012-04-23 19:56:07 +02:00
Georg Ehrke 6d92ebca45 use native functions of php to parse the string into the Var 2012-04-23 17:09:28 +02:00
Georg Ehrke 9226cb7a6a rename var file to getfile to prevent fails in files app 2012-04-23 16:36:24 +02:00
Georg Ehrke aaedb23f05 fix bug in lib/helper.php and fix file upload 2012-04-23 16:28:37 +02:00
Frank Karlitschek f5c9fe9ece first step to an public api of ownCloud for the apps. In the future they shouldn´t call internall classes, functions or session variables because this will change and break in upcoming versions. Apps should only call this public interface that we will kepp stable over different releases. The namespace is OCP for ownCloud public. This is just the first step. more coming soon 2012-04-23 15:50:30 +02:00
Georg Ehrke e888f4d9bc Merge branch 'master' into sabredav_1.6 2012-04-22 13:20:50 +02:00
Georg Ehrke 6b9072de58 fix merge conflicts 2012-04-22 13:20:25 +02:00
Georg Ehrke 4c2cf35050 fix merge conflicts 2012-04-22 13:19:12 +02:00
Georg Ehrke 0918fc7d91 fix merge conflicts 2012-04-21 23:21:50 +02:00
Frank Karlitschek a86d89f5ca Add a static code checker for evil patterns in apps.
Disabled by default for now.
We will check for private api calls here later once the public api is in place
2012-04-21 22:47:56 +02:00
Frank Karlitschek 6bfe2289be improve the app installer.
show a label if an app is an internal app or a third party app from the app store.
show a preview image of the app if available
2012-04-21 15:30:58 +02:00
Georg Ehrke 711aa229b8 Merge branch 'master' into movable_apps 2012-04-20 22:41:39 +02:00
Georg Ehrke 99a473bd62 support file calls with parameter 2012-04-20 22:33:30 +02:00
Frank Karlitschek 0f5864d864 support searching the knowledge base 2012-04-20 21:49:57 +02:00
Frank Karlitschek 2fbc92bd4b new OC_Mail class to handle all mail sending. The benefit is that is way mor flexible than the standard mail command. can be configured to use a remote smtp relay for example. also port the lostpassword code 2012-04-20 20:49:35 +02:00
Georg Ehrke 2e85313701 optimize code 2012-04-19 22:26:36 +02:00
Georg Ehrke 909282c81e remove parameters in file var before call require once 2012-04-19 22:25:21 +02:00
Georg Ehrke 85019887df add loading of files 2012-04-19 16:44:49 +02:00
Robin Appelman bdb3962b8d add function to get mimetype from string 2012-04-18 20:54:28 +02:00
Georg Ehrke dfc92675e0 make menu work with movable apps 2012-04-18 17:25:44 +02:00
Georg Ehrke eb29c577c2 Merge branch 'master' into movable_apps 2012-04-18 12:20:09 +02:00
Georg Ehrke 3e0e6e35f4 open app thru index.php 2012-04-18 08:20:51 +02:00
Arthur Schiwon 57b8ff890c check if PHP mod GD is installed 2012-04-17 19:09:41 +02:00
Arthur Schiwon d24abc3b9d check if PHP mod JSON is installed 2012-04-17 19:06:45 +02:00
Robin Appelman 5720bd296d merge log into admin 2012-04-16 12:21:48 +02:00
Robin Appelman 464c751f30 fix creating unique filenames 2012-04-16 10:58:40 +02:00
Robin Appelman fa97c59f95 fix group backend 2012-04-16 10:36:21 +02:00
Robin Appelman b61f6438ba return user specific paths from oc_filecache::getpath 2012-04-16 10:06:52 +02:00
Georg Ehrke 77cefdedb8 Merge branch 'master' into sabredav_1.6 2012-04-15 22:28:11 +02:00
Georg Ehrke c8cb870a27 Merge branch 'master' into oc_error 2012-04-15 22:27:47 +02:00
Bart Visscher 68b1ae1a36 OC_Group_Backend.php misses function groupexists
Fix http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-182
2012-04-15 17:11:03 +02:00
Bart Visscher ea99e1184d Add well-known redirects to htaccess
Fixes:
http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-232
http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-445
2012-04-15 17:11:03 +02:00
Thomas Müller a0d917fe98 fixing oc-375 - a number is appended tp the filename 2012-04-15 17:00:49 +02:00
Robin Appelman dae34edf4f fix filecache rename hook 2012-04-15 16:06:55 +02:00
Jan-Christoph Borchardt 7ddd043427 renamed extention to extension, also now only showing lowercase 2012-04-15 13:34:30 +02:00
Robin Appelman a6a8e2c553 add public api to get the file id from the cache 2012-04-15 11:44:04 +02:00
Robin Appelman c5b8a3eb94 fix installing shipped apps 2012-04-15 11:05:55 +02:00
Daniel fd16784bcc fix bug where users could use wildcards in username to login
e.g. user Peter could probably login using username Pet%
fixed same problem in the migration script
2012-04-15 10:30:22 +02:00
Bartek Przybylski f241615693 fix getAppVersion error 2012-04-15 00:05:28 +02:00
Jan-Christoph Borchardt ba5e60e2e4 firefighting Robin-breakage 2012-04-14 19:05:01 +02:00
Robin Appelman 4410f15dd8 don't rely on the old version in info.xml anymore 2012-04-14 19:01:59 +02:00
Jan-Christoph Borchardt fbb314ef4b Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-14 18:56:55 +02:00
Jan-Christoph Borchardt f16cfbab5e improved installation instructions 2012-04-14 18:44:32 +02:00
Jan-Christoph Borchardt 85cb171cb8 improved updater wording 2012-04-14 18:41:09 +02:00
Bart Visscher 402c6da968 Typo fix (breif->brief) 2012-04-14 18:31:42 +02:00
Bart Visscher 4976daca7a Fix default database type string 2012-04-14 18:31:41 +02:00
Robin Appelman dec139716e cache app types in the db 2012-04-14 17:53:02 +02:00
Robin Appelman 5608867edc use the correct array indexes... 2012-04-14 17:52:49 +02:00
Robin Appelman b1bcc60d83 reuse OC_L10N objects 2012-04-14 16:44:15 +02:00
Robin Appelman 721311c909 some minor optimizations 2012-04-14 16:29:11 +02:00
Robin Appelman 926b2b78fe keep version numbers in their own files for faster reading 2012-04-14 16:29:11 +02:00
Robin Appelman bfdbdd9b20 remove outdated file 2012-04-14 16:29:11 +02:00
Tom Needham c069aa62a4 Fix annoying error in log 2012-04-14 12:31:48 +00:00
Robin Appelman d8864d4f4b show error when installing an app has failed 2012-04-14 12:57:10 +02:00
Robin Appelman d3bf013761 prevent users with the same name but different casing from being created 2012-04-14 12:57:10 +02:00
Robin Appelman 137dce87fc remove outdated code 2012-04-14 11:42:11 +02:00
Robin Appelman 3babb8c22c improve flexibility of search providers a bit 2012-04-14 11:29:54 +02:00
Robin Appelman d8e54acbf3 test cases for user backends 2012-04-14 10:43:28 +02:00
Arthur Schiwon 9ef34cd831 typo 2012-04-13 23:02:42 +02:00
Arthur Schiwon 74f0bebfc8 don't fail on missing extension 2012-04-13 23:02:42 +02:00
Arthur Schiwon b9bdad5165 make sure temporary files are being removed, fixes oc-450 2012-04-13 23:02:42 +02:00
Georg Ehrke e5e7d4a73a fix merge conflicts 2012-04-13 16:44:31 -04:00
Georg Ehrke 77a9e343aa Merge branch 'master' into sabredav_1.6 2012-04-13 16:42:10 -04:00
Arthur Schiwon b95f561bf2 file settings: let people set no more than upper boundary for file uploads, but they should can really go up to the limit 2012-04-13 11:25:38 +02:00
Arthur Schiwon 1bd27891e2 make upload size settings work probably. do not replace whole .htaccess, only replace what is needed. Consistent, human readable input on admin settings page. 2012-04-13 10:43:44 +02:00
Robin Appelman 1d8fdf52d5 allow multiply group backends 2012-04-13 01:59:05 +02:00
Bart Visscher 69d584331d OC_VCategories: sort categories in natural order using usort
Use usort to sort, so that the json encoding is an array.
2012-04-12 23:10:49 +02:00
Bart Visscher 815649dbd7 Implement default categories in OC_VCategories 2012-04-12 23:10:49 +02:00
Florian Preinstorfer b86f2069ff Fix a session fixation vulnerability
- regenerate the session for every successful login
- properly destroy a session

Further information can be found on:
https://en.wikipedia.org/wiki/session_fixation
2012-04-12 19:15:38 +02:00
Grundik 7e7de25710 UTF8 locale by default 2012-04-12 17:54:20 +02:00
Daniele E. Domenichelli 156bdae2fe Use OC_Helper::serverHost() in OC_Helper::linkToAbsolute() 2012-04-12 17:51:17 +02:00
Daniele E. Domenichelli 7b5395675d Add method OC_Helper::serverHost()
This method returns the server host, even if the website uses one or
more reverse proxies.
2012-04-12 17:51:17 +02:00
Robin Appelman 0466437fa7 tests for oc_filesystem 2012-04-12 15:55:56 +02:00
Frank Karlitschek 637db92e60 increase version to show that we are not the same as stable 2012-04-11 09:20:28 +02:00
Georg Ehrke 613e15035e Merge branch 'master' into sabredav_1.6 2012-04-10 22:44:13 -04:00
Bart Visscher 17af1ba893 Silence error for missing appinfo info file 2012-04-10 21:04:35 +02:00
Tom Needham 8e188cd96f Copy over all file app data for imported user 2012-04-08 19:16:03 +00:00
Tom Needham e5ebbacc9e Fix sqlite version detection 2012-04-08 18:52:31 +00:00
Tom Needham 5e314e8eff Emit hooks for user creation 2012-04-07 22:00:32 +00:00
Tom Needham c0869887cf Return JSON for import and export methods of OC_Migrate 2012-04-07 21:55:16 +00:00
Tom Needham 9edf45a324 Merge branch 'master' into migration 2012-04-07 17:31:30 +00:00
Tom Needham d2886f2020 Hide instance import as it eats data 2012-04-07 17:27:09 +00:00
Bartek Przybylski 96c99125da mimetype filter for filepicker 2012-04-05 23:18:44 +02:00
Florian Hülsmann 8a2c5dda6d Merge commit 'refs/merge-requests/102' of git://gitorious.org/owncloud/owncloud into merge-requests/102 2012-04-04 21:36:50 +02:00
Tom Needham acdce2b1e0 Check blacklist before saving to filesystem 2012-04-03 22:31:34 +00:00
Michael Gapczynski ff4b0c4d7f Move writable check into local filestorage so shared files can be renamed 2012-04-01 13:30:41 -04:00
Robin Appelman cce59df2ae the core apps don't have types 2012-04-01 19:22:23 +02:00
Robin Appelman 39e8981bc2 oc_db is not pdo
also pgsql does not like double quotes
2012-04-01 17:32:13 +02:00
Frank Karlitschek b758725bf7 Try to configure php to enable big file uploads.
This doesn´t work always depending on the webserver and php configuration.
Let´s try to overwrite some defaults anyways
2012-04-01 17:02:32 +02:00
Frank Karlitschek 6545e48787 Show the different editions to the user. Used in the status call, on the personal settings page and in the updater to update to the next available version from the same edition. 2012-04-01 11:20:12 +02:00
Michael Gapczynski 6bb48b2731 Check file handle exists before trying to read file 2012-04-01 02:38:26 -04:00
Tom Needham eba6a65908 try to use transactions to replace db 2012-04-01 00:25:47 +00:00
Tom Needham ffbd72bbcf Fix user app data export 2012-04-01 00:07:39 +00:00
Tom Needham a248cc73e6 Merge branch 'master' into migration 2012-03-31 23:56:16 +00:00
Tom Needham daf742c086 Fix owncloud log 2012-03-31 23:55:41 +00:00
Tom Needham ce89ff15aa Remove db tmp file after export creation 2012-03-31 23:20:08 +00:00
Tom Needham f7d8a8c571 Merge branch 'master' into migration 2012-03-31 22:44:50 +00:00
Tom Needham d20eea9761 Use ajax to download file, OC_Dialogs for errors 2012-03-31 22:41:43 +00:00
Robin Appelman 2f68b08491 fix eventsource for ie 2012-03-31 16:40:42 +02:00
Robin Appelman ebc7a6a0a6 dont send to much when scanning large folders 2012-03-31 16:28:22 +02:00
Robin Appelman 9d2f8aa717 send more progress updates when scanning large folders 2012-03-31 16:24:53 +02:00
Robin Appelman b72d7f1ab3 make sure output buffering is dissabled when using eventsource 2012-03-31 16:20:32 +02:00
Bart Visscher 20fc23c82b Move logfile determination to init function 2012-03-30 23:41:54 +02:00
Bart Visscher 3300d6ea53 checkUpgrade has to be after template initialization
The error path of checkUpgrade uses the template
2012-03-30 23:41:54 +02:00
Bart Visscher a7438189f3 Move more from base init to separate functions 2012-03-30 23:41:53 +02:00
Bart Visscher 3a4521a012 Add support for logging to syslog 2012-03-30 23:41:53 +02:00
Georg Ehrke 926e777061 filter notice and deprecated errors and write a proper error handler function 2012-03-30 23:37:47 +02:00
Robin Appelman 65eee1f69d clean pre-path_hash fscache entries 2012-03-30 19:44:49 +02:00
Georg Ehrke ef1e359c7c Merge branch 'master' into sabredav_1.6 2012-03-30 18:48:30 +02:00
Georg Ehrke 7e53d82ff3 Merge branch 'master' into oc_error 2012-03-30 18:43:09 +02:00
Robin Appelman 7552390031 add path_hash to the filesystem cache 2012-03-30 18:12:33 +02:00
Robin Appelman 523fdda399 add the option to only load apps of a specific type 2012-03-30 14:39:07 +02:00
Robin Appelman a07c6b1a2e optimizations for loadApps 2012-03-30 14:08:18 +02:00
Robin Appelman 7bc9fa765c optimizations for updateApps 2012-03-30 14:08:18 +02:00
Georg Ehrke 90286353e2 Merge branch 'master' into sabredav_1.6 2012-03-29 23:20:03 +02:00
Georg Ehrke e45e48ff3d Merge branch 'master' into oc_error 2012-03-29 23:18:47 +02:00
Georg Ehrke d049d9bd0c initial commit for OC_Exception 2012-03-29 23:16:19 +02:00
Tom Needham 73eca66a89 Fix comments 2012-03-29 10:17:08 +00:00
Robin Appelman 60ba5508a4 add support for installing apps from a subfolder in the zip/tgz file 2012-03-29 00:11:29 +02:00
Robin Appelman d6a9af3138 add support for installing apps from tgz 2012-03-29 00:07:28 +02:00
Robin Appelman d8e9db207f add tempory folder utility to OC_Helper 2012-03-28 23:47:44 +02:00
Georg Ehrke e5c009599d remove check for variable which was set one line above - bugfix for oc-324 2012-03-28 16:38:42 +02:00
Tom Needham ef33219e4f import method returns each apps' import status 2012-03-27 21:21:14 +00:00
Tom Needham 31d268fe92 check for sqlite 2012-03-27 20:55:53 +00:00
Tom Needham 553f4533c0 look for migrate.php in appinfo folder 2012-03-27 20:45:37 +00:00
Tom Needham b201e51528 Stop error on export 2012-03-27 20:43:44 +00:00
Tom Needham c8acd4a594 Merge branch 'master' into migration 2012-03-27 20:19:38 +00:00
Georg Ehrke 536a3ecb42 Merge branch 'master' into sabredav_1.6 2012-03-27 20:54:16 +02:00
Arthur Schiwon c92fc9bf65 return path of tmp file like filestorage/common does. Fixes broken folder-/multifile-download. 2012-03-27 02:24:52 +02:00
Arthur Schiwon 24bc639222 Do not use always the same name for download-zip to avoid collisions. 2012-03-27 01:19:34 +02:00
Arthur Schiwon bcef775d6b Overwrite Download-ZIP if it already exists. We do not want to show alien content. 2012-03-27 01:18:38 +02:00
Robin Appelman 266699ddf9 fix square images not getting proper thumbnails 2012-03-27 00:42:15 +02:00
Robin Appelman 73c6db5c8e crop and resize in a single step when creating thumbnail
also so more explicit memory cleanup
2012-03-26 23:53:48 +02:00
Robin Appelman 0ba9332358 some more memory cleanup in OC_Image 2012-03-26 22:33:37 +02:00
Robin Appelman 0c19e44a61 some more memory cleanup in OC_Image 2012-03-26 22:28:51 +02:00
Georg Ehrke ac0c5ba6da Merge branch 'master' into sabredav_1.6 2012-03-25 14:02:40 +02:00
Michael Gapczynski d139e3c3cd Move Google Docs storage backend to files_remote app 2012-03-24 15:28:05 -04:00
Michael Gapczynski 26fcb35a89 Implement fopen() for Google Docs storage backend 2012-03-24 14:50:17 -04:00
Robin Appelman 109d806617 make sure we can load OC_Config when we need it 2012-03-23 18:55:26 +01:00
Frank Karlitschek 7cad6ccce0 don´t show ugly error message 2012-03-23 16:48:16 +01:00
Frank Karlitschek a191b75c31 make it possible to connect to other ocs appstores and other ocs knowledgebase servers.
also make it possible to switch the app store and the knowledgebase off completely.
2012-03-23 15:52:41 +01:00
Nils Jansen 7ed8f39744 as preperation for the sgf viewer app i added a file icon for .sgf files (saved go games), and an according mimetype. 2012-03-23 13:34:07 +01:00
Georg Ehrke 8e8c4a8edc Merge branch 'master' into sabredav_1.6 2012-03-22 20:40:04 +01:00
Tom Needham 892343c7c1 Fix instance import 2012-03-21 16:30:59 +00:00
Arthur Schiwon 7c815054c7 Config file is more appropriate here
adjust default value
2012-03-21 13:05:15 +01:00
Georg Ehrke 8f8d486f35 Merge branch 'master' into sabredav_1.6 2012-03-21 09:42:53 +01:00
Tom Needham 0fa5e196ef Try to use old uid when importing 2012-03-20 20:32:01 +00:00
Tom Needham 514c9ad8e7 Added unified import method. 2012-03-20 20:19:21 +00:00
Georg Ehrke 89c39b47bc add microsoft office mimetypes to the fixlist - bugfix for oc-357 2012-03-20 18:46:56 +01:00
Bart Visscher 632b3cbbbb Cleanup the template code for redundant code 2012-03-19 21:56:55 +01:00
Bart Visscher 3d8a09b147 Split the init function in lib/base.php a bit 2012-03-19 21:56:55 +01:00
Tom Needham 145d6f3566 Add OC_Migration_Content class to help app devs. Restructure OC_Migrate. 2012-03-19 20:44:20 +00:00
Georg Ehrke fa104fee17 fix mimetype detection 2012-03-19 12:42:33 +01:00
Arthur Schiwon b13ab2b17e enable admin to turn off ZIP downloads
user interface offers multi-file/folder downloads only if available

make function name more clear
2012-03-19 11:56:02 +01:00
Georg Ehrke 33b06c4484 Merge branch 'master' into sabredav_1.6 2012-03-19 08:33:36 +01:00
Tom Needham 77f6872ea4 Shorten export zip names 2012-03-17 17:45:39 +00:00
Tom Needham bc085c3ff4 Create new user, create new data dir, copy files, import app data 2012-03-17 16:25:14 +00:00
Tom Needham 247b25e7a9 Fix structure of export zip 2012-03-17 15:01:08 +00:00
Tom Needham 5234e66bab Add exportinfo to user exports. 2012-03-17 13:53:00 +00:00
Tom Needham 5332c319a2 Migration info is an object. Other fixes 2012-03-16 22:50:35 +00:00
Tom Needham c442a06a02 Fix export for admin and users. Added 3 admin export types 2012-03-16 21:09:36 +00:00
Arthur Schiwon a77edf88c6 check if selected files for zip archive are not too large
offer config option
2012-03-16 16:25:15 +01:00
Arthur Schiwon cfc41942e4 make Files settings work 2012-03-16 16:00:12 +01:00
Tom Needham 50233d075c Improve admin_export ui and move system export cde to OC_Migrate 2012-03-15 20:52:43 +00:00
Bartek Przybylski 0fadbee699 fix adding photo to incorrect gallery 2012-03-15 00:09:06 +01:00
Tom Needham c9be325af2 Fix zip creation. Add param to cleanUp() method. Add defaults to createExportFile() method. 2012-03-14 16:43:06 +00:00
Tom Needham a310a81053 move zip creation inside OC_Migrate 2012-03-13 23:09:43 +00:00
Tom Needham 5a50144a16 typo :/ 2012-03-13 21:29:31 +00:00
Tom Needham fa8b66ca4f Add getApps() method to return apps supporting migration 2012-03-13 21:28:53 +00:00
Tom Needham cd2f75fdad Use data dir from config.php 2012-03-13 17:27:47 +00:00
Tom Needham 0f3eebbbd9 added cleanUp() method to OC_Migrate 2012-03-13 17:18:42 +00:00
Tom Needham 4d5646a59f Find migrate.php even for disabled apps. Improve ui for user and admin migrations 2012-03-13 16:21:17 +00:00
Tom Needham d108bdc7c7 Improved import function. Added param to connectDB() to load the db from the import 2012-03-12 21:41:32 +00:00
Tom Needham 1cdb4396a4 Fix copyRows() return value. Generate app info and oc info on return 2012-03-12 18:40:14 +00:00
Thomas Tanghus d36d317bb2 Contacts: Modifications for using categories. 2012-03-12 14:13:03 +01:00
Tom Needham a2d7e9c6e8 Merge returns from insertData() 2012-03-11 22:13:50 +00:00
Tom Needham fa5a5649c6 Fix copyRows() and sqlite connection 2012-03-11 22:09:16 +00:00
Robin Appelman a85a10b378 oc_db isn't pdo 2012-03-11 21:48:52 +01:00
Bartek Przybylski f6075cc1fe gallery migration to events system 2012-03-11 16:49:42 +01:00
Tom Needham d712d7f52c Lots of fixes, improve copyRows() method and update settings page. 2012-03-10 18:18:58 +00:00
Tom Needham 3ca76d24a9 Add OC_Migrate::copyRows() method 2012-03-10 15:52:38 +00:00
Tom Needham c3dfcc5b21 First basic implementation of migration.db. 2012-03-09 23:33:11 +00:00
Bartek Przybylski b4ffaa9498 spaces to tabs replacement 2012-03-09 16:47:53 +01:00
Bartek Przybylski ca9b4e467f filescan by mimetype scan 2012-03-09 16:45:57 +01:00
Bartek Przybylski 84d6c53970 filecache search comparition fix 2012-03-09 16:28:26 +01:00
Thomas Tanghus 57c4d39b1e Fix conflict. 2012-03-07 20:57:05 +01:00
Thomas Tanghus 75323b86d1 Contacts: UI updates and ajax methods for categories. 2012-03-07 16:39:56 +01:00
Robin Appelman 9f01533710 fix for webdav when having additional storage backends mounted 2012-03-07 15:44:46 +01:00
Robin Appelman f06858689f revert an accidental change 2012-03-03 22:12:17 +01:00
Robin Appelman 72947e46d1 small improvement for is_dir 2012-03-03 21:23:35 +01:00
Robin Appelman bb97cbbb0c fix commong filestorage for files without extention 2012-03-03 21:23:35 +01:00
Robin Appelman 0f54084305 also delete childs of folders from the cache 2012-03-03 21:23:35 +01:00
Robin Appelman 2e365658c8 better handeling of files that can behave like folder (e.g. archives) 2012-03-03 21:23:35 +01:00
Tom Needham 691103acd5 Use json for migration data 2012-03-03 17:30:21 +00:00
Tom Needham 34f05ba180 Udpdate bookmarks migration provider. App version included in export. 2012-03-03 14:35:17 +00:00
Tom Needham 188a304625 Replace db on import. Update user_migration export function. 2012-03-03 13:26:01 +00:00
Robin Appelman 1794ad353d fix file_get_content on empty files for filestorage common 2012-03-03 00:57:52 +01:00
Tom Needham 86fed4c226 Update database.xml locations. Fix dbexport.xml. 2012-03-02 22:19:06 +00:00
Tom Needham 9c79de4aa0 removed duplicate function 2012-03-02 21:47:20 +00:00
Tom Needham 45ef2ecf52 Fix merge conflict 2012-03-02 21:35:48 +00:00
Jakob Sack 90e2962c91 Remove the link between the principals table and the sabre principals connector. 2012-03-02 20:37:49 +01:00
Robin Appelman 48fe85d9bd add streamwrapper that provides a callback on stream close 2012-03-02 18:42:57 +01:00
Robin Appelman e8afe4f158 add search implementation to filestorage common 2012-03-02 18:42:57 +01:00
Robin Appelman b621431c11 don't try to seach apps in hidden folders 2012-03-02 18:42:57 +01:00
Bart Visscher d1dcd7893c Search: Change provider registration to class name, for lazy loading of search providers 2012-03-01 22:59:35 +01:00
Bart Visscher 8c7b13db70 Files: Fix wrong attribute name in OC_Search_Provider_File 2012-03-01 22:59:35 +01:00
Bart Visscher 3d3190309f Simplify stripping the last part off WEBROOT and SERVERROOT for 3rdparty and app dir 2012-03-01 22:59:35 +01:00
Bart Visscher 5dcd9e20d0 Small cleanups 2012-03-01 21:00:23 +01:00
Tom Needham 33c5b3a2ef Added replaceDB method in lib/db.php 2012-03-01 19:41:14 +00:00
Robin Appelman 6ecbaf0041 load streamwrappers earlier 2012-03-01 18:44:33 +01:00
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
Georg Ehrke 097ce76fc4 Merge branch 'master' into sabredav_1.6 2012-02-25 16:29:32 +01:00
Georg Ehrke 0d2f1688e4 add empty methods updatePrincipal and searchPrincipals and change method getPrincipalByPath to work with sabredav 1.6 2012-02-25 16:26:47 +01:00
Georg Ehrke cc15852386 replace Sabre_DAV_Exception_FileNotFound with Sabre_DAV_Exception_NotFound 2012-02-25 09:35:35 +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
Georg Ehrke 1d1dfcbc1a replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime 2012-02-24 22:20:40 +01:00
Georg Ehrke e082d473bb Merge branch 'master' into sabredav_1.6 2012-02-24 18:51:38 +01:00
Arthur Schiwon ca874a3ad7 remove limit from configvalue for long config values 2012-02-24 14:18:09 +01:00
Georg Ehrke eae32e05c9 Merge branch 'master' into sabredav_1.6 2012-02-23 22:12:00 +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
Georg Ehrke 95fe159914 make lib/vobject.php work with sabredav 1.6 2012-02-23 17:20:03 +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
Robin Appelman cc55f00481 fix is_readable and is_writable 2012-01-02 16:38:10 +01:00
Thomas Tanghus 6a7fbf9d13 Added more error checking and debug on missing image support. 2012-01-02 13:40:23 +01:00
Thomas Tanghus c62c55fb81 Added save() to OC_Image. 2012-01-02 12:09:45 +01:00
Georg Ehrke 534b6f3a09 Fix whitespace username 2012-01-02 11:49:53 +01:00
Thomas Tanghus 29048bf4bd Merge git://gitorious.org/owncloud/owncloud into oc_image 2012-01-02 11:47:02 +01:00
Michael Gapczynski 4374d55e5e Correct local permissions checks 2012-01-01 19:59:24 -05:00
Thomas Tanghus fb4c3bd9ce Merge git://gitorious.org/owncloud/owncloud into oc_image 2012-01-02 01:09:22 +01:00
Thomas Tanghus a8789ebe29 Removed static declaration from loadFrom* methods. 2012-01-02 00:43:27 +01:00
Michael Gapczynski a9bab168f5 Replace canRead()/canWrite() with is_readable()/is_writeable() for proper permission checks 2012-01-01 18:41:00 -05:00
Thomas Tanghus db6738478b Mixed up two lines :-P 2012-01-01 23:34:26 +01:00
Thomas Tanghus 312e7993bb Added image type specific loading and displaying.
Added method 'valid()' to tell if image contains a valid resource.
Renamed imageResource() to resource().
2012-01-01 23:26:24 +01:00
Michael Gapczynski a22b5feda6 Initial commit of common filestorage 2012-01-01 17:05:22 -05:00
Michael Gapczynski 7250dc4e98 Fix updateApp() and add extra check to updateApps() 2012-01-01 16:58:51 -05:00
Michael Gapczynski 782d201191 Move to branch 2012-01-01 16:25:43 -05:00
Michael Gapczynski 19328fd8b2 Initial commit of common filestorage 2012-01-01 15:56:33 -05:00
Thomas Tanghus 929ce2b566 Small fixes 2012-01-01 20:06:35 +01:00
Thomas Tanghus c500c1e930 Removed some denug statements and an exception thrown. 2012-01-01 18:07:46 +01:00
Thomas Tanghus 6207c0444b Added class OC_Image 2012-01-01 17:57:26 +01:00
Tom Needham cbb2db8622 Fix merge conflicts 2012-01-01 01:18:02 +00:00
Tom Needham 39e67707d7 Updated jquery ui js and css. Improved color scheme. 2011-12-30 22:47:39 +00:00
Daniel Köb eb4cd86910 Include PostgreSQL when checking for available database drivers.
Signed-off-by: Brice Maron <brice@bmaron.net>
2011-12-30 21:09:29 +01:00
Robin Appelman 3844fb0e4c also use fscache when getting used space for webdav 2011-12-14 01:19:23 +01:00
Robin Appelman 835d6a9b6e save quota in human readable format (42 MB), should prevent some of the overflow related problems 2011-12-14 01:16:14 +01:00
Robin Appelman c67c933d3f Merge branch 'database' into filesystem 2011-12-11 23:57:53 +01:00
Robin Appelman 9fdd1bafdc Merge branch 'master' into filesystem 2011-12-11 23:42:22 +01:00
Robin Appelman 5e711f37ca make filesize parsing case insensitive 2011-12-11 23:34:27 +01:00
Robin Appelman efecb694ef make filesize parsing case insensitive 2011-12-11 23:33:24 +01:00
Robin Appelman a8148fa94a update apps when their version number increases 2011-12-11 22:08:01 +01:00
Robin Appelman 7f1bb5fd78 Merge branch 'master' into database 2011-12-11 22:00:17 +01:00
Bart Visscher 1746cba249 Some small changes 2011-12-09 22:36:39 +01:00
Bart Visscher a3cb04013e Update OC_VObject 2011-12-09 21:56:03 +01:00
Bart Visscher eeaf539a44 Gallery: splitout model code 2011-12-08 20:05:12 +01:00
Bart Visscher 0342b5fc43 Fix filename of log icon 2011-12-07 20:41:00 +01:00
Bart Visscher c67ac46b6c Use a proxy class to interface with Sabre_VObject classes 2011-12-07 20:40:58 +01:00
Robin Appelman 153029a170 increase version to trigger database upgrade 2011-11-26 01:26:01 +01:00
Robin Appelman a8e4d2946a Merge branch 'database' into filesystem 2011-11-26 01:25:08 +01:00
Bart Visscher 43911d9a6f Template: output better html for select options 2011-11-24 21:36:34 +01:00
Frank Karlitschek fab70cb590 removed no longer used function and exec command
security++
2011-11-24 13:50:29 +01:00
Hendrik Langer 76bfc3b547 set http auth headers for apache+php-cgi work around if variable gets renamed by apache 2011-11-24 02:59:22 +01:00
Georg Ehrke 6c4692380f Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar 2011-11-20 11:41:58 +01:00
Frank Karlitschek 7df9d934ca second half of the updating stuff 2011-11-19 12:02:34 +01:00
Frank Karlitschek 949bd2c47a first small step to an automatic updating system.
At the moment we only have a hint that a new version is avaiable and a link to a not yet existing page if updating information. This has to be improved.
2011-11-19 11:56:40 +01:00
Robin Appelman 98dc0882cb fix errors during database migration 2011-11-15 16:08:08 +01:00
Robin Appelman 916c72b40b set the installed version after updating the database 2011-11-15 15:59:01 +01:00
Robin Appelman 9686c5b6aa fixes in the sqlite manager driver 2011-11-15 15:58:12 +01:00
Robin Appelman b2f1429b75 automatically upgrade the main database on version number increase (doesnt work with sqlite for now) 2011-11-13 16:16:21 +01:00
Robin Appelman aa7c5a971c small fix in sqlite3 driver 2011-11-13 16:08:47 +01:00
Robin Appelman 486a31bfa3 minor changes to mysql setup 2011-11-13 16:06:29 +01:00
Robin Appelman bf40691ace some fixes in the sqlite3 driver 2011-11-12 18:06:07 +01:00
Georg Ehrke e5a3ab8aad Merge branch 'master' into fullcalendar 2011-11-12 15:09:37 +01:00
Robin Appelman 024f4375b6 keep encrypted and versioned flag in fscache 2011-11-12 01:00:04 +01:00
Robin Appelman b2f2a87745 use cache for searching files 2011-11-10 23:50:43 +01:00
Robin Appelman 7543ffa3b1 always load the filecache 2011-11-10 16:53:08 +01:00
Robin Appelman 524e3686a0 tell the user when the files are being scanned 2011-11-10 16:40:09 +01:00
Bart Visscher ef124c3e21 Use a function to generate select options 2011-11-09 22:19:52 +01:00
Robin Appelman 5a6aba1e11 provide caching for file metadata 2011-11-09 18:41:57 +01:00
Jakob Sack b3a73c78e8 Fix comments/documentation 2011-11-09 11:35:50 +01:00
Robin Appelman 5cc6635eb8 remove OC_Filesystem::fromUploadedFile 2011-11-08 22:36:05 +01:00
Robin Appelman ca6c500799 remove OC_Filesystem::fileatime 2011-11-08 22:26:03 +01:00
Robin Appelman ec015a2e68 remove the need to register storage providers, pass the classname during mounting instead 2011-11-08 22:21:25 +01:00
Robin Appelman 878fc1d197 remove outdated remote storage prototype 2011-11-08 22:18:41 +01:00
Florian Vichot 452a463764 Make OC_Connector_Sabre_File::get() return a PHP stream instead of the file content, as is recommended by SabreDAV to handle large files. 2011-11-06 22:39:24 +01:00
Brice Maron 3940ca3df1 Display correctly the error message when nothing is retrieved from OCS servers 2011-11-06 16:48:26 +01:00
Brice Maron 7de591f5cc Avoid Huge error message when unable to read log file 2011-11-06 14:37:22 +01:00
Robin Appelman 7b3ae2edd4 use database table prefix from installer, not the old configured value 2011-11-03 13:09:51 +01:00
Brice Maron c7d1737d47 attempt to manage some special chars in file list
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
2011-11-01 22:35:13 +01:00
Brice Maron e533e82bc9 Add sequence name in insertid to be more portable 2011-10-29 11:40:48 +02:00
Bart Visscher 7b01858c57 Enable php display_errors setting 2011-10-27 22:48:50 +02:00
Bart Visscher 9832a0817d Merge branch 'master' into fullcalendar
Conflicts:
	apps/calendar/index.php
2011-10-24 22:40:22 +02:00
Robin Appelman f073041b0b provide function for updating the database scheme 2011-10-23 15:25:38 +02:00
Robin Appelman 6592fbb948 improve detection of database backend 2011-10-23 12:32:33 +02:00
Robin Appelman 122fa190c6 improve mimetype detection 2011-10-23 11:35:29 +02:00
Robin Appelman 38bb503ff6 fix fopen 2011-10-23 11:35:29 +02:00
Frank Karlitschek 3acea2f574 change the error hint from suggesting to change the owner of a directory to changing the permissions. changing the owner of a director is not possible via ftp. 2011-10-22 19:39:05 +02:00
Georg Ehrke 0011c42669 Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar 2011-10-22 13:12:13 +02:00
Robin Appelman 7761765a4b change licencing headers for sqlite3 driver 2011-10-22 12:31:07 +02:00
Robin Appelman af1f0305eb fix log level check 2011-10-22 12:22:57 +02:00
Bart Visscher 4fe48a50f0 Translation of calendar interface 2011-10-20 23:49:27 +02:00
Robin Appelman 3a937f79f7 escape filenames for getMimeType 2011-10-20 22:55:27 +02:00
Robin Appelman 8f77179d29 Merge commit 'refs/merge-requests/64' of git://gitorious.org/owncloud/owncloud 2011-10-20 01:24:23 +02:00
Robin Appelman 273972b75a prevent sql error while initializing apps on sqlite2 2011-10-20 01:17:02 +02:00
Hendrik Langer 466b41c36b Don't use sys_get_temp_dir(), as it reports the wrong path in restricted environments 2011-10-19 23:38:35 +02:00
Robin Appelman b975f11514 make sharing work with the new mouting mechanism 2011-10-18 21:19:13 +02:00
Robin Appelman 28ab39073a mount filesystems on demand 2011-10-18 21:01:49 +02:00
Brice Maron ebd36d56ca Remove unnecessary exec for getting timezone and fix spacings 2011-10-17 21:42:38 +02:00
Robin Appelman 595b13f1e0 prevent the remaining ob_clean related errors 2011-10-17 01:18:02 +02:00
Robin Appelman 77378fa189 fix now() function for sqlite3 2011-10-17 00:25:13 +02:00
Brice Maron 1f6be85719 Fix bookmarks app to work with postgresql.
Rework the bookmark app to manage postgresql.
Add a fetchOne function into the PdoStmtWrapper
Fix a tipo in comments.
2011-10-16 23:03:03 +02:00
Robin Appelman b0127e3918 use OC_Log instead of error_log 2011-10-16 21:42:24 +02:00
Robin Appelman d9372ac766 make log level configurable 2011-10-16 21:11:03 +02:00
Robin Appelman 820cd0fb75 provide a logging mechanism 2011-10-16 21:11:03 +02:00
Robin Appelman d11a8f4103 some minor tweaks to oc_db 2011-10-16 21:11:03 +02:00
Brice Maron 90c54ade67 Fix typo in getting var from config 2011-10-16 21:08:07 +02:00
Brice Maron c105268a1d Fetch prefix from config at installation instead of a hardcoded value 2011-10-16 21:06:48 +02:00
Brice Maron 543537ef29 Fix installer for postgresql : correct table detection query 2011-10-16 20:23:43 +02:00
Georg Ehrke 9ce15667d5 Merge branch 'calendar' of gitorious.org:owncloud/owncloud 2011-10-16 15:41:00 +02:00
Robin Appelman 512d226d43 merge database into master 2011-10-16 13:54:21 +02:00
Georg Ehrke a01d10e57d Merge branch 'master' into calendar 2011-10-13 21:59:16 +02:00
Robin Appelman db2fb38746 prevent error involving webdav workaround 2011-10-13 21:55:02 +02:00
Robin Appelman f1fd374a6f webdav workaround for apache+php-cgi 2011-10-13 16:33:39 +02:00
Robin Appelman d7fa2a0f77 mimetype icon improvements 2011-10-13 16:33:39 +02:00
Robin Appelman ffb9a0475e webdav workaround for apache+php-cgi 2011-10-13 16:31:01 +02:00
Joar Wandborg 9d3c7badb5 Fixed a bug in checkWebserverUser
checkWebserverUser would return the owner of the document
root instead of the owner of the web server process.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-11 21:46:14 +02:00
Georg Ehrke 4cbae823eb Merge branch 'master' into calendar 2011-10-10 21:08:11 +02:00
Robin Appelman 9ba384b9a4 merge master into database 2011-10-10 21:05:39 +02:00
Robin Appelman 8b3c4e9a52 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-10 20:57:15 +02:00
Frank Karlitschek 6163351ea2 master is now on the way to ownCloud 3 2011-10-10 18:48:40 +02:00
Robin Appelman 949494ccfd mimetype icon improvements 2011-10-08 21:18:47 +02:00
Tom Needham 538abb99f1 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-07 17:10:50 +01:00
Robin Appelman 1f562a2e83 fixes for the mimetype icons 2011-10-07 18:09:49 +02:00
Tom Needham 65a491eabd Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-07 17:02:56 +01:00
Borjan Tchakaloff 3388381deb Fixed the 'Undefined index "user_id"' bug when requesting a publicly shared folder and being logged-out.
The OC_App::navigation array contains by default only the help menu.
2011-10-05 14:31:33 +04:00
Tom Needham 2d9c3d75f3 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-04 19:17:23 +01:00
Marvin Thomas Rabe 33f24a42b8 redirect url fixed 2011-10-04 19:27:57 +02:00
Tom Needham 02d7b1a1fc Added breadcrumb and control bar. 2011-10-03 22:59:40 +01:00
Marvin Thomas Rabe baf2fa3a9f Merge branch 'master' of git://gitorious.org/owncloud/owncloud 2011-10-03 14:47:41 +02:00
Marvin Thomas Rabe 6d8985ceb2 added infield labels. readded fade in of login button. updated label on install page. 2011-10-03 14:41:55 +02:00
Georg Ehrke 25544d31f9 added mime type for calendar files 2011-10-03 12:16:06 +02:00
Frank Karlitschek 0eddc5cae2 bump version number 2011-10-02 18:15:01 +02:00
Robin Appelman 88f4f5413a add OC_Appconfig::hasKey 2011-10-02 14:30:51 +02:00
Bart Visscher 21a88613a1 Merge branch 'lostpassword'
Conflicts:
	core/templates/login.php
	index.php
	lib/util.php
2011-09-30 23:48:20 +02:00
Bart Visscher f4782a7690 Check if the application is actually enabled 2011-09-30 23:17:18 +02:00
Marvin Thomas Rabe ccfa2dd24c Error when only oc_remember_login cookie set fixed.
Filled username field when oc_username is set repaired.
Problems with "advanced settings" button in installation wizard fixed.
CSS improved - login and installation now looks more clean.
Request password link removed (email feature not implemented yet).
Database radio button bugs removed.
It is possible to have an empty database password, now ownCloud will support this "security issue".
Ignore Mac OS X ".DSstore" files.
Fade in/out of login button and remember checkbox removed due to some display errors.
2011-09-30 18:25:34 +02:00
Thomas Schmidt c3b57944ac Revert "enhance detection of un-initialized database", conflicted with setup step, needs rework
This reverts commit 7fb89c5386.
2011-09-30 17:03:04 +02:00
Thomas Schmidt 7fb89c5386 enhance detection of un-initialized database 2011-09-30 14:40:17 +02:00
Thomas Schmidt 182333a781 use central method for checking webserver user 2011-09-29 15:54:41 +02:00
Thomas Schmidt 6636720d2d enhance warning 2011-09-29 15:53:58 +02:00
Bart Visscher 19d4121763 Change json content-type to correct IANA type 2011-09-28 23:17:25 +02:00
Tom Needham 1f74e76d83 Implemented ace-edtior as an app. Basic file editing and saving supported. 2011-09-28 15:15:04 +01:00
Frank Karlitschek f14a62c875 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-09-28 13:53:51 +02:00
Frank Karlitschek f2a7f230f1 add status file. useful for external administration. show the ownClopud version at least in the config dialog. 2011-09-28 13:52:26 +02:00
Frank Karlitschek 475dd72ea4 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-09-28 11:52:13 +02:00
Frank Karlitschek 0fcd765bd5 add check for ctype 2011-09-28 11:47:29 +02:00
Thomas Schmidt 40b47defcb enhance errormessages on setup 2011-09-28 11:46:04 +02:00
Bart Visscher c6f78fbe43 Add flag in info.xml to control the apps that are installed by default 2011-09-27 22:36:14 +02:00
Frank Karlitschek 10c5178e31 check for php modules 2011-09-27 19:08:38 +02:00
Bart Visscher 2d3c1a3f00 Fix space in comment 2011-09-26 21:18:37 +02:00
Bart Visscher aae6881494 Move display of login page to function in OC_Util 2011-09-26 21:17:17 +02:00
Robin Appelman bcf92badd1 dont set content type to json for Apps 2011-09-26 00:19:34 +02:00
Bart Visscher 17e631bc5e Use OC_JSON for json responses
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
2011-09-25 22:19:28 +02:00
Robin Appelman 6c2b22406c remove some debug statements 2011-09-25 01:33:53 +02:00
Robin Appelman 57bffdb46a fix uploading files using webdav 2011-09-25 01:20:43 +02:00
Florian Pritz 36c31b0e83 fix warning when uploading file using webdav
When uploading a file using davfs php warned about a missing argument to
OC_FileProxy_Quota::preFile_put_contents(). Since we get a resource from
OC_Connector_Sabre_File->put(), we have to convert that before running
strlen because it expects a string.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:01 +02:00
Florian Pritz c7d4e72341 set cookie secure if forcessl is enabled
This also moves session_start in lib/base.php down a bit because we need
OC::$SERVERROOT to get the config settings.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:00 +02:00
Florian Pritz 8648e3c43c only call error_log() if DEBUG is true
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:47 +02:00
Florian Pritz 2267b6e97d use jquery 1.6.4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:43 +02:00
Bart Visscher e9950defb2 Make event category choice multiselect 2011-09-23 19:40:06 +02:00
Bart Visscher e990ef3542 Move some common code to OC_Util
Created the following function:
 - checkLoggedIn
 - checkAdminUser
 - redirectToDefaultPage
2011-09-18 21:31:56 +02:00
Bart Visscher 8966ed5a00 Cleanup lib/base.php 2011-09-18 20:57:05 +02:00
Bart Visscher 82c7598861 Remove global vars and use the OC static version.
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
2011-09-18 19:37:54 +02:00
Bartek Przybylski 6e980d419c Merge branch 'master' of git://gitorious.org/owncloud/owncloud 2011-09-18 15:06:51 +02:00
Bartek Przybylski 94696ea7de remember changed not to store password in cookie 2011-09-18 15:05:53 +02:00
Robin Appelman 39fa5d1c7f always use mdb2 for installation 2011-09-18 14:05:38 +02:00
Robin Appelman b86367866e merge master into database 2011-09-18 13:47:15 +02:00
Robin Appelman 0714e83a8e fix creating groups 2011-09-18 13:35:27 +02:00
Bartek Przybylski 68e7666293 Changed behaviour of remember checkbox 2011-09-18 09:15:30 +02:00
Robin Appelman 8c7aa06088 dont use numRows when it's not needed since it can be expensive 2011-09-17 02:49:40 +02:00
Robin Appelman 5e3ecbbf96 dont use numRows when it's not needed since it can be expensive 2011-09-17 02:36:04 +02:00
Robin Appelman 0e2b957dac add pdo backend to oc_db 2011-09-17 02:30:58 +02:00
Jan-Christoph Borchardt b1e3961825 removed excess white space inside parentheses 2011-09-12 12:30:57 +02:00
Jan-Christoph Borchardt 014f4af79c fixed translation detection thanks to Xuetian Weng 2011-09-12 12:29:43 +02:00
Bart Visscher 760b47a62f Use OC_Helper::linkTo also for absolute urls.
One central place to check for https.
2011-09-09 22:19:15 +02:00
Jan-Christoph Borchardt 252bca5057 removed database table prefix choice, use oc_ 2011-09-04 14:56:09 +02:00
Aloisio Almeida Jr ec87e2eac4 setup.php: Get 'datadirectory' from config file instead of 'datadir'
Signed-off-by: Aloisio Almeida Jr <aloisiojr@gmail.com>
2011-09-03 21:22:09 -03:00
Bart Visscher 3130234640 Remove execute permissions from source files 2011-09-03 22:15:23 +02:00
Côme BERNIGAUD 3972774a2e Removed db4app and test_db 2011-09-01 15:58:47 +02:00
Côme BERNIGAUD 40d9439d4e Merge branch 'master' of git.kde.org:owncloud 2011-09-01 15:21:27 +02:00
Jan-Christoph Borchardt 7fa1f8161c do not user directories when navigating to /data. Needs more security. 2011-08-31 11:41:09 +02:00
Jan-Christoph Borchardt e4f70d5bbb files not viewable from the outside by adresses anymore 2011-08-31 11:28:18 +02:00
Jan-Christoph Borchardt efa3085073 fixed picture preview broken for some, thanks to Felix on Shapado 2011-08-29 17:09:22 +02:00
Côme BERNIGAUD b92603b3fd Translation for date column 2011-08-28 23:11:45 +02:00
Robin Appelman 5c9178f851 Fixed a bug in appconfig, where an initially empty set value led to endless duplicates of this app/key pair.
Path by Elias Probst <mail@eliasprobst.eu>
2011-08-28 19:36:23 +02:00
Michael Gapczynski 74c7890fbb Fix undefined index license in Apps 2011-08-27 17:56:22 -04:00
Côme BERNIGAUD 52ca447efc Merge branch 'master' of git.kde.org:owncloud 2011-08-27 18:11:32 +02:00
Côme BERNIGAUD e8fa2d3442 Added db4app lib, and apps test_db that shows how it works.
Also fixed a typo in db.php
2011-08-27 18:09:14 +02:00
Jan-Christoph Borchardt 11c2aff8c9 fixed installer failing due to htaccess. Thanks to Elias Probst 2011-08-27 10:19:45 +02:00
Robin Appelman ee0954b236 fix issue with login being case insensitve 2011-08-25 21:51:13 +02:00
Robin Appelman 391e064e67 allow apps to register form for the settings and admin pages 2011-08-23 01:41:18 +02:00
Robin Appelman d851bdac90 fix .htaccess file crashing apache+php-cgi 2011-08-22 17:18:54 +02:00
Robin Appelman af3080402b fix installing shipped apps 2011-08-22 14:17:38 +02:00
Frank Karlitschek 109302a928 add some todos 2011-08-20 11:53:14 +02:00
Jan-Christoph Borchardt d9aae20003 more valid HTML, alt attributes, refactored pagenavi etc. 2011-08-20 05:07:58 +02:00
Jan-Christoph Borchardt 683e125042 Merge branch 'sharing' 2011-08-17 13:48:36 +02:00
Frank Karlitschek cb9fc6d901 make the help section working and pretty. knowledge base entries are fetched via OCS from a different server. cool stuff 2011-08-17 00:24:50 +02:00
Michael Gapczynski e4c9871299 This should actually make the 'Shared' directory automatically everytime 2011-08-15 20:45:07 -04:00
Michael Gapczynski 5fbed936bf Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' directory 2011-08-15 20:33:02 -04:00
Michael Gapczynski 1ec75330ec Merge branch 'master' into sharing 2011-08-15 17:49:36 -04:00
Robin Appelman 13cbd7f578 some filesystem fixes 2011-08-15 22:55:14 +02:00
Robin Appelman 6173c0fbc2 a bit of refactoring for oc_filesystem and implement user quota 2011-08-15 21:09:13 +02:00
Jan-Christoph Borchardt 2cb231d0a4 resolved merge conflict 2011-08-14 19:31:38 +02:00
Jan-Christoph Borchardt 9648be97fb better error messages for installation, still need to be inline 2011-08-13 05:37:12 +02:00
Jan-Christoph Borchardt 4a5ee765cf merged admin, help and settings to settings 2011-08-13 05:13:34 +02:00
Michael Gapczynski 122018889a Merge branch 'master' into sharing
Conflicts:
	files/css/files.css
2011-08-12 21:00:41 -04:00
Michael Gapczynski 67156f87e3 Add missing parameter to usersInGroup() 2011-08-12 20:53:36 -04:00
Michael Gapczynski ffe9da91af Add missing parameter to usersInGroup() 2011-08-12 20:51:01 -04:00
Frank Karlitschek c2a5b49834 better error reporting during installation 2011-08-12 19:22:29 +02:00
Jan-Christoph Borchardt 0b4ed25776 fixed downloading of files with spaces in name for Firefox 2011-08-12 12:03:59 +02:00
Jan-Christoph Borchardt 6c4d075bd6 added jquery-tipsy for nice title tooltips 2011-08-12 11:26:13 +02:00
Michael Gapczynski 4830555cce Merge branch 'master' into sharing
Conflicts:
	.gitignore
2011-08-11 17:42:37 -04:00
Jan-Christoph Borchardt 99790d6805 lots of image changes, use svg EVERYWHERE POSSIBLE 2011-08-11 19:00:32 +02:00
Frank Karlitschek aa582ec43a more work on encryption 2011-08-11 17:49:36 +02:00
Frank Karlitschek d75faac09e Merge branch 'master' of git.kde.org:owncloud 2011-08-11 16:33:53 +02:00
Frank Karlitschek 5b9f6b4001 hide the files admin page as long as we don have settings on the page 2011-08-11 16:24:53 +02:00
Robin Appelman 50c1553c38 automaticaly login after setup 2011-08-11 16:22:25 +02:00
Robin Appelman bc5bf18eed bit of work on app management 2011-08-11 15:11:06 +02:00
Jan-Christoph Borchardt b4e89871dd merged master into sharing 2011-08-11 13:29:22 +02:00
Robin Appelman bfd72501a1 add OC_Group::usersInGroup() to get a list of all users in a group 2011-08-11 10:12:17 +02:00
Jan-Christoph Borchardt 05f3910718 moved search box directly to template 2011-08-10 22:56:55 +02:00
Robin Appelman f03874ac49 work on user management 2011-08-10 22:38:28 +02:00
Michael Gapczynski e1bde1a78e Merge branch 'master' into sharing
Conflicts:
	files/templates/index.php
2011-08-10 13:40:47 -04:00
Frank Karlitschek 613ab41eb3 more work on the encryption library 2011-08-10 17:24:38 +02:00
Robin Appelman 1f1498ceca remove Log completely 2011-08-10 14:03:54 +02:00
Robin Appelman cdf91b6b3e work in new app management 2011-08-10 14:03:54 +02:00
Robin Appelman 9059b55979 make more strings translatable 2011-08-10 14:03:54 +02:00
Jakob Sack c958a44e46 Copying globals to OC::* 2011-08-10 11:18:35 +02:00
Jakob Sack 7b653dbca6 use sprintf for translations 2011-08-10 11:08:30 +02:00
Michael Gapczynski ec6aed8475 Merge branch 'master' into sharing 2011-08-09 10:42:50 -04:00
Serge Martin 97462b018d Merge MySQL and PostgreSQL input fields 2011-08-09 11:32:22 +02:00
Robin Appelman 7b38e5d7c7 apps can now add their own forms to the Personal page 2011-08-08 23:46:52 +02:00
Jakob Sack 962907ee6f Merge branch 'master' of git://anongit.kde.org/owncloud
Conflicts:
	lib/template.php
2011-08-08 23:16:30 +02:00
Jakob Sack 4b967a9414 Minor improvements 2011-08-08 23:14:47 +02:00
Robin Appelman d1d47eb5eb do proper styling for settings pages 2011-08-08 22:38:42 +02:00
Robin Appelman e6f6d3dabc dont use a different navigation page for settings stuff 2011-08-08 21:43:31 +02:00
Bartek Przybylski 8bd82b96f3 checking for apache server in setup 2011-08-08 21:41:20 +02:00
Michael Gapczynski 1aa89b7cbb Merge branch 'master' into sharing
Conflicts:
	files/css/files.css
	lib/base.php
2011-08-07 15:56:26 -04:00
Serge Martin 3e8ae8636c Add postgresql support
REVIEW: 102101
2011-08-07 21:06:53 +02:00
Serge Martin acf7916e71 user is a reserved word in postgresql 2011-08-07 19:02:41 +02:00
Frank Karlitschek a0b7b85c56 remove debug 2011-08-07 18:00:35 +02:00
Frank Karlitschek 58c2d29f8c report the right webserver user to simplify setup and debug 2011-08-07 17:58:56 +02:00
Frank Karlitschek b2702c4406 fix include path 2011-08-07 17:39:38 +02:00
Frank Karlitschek 51caa624bb first step to file encription 2011-08-07 17:32:48 +02:00
Frank Karlitschek 1dc3cb67fa more improved error reporting 2011-08-06 23:31:38 +02:00
Frank Karlitschek a689fa18df Merge branch 'master' of git.kde.org:owncloud 2011-08-06 23:19:40 +02:00
Frank Karlitschek b513a60540 nicer error report and streamlined setup 2011-08-06 23:19:00 +02:00
Jakob Sack 63de1841a6 Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-06 23:10:14 +02:00
Jakob Sack 42a6549729 Database.xml 2011-08-06 23:09:38 +02:00
Robin Appelman be9c044b24 descriptions for OC:: variables 2011-08-06 23:04:39 +02:00
Jakob Sack d9ccbe96dd fix template.php ;-) 2011-08-06 17:00:06 +02:00
Jakob Sack 501b767e6e Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-06 11:38:49 +02:00
Jakob Sack 5f7c040ec0 Add principals, minor changes in base.php 2011-08-06 11:36:56 +02:00
Robin Appelman faf6c0e8e1 fix some forgotten quotes around strings 2011-08-05 11:19:46 +02:00
Jan-Christoph Borchardt 6d5cb13018 fixed relative time calculation 2011-08-05 08:19:51 +02:00
Robin Appelman a2062036d3 selecting a text file from the search results now activates the text viewer 2011-08-03 00:30:21 +02:00
Robin Appelman e50abdd355 limit the length of the mysql username during setup 2011-08-02 21:33:35 +02:00
Jakob Sack db90b2e44a prepare replacing global $vars with OC::$vars 2011-08-02 18:48:19 +02:00
Jakob Sack c50a83cd8d Introducing a semiautoload. Enables autoload for classes that are not in lib/ 2011-08-02 18:31:42 +02:00
Michael Gapczynski ddfc9fc001 Move registering shared storage out of base 2011-08-01 10:58:15 -04:00
Robin Appelman 2d19965750 some improvements to collection scanning 2011-08-01 00:07:46 +02:00
Robin Appelman 14f7daf53c add transitions to oc_db 2011-07-31 20:24:53 +02:00
Michael Gapczynski 17058c9467 Merge branch 'master' into sharing 2011-07-31 12:53:34 -04:00
Robin Appelman b93b066a42 fix search results having files from other users 2011-07-31 15:35:37 +02:00
Robin Appelman 5ef407d1c9 keyboard shortcuts for search results 2011-07-31 04:03:48 +02:00
Robin Appelman 2c8b4da840 make sure jquery and common javascript is loaded before the javascript of the apps 2011-07-31 02:24:46 +02:00
Robin Appelman 0bc16683e5 dont show music results twice 2011-07-31 02:20:34 +02:00
Michael Gapczynski 0d3ebbfefd Merge branch 'master' into sharing 2011-07-30 19:57:57 -04:00
Michael Gapczynski 11d1627513 Merge branch 'master' into sharing. Integrate with changes in master, rename classes
Conflicts:
	lib/base.php
2011-07-30 19:40:19 -04:00
Robin Appelman 1564a40538 dont show the full path for the files in search results 2011-07-31 01:26:13 +02:00
Robin Appelman 0503c3499e configure users/groups before loading apps 2011-07-31 00:23:06 +02:00
Jakob Sack 0dab7f2e53 laod apps ways earlier! 2011-07-31 00:06:17 +02:00
Robin Appelman aafd36e2f3 provide json interface for search 2011-07-30 16:42:20 +02:00
Jakob Sack bafd684eb6 Renaming classes :-) 2011-07-29 21:36:03 +02:00
Jakob Sack 2ff8d7a8bc One class per file! 2011-07-29 21:03:53 +02:00
Jakob Sack 2bfad189e7 Merge branch 'master' of git://anongit.kde.org/owncloud into autoload
Conflicts:
	lib/base.php
	lib/filestorage.php
2011-07-29 20:42:24 +02:00
Michael Gapczynski 5fd77084c4 Merge branch 'master' into sharing
Conflicts:
	core/templates/layout.user.php
2011-07-29 13:58:13 -04:00
Robin Appelman d12d08e2f3 some more changes for navigation subentries 2011-07-29 19:43:06 +02:00
Robin Appelman fe47d51598 some refactoring for subnavigation code 2011-07-29 19:12:55 +02:00
Michael Gapczynski fcc9f50641 Merge branch 'master' into sharing
Conflicts:
	files/templates/index.php
2011-07-29 10:23:15 -04:00
Robin Appelman 6d0c8ea7e4 use proper file icons for image and audio files 2011-07-29 01:37:08 +02:00
Jan-Christoph Borchardt f1616b0e62 implemented relative file size and coloring 2011-07-29 00:46:20 +02:00
Robin Appelman f1c2b5b304 set installed version in config file 2011-07-28 23:34:39 +02:00
Robin Appelman 20f5a9f085 bumb version number for upcomming beta 2011-07-28 23:34:39 +02:00
Robin Appelman 7d15a45e09 use oc_preferences to store ocs privatedata 2011-07-28 20:23:58 +02:00
Robin Appelman 0d408fe6f5 make use of the command line tools id3info and mp3info for scanning music if they are available 2011-07-28 20:10:58 +02:00
Robin Appelman 7505720350 fix log when no tablename prefix is used 2011-07-27 22:44:51 +02:00
Jakob Sack e69079f935 Further improvements 2011-07-27 20:04:42 +02:00
Jakob Sack 924100dd8c One class per File 2011-07-27 19:52:24 +02:00
Jakob Sack f5c0dbd947 Use autoload 2011-07-27 19:07:28 +02:00
Michael Gapczynski ff3140052a Merge branch 'master' into sharing 2011-07-26 21:29:44 -04:00
Robin Appelman 98cd83fabd bumb jquery and jquery-ui versions 2011-07-25 23:16:05 +02:00
Robin Appelman edec37b402 add OC_APP::getCurrentApp() to get the id of the active app 2011-07-25 20:25:53 +02:00
Robin Appelman 9a989a284a fix sabredav for sqlite2 2011-07-25 03:14:22 +02:00
Michael Gapczynski 415ae8e40a Merge branch 'master' into sharing 2011-07-24 16:08:39 -04:00
Jakob Sack 3097e4f48a Merge branch 'sabredav' 2011-07-22 23:18:08 +02:00
Jakob Sack ccc94819e2 Merge branch 'sabredav' of git://anongit.kde.org/owncloud into sabredav 2011-07-22 23:16:43 +02:00
Jakob Sack 5416c0e6f8 Remove HTTP_Webdav 2011-07-22 23:16:14 +02:00
Robin Appelman 18a36be28c fix problem with removing locks 2011-07-22 23:06:53 +02:00
Jakob Sack 3b92ec12c2 Properties work fine now 2011-07-22 22:30:45 +02:00
Jakob Sack 5851da47f1 properties nearly work 2011-07-22 16:21:29 +02:00
Jakob Sack 7c9f356abe Support for locks, minor changes 2011-07-22 14:38:42 +02:00
Michael Gapczynski 0387cc5f1f Merge branch 'master' into sharing 2011-07-21 19:18:26 -04:00
Robin Appelman f441059b01 add getLocalFile to local storage provider 2011-07-22 06:29:45 +02:00
Robin Appelman 8eefd42a7d only remove old sqlite database if it exists 2011-07-21 00:52:48 +02:00
Michael Gapczynski 6af4c465b8 Change all occurences of ['user_id'] to OC_USER::getUser() 2011-07-20 16:52:01 -04:00
Michael Gapczynski 1cfa911ce3 Update database.xml to current database fields, remove hard coded MTGap when mounting shared storage provider 2011-07-20 14:42:48 -04:00
Michael Gapczynski abf6ba621a Merge branch 'master' into sharing 2011-07-20 14:30:19 -04:00
Jakob Sack 86cd8063b4 Use SabreDAV authentication Code! 2011-07-20 16:36:36 +02:00
Jakob Sack bf1ca75710 Integration of SabreDAV 2011-07-20 15:53:34 +02:00
Bartek Przybylski c5776fdae4 remember login added 2011-07-20 15:04:14 +02:00
Robin Appelman 6935f036a5 move list of mimetypes by extention to a seperate file. 2011-07-17 17:41:46 +02:00
Michael Gapczynski f09f2d3290 Fix typo in setup, thanks for pointing it out ab0oo 2011-07-13 17:19:13 -04:00
Michael Gapczynski ecaf66ee97 Add missing argument for fromTmpFile() inside of rename() 2011-07-13 13:47:45 -04:00
Michael Gapczynski 5896e48755 Add missing argument for fromTmpFile() inside of rename() 2011-07-13 13:30:22 -04:00
Michael Gapczynski a79f2535f8 Merge branch 'master' into sharing 2011-07-12 20:51:07 -04:00
Michael Gapczynski a861666500 Add missing parameter for fromTmpFile() inside of copy() 2011-07-12 20:50:04 -04:00
Michael Gapczynski 2c4fef91da Merge branch 'master' into sharing 2011-07-12 18:38:03 -04:00
Michael Gapczynski f8eced1960 Fix post_create and post_write hooks in copy(), was referencing an undefined variable 2011-07-12 18:26:44 -04:00
Michael Gapczynski 6b303ee64b Fix bug in opendir() and remove getStorageMountPoint(), now using datadir argument instead 2011-07-12 13:10:29 -04:00
Michael Gapczynski 5e560e9bd9 Merge branch 'master' into sharing 2011-07-06 20:19:44 -04:00
Jan-Christoph Borchardt e3fd72dc16 introducing simple file size, only MB as unit, details on hover 2011-07-07 01:27:16 +02:00
Michael Gapczynski 9deab8302f Fix bugs in getSource() and implement new target path standard 2011-07-05 11:56:02 -04:00
Michael Gapczynski 607f1a2738 Fix conflicts with master in lib/base.php 2011-07-04 16:45:19 -04:00
Michael Gapczynski 05389827fd Merge branch 'master' into sharing
Conflicts:
	.gitignore
	lib/base.php
2011-07-04 16:36:30 -04:00
Kunal Ghosh f2845bbea8 Fix to make the Unlock mechanism of WebDAV work. Previously when using unlock in cadaver etc was used the lock entry corresponding to the file was not deleted in the sqlite database table oc_locks. The error was because the delete query in the Unlock function was not getting executed :) 2011-07-02 07:17:05 +05:30
Robin Appelman f40a1cad8b not all http server add index.php to $_SERVER[SCRIPT_NAME], do it manually
this fixes incorect generated links in some cases
2011-06-26 00:59:31 +02:00
Robin Appelman 155f62bcf6 allow plugins/apps to add custom headers to all pages 2011-06-24 22:09:55 +02:00
Aamir Khan 2098cbd822 redirect_url to be respected in linkTo function 2011-06-25 01:14:28 +05:30
Robin Appelman 4d11e920be provide an option to add custom elements to the header of templates 2011-06-24 18:02:19 +02:00
Michael Gapczynski 467778d66f Merge branch 'master' into sharing 2011-06-23 17:54:49 -04:00
Kamil Domanski 2073d3b08e fix 404 2011-06-23 23:47:46 +02:00
Kamil Domanski 0bf67298d1 no indexing in generated htaccess 2011-06-23 23:41:53 +02:00
Robin Appelman 8b76590f5d fix creating users 2011-06-23 18:23:47 +02:00
Dominik Schmidt 3b2fcd356f Use new user backend API 2011-06-23 15:24:09 +02:00
Dominik Schmidt 96657f8b62 Detect backend features dynamically instead of trial-and-error usage
Move documented functions for reference into OC_USER_EXAMPLE class.
2011-06-23 14:45:28 +02:00
Michael Gapczynski 18e776fa2f Changed mount point to 'Share', fixed is_dir() 2011-06-22 11:40:09 -04:00
Robin Appelman 83958ebd4b add oc_user::getUser to get the user id of the loggedin user 2011-06-22 12:50:57 +02:00
Robin Appelman 36dbb8edab prefix the mysql user name to avoid collissions 2011-06-21 23:58:02 +02:00
Kamil Domanski e047feb2ad install shipped apps also in "installed apps" page 2011-06-21 22:17:53 +02:00
Robin Appelman ee0f1490e1 Multiply changes to user system
keeping tracked of the logged in user is no longer done by the active backend but by oc_user directly instead

multiply backends can be active at the same time, allowing alternative authentication procedures like openid or tokens to be used next to the regular user system
2011-06-21 19:28:46 +02:00
Jakob Sack 3e74cca739 Merge branch 'master' of git://anongit.kde.org/owncloud 2011-06-20 22:09:21 +02:00
Jakob Sack 61993419ec New i18n-structure 2011-06-20 21:54:21 +02:00
Kamil Domanski 0603391405 fixed page reload after logout 2011-06-20 21:09:34 +02:00
Jakob Sack eb1ce7819a Fix linkTo() 2011-06-20 21:01:34 +02:00
Jakob Sack 91c37bbb76 moved core stuff to /core 2011-06-20 20:29:30 +02:00
Jakob Sack 272fc252fb Activate "active" for subentries 2011-06-20 19:50:25 +02:00
Robin Appelman 0563741652 fix sqlite3 driver for php<5.3 2011-06-20 19:04:31 +02:00
Robin Appelman 76b12c4ae0 add settings option for language 2011-06-20 14:33:31 +02:00
Jakob Sack 99ae7cd477 Autodetection of language is working now 2011-06-19 23:46:59 +02:00
Jakob Sack ad893f2bea Merge branch 'master' of git://anongit.kde.org/owncloud 2011-06-19 23:34:03 +02:00
Jakob Sack b31a8ac985 More l10n-stuff 2011-06-19 23:33:34 +02:00
Kamil Domanski 38545d5ee4 and even more properly now ;P 2011-06-19 23:29:09 +02:00
Kamil Domanski 51c0a8e3ce index now properly reloaded after setup 2011-06-19 23:12:07 +02:00
Kamil Domanski ee247a21a4 shipped apps are no longer hardcoded 2011-06-19 22:46:05 +02:00
Robin Appelman 37f9e03772 improved check in oc_preferences if a key already exists 2011-06-19 22:34:36 +02:00
Robin Appelman 11dc3bb0e1 only load apps if they exist 2011-06-19 22:34:36 +02:00
Robin Appelman 07f2fcf7ec add post_* hooks to filesystem for write, create, delete, rename and copy 2011-06-19 22:34:36 +02:00
Jakob Sack c26719a10d Fixed documentation of OC_L10N 2011-06-19 19:38:51 +02:00
Jakob Sack e8e483d079 L10N is here ;-) 2011-06-19 18:53:02 +02:00
Jakob Sack 86406c6cfe Merge branch 'master' of git://anongit.kde.org/owncloud 2011-06-19 16:06:52 +02:00
Jakob Sack a688e5a5b1 Load preferences only if user is registered 2011-06-19 16:06:05 +02:00
Kamil Domanski 6b2ec22104 allow disabling apps, install apps as disabled 2011-06-19 15:18:52 +02:00
Jakob Sack d5b550395a Removed debug messages 2011-06-19 15:08:28 +02:00
Jakob Sack baa00a589f l10n added 2011-06-19 14:27:52 +02:00
Jakob Sack 6a19a7d226 added preferences to base.php, will be needed for i18n stuff 2011-06-19 14:24:26 +02:00
Kamil Domanski 1cab3ca92c move installation of shipped apps to setup 2011-06-19 00:55:19 +02:00
Kamil Domanski be3ee03189 handle app repo connection failure 2011-06-18 22:02:45 +02:00
Michael Gapczynski 4e7d1c376f OC_FILESTOAGE_SHARED now works with hard coded values for files 2011-06-18 13:49:52 -04:00
Robin Appelman 51420a7522 only create one connection to a sqlite3 database, fixes 'Database locked' errors with webdav 2011-06-17 16:09:43 +02:00
Robin Appelman 561c3a15f0 prevent some possible warnings if there are files in /apps 2011-06-17 14:17:08 +02:00
Robin Appelman 300b8c06cf allow plugins to cancel filesystem operations using the provided hooks 2011-06-16 22:44:36 +02:00
Michael Gapczynski bf66563cda First version of shared storage provider - not functional 2011-06-16 14:40:21 -04:00
Robin Appelman 3062723c34 default to sqlite3 over sqlite2 for new installations 2011-06-16 14:56:56 +02:00
Robin Appelman 7d3ae7ae9b fix settings page for non-admin users 2011-06-14 16:03:57 +02:00
Robin Appelman f6eb7c1205 make use of native sqlite3 prepared statements 2011-06-14 01:20:41 +02:00
Robin Appelman 00858efbe2 store numbers as strings to prevent errors with numeric passwords 2011-06-14 01:20:41 +02:00
Robin Appelman f863002e95 use sqlite3 if sqlite2 isn't available 2011-06-14 01:20:41 +02:00
Robin Appelman 1e0fe05bef fix error with empty config file 2011-06-14 01:20:41 +02:00
Robin Appelman 1ea43dd7f9 make OC_DB work with the sqlite3 driver 2011-06-13 04:06:43 +02:00
Robin Appelman 600219c8c0 sqlite3 driver for mdb2
the only problem that I found with it so far is that it gives a database locked error on login,
the rest seems to work fine but more testing is required.
2011-06-13 04:05:41 +02:00
Robin Appelman 964b51879e add option to remove tables install from database structure 2011-06-12 17:51:31 +02:00
Robin Appelman bb5a2a917b test case library and start of filesystem test 2011-06-12 01:06:27 +02:00
Robin Appelman 2a5ee9512e allow tear down of filesystem.
also fix a bug when chrooting to '/'
2011-06-12 00:57:43 +02:00
Robin Appelman 5425c3d1e9 fix delTree 2011-06-12 00:50:13 +02:00
Alessandro Cosentino 86dd023448 Adding clear logs functions 2011-06-07 15:48:21 -04:00
Robin Appelman d65f8bba73 try to adjust times to the clients timezone 2011-06-05 15:13:03 +02:00
Robin Appelman d8ba312679 fix incorrect variable name in libfilestorage 2011-06-04 18:34:15 +02:00
Robin Appelman 016a892a78 merge refactoring in master 2011-06-02 20:35:14 +02:00
Robin Appelman 5d3cf06c73 delete old plugin stuff 2011-06-02 20:21:31 +02:00
Robin Appelman 7f987b84a5 fix OC_HELPER::linkTo again 2011-06-02 20:21:02 +02:00
Robin Appelman 2b45a28bd4 fix OC_HELPER::linkto() when the link is not a valid file.
(e.g. a php script with ?foo=bar appended)
2011-06-02 02:58:42 +02:00
Robin Appelman 09458aa639 add dateOnly option to formatDate 2011-06-02 02:29:16 +02:00
Robin Appelman c1d02fd166 install apps that are shipped with owncloud the first time they are loaded 2011-06-01 15:05:48 +02:00
Robin Appelman 6b34ba8a8e Make max upload filesize configurable for apache hosts 2011-05-29 17:43:13 +02:00
Robin Appelman f48344df30 recursive deletion is now in OC_HELPER 2011-05-29 17:01:34 +02:00
Robin Appelman 85cae2cc32 recursive copy is now in OC_HELPER 2011-05-29 17:00:34 +02:00
Robin Appelman f4e4617be7 App installer backend.
Not yet attached to the gui
2011-05-28 17:33:25 +02:00
Robin Appelman d23ecd0538 fix a strict error in webdav 2011-05-28 15:52:35 +02:00
Robin Appelman 5ccce7e45f fix a potential infinite loop when installing with sqlite 2011-05-28 15:52:35 +02:00
Alessandro Cosentino 1ec304227e changed the path in imagePath again 2011-05-17 23:29:09 -04:00
François Kubler 13ddf8100f New installer.
* Forms have been revamped (CSS + javascript),
* Process has been improved : errors are displayed on the form page,
* Some changes in the index.php page so that everything related to installation is in lib/setup.php
* Also added a small function in OC_HELPER class to set input values.

All these should improve the installation process in terms of ergonomics.
Well, I do hope so.
2011-05-17 22:34:31 +02:00
Jakob Sack e314a83a7b Fixing the image link for apps 2011-05-17 17:19:21 +02:00
Robin Appelman 915073f8ea use simplexml instead of dom for OC_APP::getAppInfo() 2011-05-16 16:20:56 +02:00
Robin Appelman d10840ab18 moved app install/remove/update functions to lib/installer.php
added OC_APP::getAppInfo() for reading app metadata
2011-05-15 16:32:22 +02:00
Jakob Sack d70dfbdebb Renamed a few columns in order t ohave both sqlite and mysql up and running 2011-05-15 15:03:12 +02:00
Jakob Sack 6b83e5ccfe renamed installer.php to setup.php 2011-05-06 22:50:18 +02:00
Robin Appelman e8e0608991 no hooks for OC_FILESTORAGE the one from OC_FILESYSTEM should be enough 2011-04-29 12:22:37 +02:00
Robin Appelman 5d358bb63f merge 2011-04-28 23:59:02 +02:00
Robin Appelman 96cb5a3d2e fix oc_appconfig for sqlite 2011-04-28 17:45:41 +02:00
Robin Appelman 3e99aefb7e make logs work with sqlite 2011-04-28 17:40:51 +02:00
Robin Appelman 1850bddb67 move sqlite database into the data folder, makes it easier to set the correct permissions 2011-04-28 16:54:10 +02:00
Robin Appelman 8a6edd4654 Show currect filename when downloading files 2011-04-26 15:01:16 +02:00
Robin Appelman b7aba15f17 add search functionality, for now only searches files but plugins/apps can extend that 2011-04-24 16:09:27 +02:00
Robin Appelman 8d52fdb7fa fix chmodr 2011-04-24 15:23:18 +02:00
Robin Appelman 08cfe4b6ff stylesheets have .css as extention, not .js 2011-04-23 02:30:34 +02:00
Robin Appelman 4c0d6dc9e7 make OC_HOOKS actually work 2011-04-23 02:30:12 +02:00
Robin Appelman 3e47ce3cef properly load css and js files for apps 2011-04-23 02:28:12 +02:00
Robin Appelman cf76cad931 change printPageNavi() to getPageNavi() to allow some more flexibility 2011-04-21 23:04:16 +02:00
Robin Appelman 741519fa79 loging system 2011-04-21 23:03:45 +02:00
Marco Michelino 4e2ef271bc bugfixes on GET requests via WebDAV 2011-04-20 13:28:35 +02:00
Marco Michelino d1b4f74bc2 Avoid // in URIs 2011-04-19 12:32:37 +02:00
Jan-Christoph Borchardt 8080a1a5a7 now my uppercase Wikileaks folder is correctly sorted below pr0n, like it should be 2011-04-18 23:52:55 +02:00
Jan-Christoph Borchardt 660e2c8102 renamed application-octet-stream.png to file.png 2011-04-18 22:16:32 +02:00
Robin Appelman 235b647fe1 send proper headers 2011-04-18 15:39:29 +02:00
Robin Appelman 0f49d57d27 dissable loggin for now 2011-04-18 15:36:56 +02:00
Robin Appelman 70bf44401d correct them the right way this time 2011-04-18 15:31:40 +02:00
Robin Appelman 2673b6c054 typo's ... 2011-04-18 15:30:27 +02:00
Robin Appelman 14777ba444 clarify OC_FILES::get() documentation 2011-04-18 15:30:27 +02:00
Jakob Sack 6f07cf2651 Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring 2011-04-18 15:07:51 +02:00
Jakob Sack b57823baa5 Made the "change password" thingie in settings working 2011-04-18 15:07:14 +02:00
Robin Appelman a977ba31ce create .htaccess files during installation for apache users 2011-04-18 14:12:53 +02:00
Robin Appelman 7684585f49 404 error page 2011-04-18 13:16:49 +02:00
Jakob Sack f1e78be4f4 Even more fixes on user management. Any designers here that want to make it good looking? 2011-04-18 13:12:30 +02:00
Jakob Sack da30671ec4 More error checking in user management 2011-04-18 12:39:28 +02:00
Robin Appelman fe90bf4bdc disable the backup system for now 2011-04-18 12:18:45 +02:00
Robin Appelman 67ba9b320e seperate hooks for OC_FILESYSTEM and OC_FILESTORAGE 2011-04-18 12:16:56 +02:00
Jakob Sack 761a517888 Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring 2011-04-18 12:03:06 +02:00
Robin Appelman b8e1788ed0 replace filesystem observer with the more general OC_HOOK 2011-04-18 12:02:53 +02:00
Jakob Sack 329d804032 Hotfix: deleting users is working again 2011-04-18 12:02:03 +02:00
Jakob Sack a1ff99126a prevent users from deleting admin group 2011-04-18 11:53:38 +02:00
Jakob Sack dd0eb9dd8d Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring 2011-04-18 11:49:23 +02:00
Jakob Sack f22c05deab Check for existance of group- and usernames, don't mix OC_USER and OC_GROUP! 2011-04-18 11:48:52 +02:00
Jakob Sack b37fb9142f Added tons of Hooks to OC_USER and OC_GROUP 2011-04-18 11:39:29 +02:00
Robin Appelman 900ece18e7 seperate view and logic for pagenavi 2011-04-18 11:31:01 +02:00
Jakob Sack 1fe5f5a2df Better documentation for OC_USER 2011-04-18 10:41:01 +02:00
Jakob Sack a70330e9be Improved documentation for group management 2011-04-18 10:00:45 +02:00
Frank Karlitschek 91b5d8575a add pager function to the base lib and remove the default table width 2011-04-17 19:46:09 +02:00
Jakob Sack 47223ae2d9 Working subnavigation 2011-04-17 19:38:04 +02:00
Robin Appelman 7b02151639 make the file permissions hint more clear 2011-04-17 18:19:50 +02:00
Robin Appelman 871a4b3d4a more improvements for foldersize 2011-04-17 18:19:50 +02:00
Jakob Sack d59b0df401 Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring 2011-04-17 18:06:17 +02:00
Jakob Sack 79d8aa871a User management works good enough for now. Need to do something else ... 2011-04-17 18:05:49 +02:00
Frank Karlitschek 60b6825612 show only ownCloud related knowledgebase entries. and make the page pretty 2011-04-17 17:38:35 +02:00
Robin Appelman 225ad85e90 add free_space to OC_FILESYSTEM 2011-04-17 16:40:44 +02:00
Frank Karlitschek 5759802091 now we have our own ocs server 2011-04-17 16:04:46 +02:00
Robin Appelman 86356e888e save the correct config entry 2011-04-17 15:25:59 +02:00
Robin Appelman e984a3b47a fix keeping track of foldersize 2011-04-17 13:47:22 +02:00
Robin Appelman 6affa3281a small fixes in webdav 2011-04-17 13:33:30 +02:00
Robin Appelman 58cb46c4e8 make sql queries work in sqlite 2011-04-17 12:36:14 +02:00
Robin Appelman 243d6566dd fix login when using sqlite 2011-04-17 12:36:14 +02:00
Arthur Schiwon a14f8243e8 get max upload file size for upload form from php settings 2011-04-17 12:03:23 +02:00
Robin Appelman ab155de14f improve error handeling for first run dialog 2011-04-17 11:59:15 +02:00
Arthur Schiwon 5a03ce696c debug output should not be there 2011-04-17 11:20:28 +02:00
Robin Appelman fde08b2389 installer now works when using mysql 2011-04-17 11:10:03 +02:00
Arthur Schiwon 8a5d1ffebe fix that might solve strange uploading issues 2011-04-17 01:17:34 +02:00
Frank Karlitschek 85a6097c03 Merge branch 'refactoring' of git.kde.org:owncloud into refactoring 2011-04-17 01:13:07 +02:00
Frank Karlitschek 0820cb8f17 owncloud now with even more buzzwords. we outsourced the doccumentation and use an online knowledgebase 2011-04-17 01:11:44 +02:00
Jakob Sack d314c33715 do not redeclare methods 2011-04-17 01:06:48 +02:00
Jakob Sack cb2d8db9ce Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring 2011-04-17 01:04:43 +02:00
Jakob Sack c4287162c4 Some work on the fancy user management 2011-04-17 01:04:23 +02:00
Frank Karlitschek ca04b33abe first step on online ocs knowledgebase integration 2011-04-17 00:53:10 +02:00
Robin Appelman 3263b80ea9 first-run wizzard wip 2011-04-17 00:45:05 +02:00
Robin Appelman 25d687f35a add OC_GROUP::createGroup(); 2011-04-17 00:28:44 +02:00
Frank Karlitschek af40d872ce Merge branch 'refactoring' of git.kde.org:owncloud into refactoring 2011-04-16 23:09:02 +02:00
Frank Karlitschek fc63882fe2 more layout fixes 2011-04-16 23:07:18 +02:00
Jakob Sack 7035c0417c Get Hot New Fixes (TM) 2011-04-16 23:02:54 +02:00
Robin Appelman a16c6fb804 don't use items in an array that aren't there 2011-04-16 20:36:43 +02:00
Frank Karlitschek fb74de326d Merge branch 'refactoring' of git.kde.org:owncloud into refactoring 2011-04-16 20:35:15 +02:00
Frank Karlitschek 1372d8339d add a date format function for more eyecandy 2011-04-16 20:34:18 +02:00
Robin Appelman bf45dcb959 only check for permissions for folders that exists 2011-04-16 20:27:08 +02:00
Robin Appelman d002ed0b94 set strict error reporting 2011-04-16 20:08:13 +02:00
Frank Karlitschek cf50c497b9 Merge branch 'refactoring' of git.kde.org:owncloud into refactoring 2011-04-16 19:58:07 +02:00
Robin Appelman 101877351b use the correct variable name 2011-04-16 19:46:47 +02:00
Robin Appelman e71bc75a9d use the correct signature for OC_FILEOBSERVER->notify() 2011-04-16 19:45:47 +02:00
Robin Appelman 7b00f99a57 static functions shouldn't be abstract 2011-04-16 19:45:07 +02:00
Frank Karlitschek 219c4a2c78 Merge branch 'refactoring' of git.kde.org:owncloud into refactoring 2011-04-16 19:43:26 +02:00
Frank Karlitschek 85df699746 application listing works more or less now 2011-04-16 19:42:58 +02:00
Robin Appelman 5ccdea8e5b save installation state of databases in appconfig instead of plugin.xml 2011-04-16 19:06:45 +02:00
Frank Karlitschek 150631849f Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
Conflicts:
	admin/apps.php
2011-04-16 18:50:49 +02:00
Robin Appelman f0e59b9043 better display for server configuration errors 2011-04-16 18:27:58 +02:00
Jakob Sack 964a55033a never ever call a function you just removed 2011-04-16 18:08:40 +02:00
Jakob Sack f2e37e0018 Completely removing personalMenu 2011-04-16 18:06:23 +02:00
Jakob Sack 5d23b60c8a Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring 2011-04-16 17:50:18 +02:00
Jakob Sack af1e48df80 Changes in the user experience 2011-04-16 17:49:57 +02:00
Robin Appelman 318d024cc1 show size of folders in filebrowser 2011-04-16 17:07:44 +02:00
Robin Appelman 1495ec0f31 show server configuration errors on seperate page 2011-04-16 15:49:55 +02:00
Jakob Sack b5f913a3fc Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring 2011-04-16 14:59:27 +02:00
Jakob Sack 4c74029489 First sketch of a user administration 2011-04-16 14:59:10 +02:00
Frank Karlitschek 5112295723 Merge branch 'refactoring' of git.kde.org:owncloud into refactoring 2011-04-16 14:37:51 +02:00
Frank Karlitschek d6d848184b new cool ocs client, but still empty 2011-04-16 14:36:32 +02:00
Arthur Schiwon 1c3703477b Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring 2011-04-16 14:00:05 +02:00
Robin Appelman 9a575d1ded port OC_OCS to prepared statements 2011-04-16 13:55:33 +02:00
Arthur Schiwon 627dc95d19 don't manifold slashes in case empty $app is forwarded to linkTo() 2011-04-16 12:43:37 +02:00
Jakob Sack 8465f76e7e Use OC_CONFIG where possible 2011-04-16 12:18:42 +02:00
Jakob Sack 77fe7240f0 Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring 2011-04-16 11:46:09 +02:00
Robin Appelman f4d0310d73 port WebDAV to prepared statements 2011-04-16 11:46:49 +02:00
Jakob Sack 177fd27382 Make OC_CONFIG working again 2011-04-16 11:25:21 +02:00
Jakob Sack fc33094429 replaced $CONFIG_DB* with OC_CONFIG::getValue( "db*" ) 2011-04-16 11:11:16 +02:00
Jakob Sack ed77ab18c9 Added a dump of the database 2011-04-16 10:41:41 +02:00
Jakob Sack e8f6848095 Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring 2011-04-16 10:26:40 +02:00
Jakob Sack 683677b4f9 Support for navigation sub entries 2011-04-16 10:26:18 +02:00
Robin Appelman 69289bf943 move chmodr to OC_HELPER 2011-04-16 10:23:15 +02:00
Robin Appelman 26841884af move OC_DB to it's own file 2011-04-16 10:18:35 +02:00
Robin Appelman e42dbbf7f3 merge 2011-04-16 10:13:52 +02:00
Robin Appelman 232654cb60 get rid of the oc_require and friends 2011-04-16 10:12:53 +02:00
Jakob Sack 16e4a1dd17 Fix template.php 2011-04-16 09:51:46 +02:00
Jakob Sack f36f453dd2 apps are now stored in /apps 2011-04-16 09:46:58 +02:00
Jakob Sack f1015c88fa Minor bug fixing 2011-04-15 23:09:05 +02:00
Jakob Sack 3d89b2caa4 php is not perl 2011-04-15 19:24:23 +02:00
Jakob Sack 3c01e30748 Try to make owncloud working again 2011-04-15 18:13:49 +02:00
Jakob Sack 149793f2e7 First version of the new user management 2011-04-15 17:14:02 +02:00
Jakob Sack 7c8ae42c6f Fixed some small bugs 2011-04-08 17:36:12 +02:00
Jakob Sack f66d3ab208 Implementation of OC_APPCONFIG, OC_CONFIG and OC_PREFERENCES 2011-04-08 16:54:12 +02:00
Jakob Sack 908e377246 Refactoring of OC_DB 2011-04-08 16:53:17 +02:00
Jakob Sack d3502315bd added class OC_HOOK to base.php. It is in base.php because it is needed
very ofter and it is quite small.
2011-03-29 20:21:00 +02:00
Robin Appelman 0f494970d1 Fix a couple of minor coding errors 2011-03-18 14:15:38 +01:00
Robin Appelman 1df0397163 only load mdb2 once as it was before 2011-03-17 20:58:27 +01:00
Matthew Dawson f2627dd757 When moving a file from/to a temporary location, also update the file access/modification times.
When PHP moves a file across filesystem boundaries, it does not update the access/modification times.
Thus do it manually so that this information is not lost.
2011-03-17 20:57:28 +01:00
Robin Appelman 49a78333fb add the option to use LIKE instead of = when getting data from OCS
also fix the returned keys
2011-03-17 20:56:13 +01:00
Robin Appelman ef5bd659fa added OC_FILESYSTEM::hash()
syntax is the same has http://www.php.net/manual/en/function.hash-file.php
2011-03-17 20:55:41 +01:00
Jakob Sack a3070405d9 OC_HELPER, OC_LOG and OC_TEMPLATE prepared for refactoring 2011-03-13 17:25:34 +01:00
Jakob Sack 59847bb901 OC_CONFIG prepared for refactoring 2011-03-12 18:19:11 +01:00
Jakob Sack 1aa7fd98c2 Refactoring OC_APPCONFIG and OC_PREFERENCES, minor changes to OC_APP. These libraries are skeletons only, the functions need to be written. 2011-03-12 10:28:10 +01:00
Jakob Sack 883c7a582d Small fixes in OC_APP, removed functions in OC_UTIL that now are in OC_APP 2011-03-11 15:25:48 +01:00
Jakob Sack 25e59e3ce6 Preparing OC_APP. It now includes information for all functions planned. 2011-03-11 14:59:24 +01:00
Jakob Sack f7f957abb9 Base for a more flexible navigation 2011-03-03 23:08:11 +01:00
Jakob Sack ae5dc3efdf New classes for owncloud: OC_APP for applications, OC_PREFERENCES for user preferences 2011-03-03 21:55:32 +01:00
Jakob Sack 94b405b64f Make it possible to use several datadirs.
This could be useful if the user does not want his gallery images on the webdav storage.
2011-03-03 21:25:22 +01:00
Jakob Sack 61ffa182ee Application "files" is able to list the files again, start of splitting css files 2011-03-02 23:06:23 +01:00
Jakob Sack e5ea0a3daa Added helper for filesize, fixed wrong name for mimetypeIcon() 2011-03-02 22:28:32 +01:00
Jakob Sack dfa6b749ba Introducing OC_HELPER for small helper functions; making setup of filesystem optional 2011-03-02 22:18:22 +01:00
Jakob Sack ede34c17dd Make the templates working again. 2011-03-02 18:21:08 +01:00
Jakob Sack 66ac355f78 Getting rid of Smarty, using our own template system 2011-03-02 11:56:48 +01:00
Jakob Sack 015ab0eb64 Say Smarty to only use one compile directory. Makes setup somewhat easier. 2011-03-02 00:16:43 +01:00
Jakob Sack 132695ceb1 Start of the refactoring. Commit is quite big because I forgot to use git right from the beginning. Sorry. 2011-03-01 23:20:16 +01:00