Commit Graph

1274 Commits

Author SHA1 Message Date
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
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 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 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
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 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
Bartek Przybylski c11f6cc3f9 fix variable name and undefined index notice 2012-06-10 17:25:50 +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 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 76de92477f fix infinite redirect during setup for windows hosts 2012-06-09 14:38:05 +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 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
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
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 e747fd794e fix login for hosts running on port 80 2012-06-05 15:26:31 +02:00
Arthur Schiwon 7621559d00 make groups not static, fixes oc-919 2012-06-05 14:02:13 +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
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
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
Robin Appelman e90cbcaf5b http user backend 2012-06-03 02:51:05 +02: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 66f1957e3b Improve efficiency of retrieving log file entries 2012-06-01 14:39:50 -04:00
Sam Tuke 3d7143c730 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-01 19:01:00 +01:00