6116dc6b65
Added default parameter $reset to allow for incremental rescan.
2012-07-09 00:14:42 +02:00
b46d3019ca
Uninitialized variable
2012-07-07 15:52:49 +02:00
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
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
466d7c0d99
Improvements and bug fix for log reading, fixes bug oc-982
2012-07-06 15:51:01 -04:00
e91b4bc2ac
allow user to upload his own root certificate for secure webdav mount
2012-07-06 15:58:38 +02:00
ba8dee0520
introduce subclassed client.php and revert changes to 3rdparty
2012-07-06 12:26:54 +02:00
9a10efd80f
Merge branch 'master' into calendar_import
2012-07-06 11:01:12 +02:00
5bf050b13b
moved performance improvement from isLoggedIn() to userExists() to avoid webdav problems
2012-07-05 15:55:46 +02:00
aa95cf2c98
Merge branch 'master' into calendar_import
2012-07-05 11:30:37 +02:00
280c59e914
More helpfull debug msg for redirectToDefaultPage
2012-07-04 17:51:07 +02:00
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
657eef354a
Merge branch 'master' into calendar_import
2012-07-04 13:03:30 +02:00
3b09aa8578
Correct Postgresql connection with space in password. Work around php bug
2012-07-04 10:13:00 +00:00
f98bd1ad66
Merge branch 'master' into calendar_import
2012-07-03 22:35:46 +02:00
aec6eea235
use filesystem abstraction layer to copy file versions
2012-07-03 18:25:49 +02:00
641e77327e
Merge branch 'master' into calendar_import
2012-07-03 16:48:30 +02:00
4bc9e4e012
wrong var name fixed
2012-07-03 16:43:57 +02:00
cfcfdd674e
Merge branch 'master' into calendar_import
2012-07-03 13:43:52 +02:00
8a1c279183
Escape pg connection string on setup
2012-07-03 09:20:42 +02:00
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
90331a3fa1
Remove forced download
2012-07-02 12:20:43 +02:00
f8cebed348
Don't display error messages
2012-07-02 10:24:22 +02:00
e4960c3bb4
fix a small PHP fail
2012-07-02 10:23:32 +02:00
4e63981da9
Disable mimesniffing
2012-07-01 13:45:20 +02:00
b2cb7d54d1
Fixed app path
2012-06-30 22:56:47 +00:00
cfc78d44bb
Return correct json response, fix syntax
2012-06-30 22:56:47 +00:00
4890bbb30d
Merge branch 'master' into calendar_import
2012-06-30 22:08:36 +02:00
4ed55315e7
fixed linkTo()
2012-06-30 16:53:41 +02:00
246894243a
Merge branch 'master' into calendar_import
2012-06-29 21:46:09 +02:00
94add1c000
typo fixed
2012-06-29 16:49:22 +02:00
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
1ccbbfad53
Spelling fix
2012-06-28 22:11:04 +02:00
bf09edcbf1
Remember the app root information.
2012-06-28 22:11:04 +02:00
19bb4e83c9
Remove redundant code from OC_Helper::linkTo
2012-06-28 22:11:04 +02:00
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
81953e7bb5
Return login errors for PostgreSQL setup
2012-06-27 20:24:06 -04:00
7284e57c91
Migration: fix app paths
2012-06-27 20:43:33 +00:00
2706988225
Set table prefix if not set in postgresql install
2012-06-27 16:08:46 -04:00
2d8a380a21
Fix recursion when running an update script
2012-06-27 14:56:34 +02:00
153ce2f9ab
Merge branch 'master' into calendar_import
2012-06-27 14:02:05 +02:00
12f7cb8767
fix running tests from cli
2012-06-27 13:21:45 +02:00
420d23a875
fix webdav errors for empty folders
2012-06-27 13:08:16 +02:00
dab58f3464
Cache result of OC_App::getAppVersions
2012-06-27 01:05:12 +02:00
2f0b4983e9
Move app upgrade check to loading of apps
2012-06-27 01:05:12 +02:00
a25ae4b4b6
Make Categories a bit quieter.
2012-06-27 01:03:53 +02:00
4e53db3d9c
Merge branch 'master' into oc_error
2012-06-26 14:17:32 +02:00
ac4e19218e
All is good ;-)
2012-06-26 02:47:59 +02:00
c6b9f613bb
Cache: try to set the fast cache in the Broker
2012-06-25 21:05:10 +02:00
fe0f281b4f
Fix setting ETag header on cache miss
2012-06-25 21:05:10 +02:00
531c1c509c
Cache: Add APC and XCache to global cache handler
2012-06-25 21:05:10 +02:00
4e4a1a4274
Cache: Use getUserCache cache in OC_Cache
2012-06-25 21:05:10 +02:00
cae089df91
Cache: Create global cache in OC_Cache
2012-06-25 21:05:10 +02:00
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
a4c47c674d
write sql errors into the error log for better debugging
2012-06-25 11:55:51 +02:00
564cd82599
Fix the fix about filecache and postgres
2012-06-24 20:49:48 +00:00
2a6a155e23
Correct File cache error with postgresql
2012-06-24 19:52:30 +00:00
b182e6c86a
Trim trailing whitespace from version.
2012-06-24 15:07:44 +02:00
51c5e7035e
Merge branch 'master' into oc_error
2012-06-23 19:54:20 +02:00
d450560b39
remove trailing slash in %appswebroot% placeholder
2012-06-23 16:59:55 +02:00
2c1c1ba88c
close only if exist
2012-06-23 16:21:47 +02:00
7c5ff900d0
work with non existing apps directory. thanks to Antonio for the hint
2012-06-23 16:17:59 +02:00
d39d7fb9ff
Remove references to /apps/ and correct inclusion of settings
2012-06-22 22:05:39 +00:00
33165e3915
Do not close php tag on config file
2012-06-22 21:01:12 +00:00
b5e3e150eb
Correction of path looking for apps and css
2012-06-22 20:58:52 +00:00
243f910ae4
Merge branch 'master' into oc_error
2012-06-22 21:37:03 +02:00
ebfc5b2762
Add compatability function for APC cache
2012-06-22 17:21:57 +02:00
f655981baf
Fix initialization of OC_Filesystem setup from DAV
2012-06-22 17:21:56 +02:00
50667dcb82
Convert OC_L10N_String to a string in OC_JSON::encodedPrint
2012-06-22 17:21:56 +02:00
432aa58bab
Spelling fixes
2012-06-22 17:21:56 +02:00
2d2366bb57
Avoid fetch ocs info if the appstore is disabled
2012-06-22 16:06:46 +02:00
06e20fe4b8
Correct css inclusion with minimizer
2012-06-22 15:21:44 +02:00
115c30bdb4
Enhance hint about writable app directory
2012-06-22 13:57:54 +02:00
8c2803a7c1
Correct image path and apps path replacement
2012-06-22 13:12:03 +02:00
72fe463f7f
Correct OC_Config writer. Use var_export (has support for array,...)
2012-06-22 12:46:21 +02:00
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
ba2d203a54
some path fixes for multi-dir app
2012-06-22 09:56:54 +02:00
b5953e7a83
Provide solution for smoother migration for apps to multi-app dir
2012-06-21 22:22:36 +00:00
f46623da6c
Do not search apps if oc is not yet installed
2012-06-21 21:29:18 +00:00
a5938e4e37
Merge branch 'master' into multi_app_dir
2012-06-21 20:19:31 +00:00
84b9ac2678
Correct writable check for app dir
2012-06-21 19:35:34 +00:00
d22f805b63
Correct inclusion paths
2012-06-21 19:19:39 +00:00
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
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
56de98ed8c
fix saved file size for uploaded files
2012-06-21 18:22:18 +02:00
d0455c5819
truncate decrypted files based on filelength
2012-06-21 17:38:00 +02:00
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
96d0b9834a
fix mimetype for cdr files - bugfix for oc 559
2012-06-21 09:58:38 +02:00
4d312f7849
Merge branch 'master' into oc_error
2012-06-21 09:08:38 +02:00
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
7d0d1ebd4f
Merge branch 'master' into oc_error
2012-06-20 20:14:15 +02:00
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
d6bf62ea4e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-20 16:26:02 +01:00
c244daac89
removed readdir to fix bug oc-1054
2012-06-20 16:24:49 +01:00
0086639891
Merge branch 'audit'
2012-06-20 17:20:39 +02:00
7a3d606cac
Prefer requested app before redirecting to default page
2012-06-20 17:10:49 +02:00
6404476bec
Delay setup of FS until OC_Filesystem is used
2012-06-20 17:10:49 +02:00
5c8e774cea
Small code reorder
2012-06-20 17:10:48 +02:00
6644511124
remove unnecessary comment
2012-06-20 16:29:19 +02:00
a054541df4
Merge branch 'master' into oc_error
2012-06-20 13:29:17 +02:00
Thomas Tanghus
Lukas Reschke
Michael Gapczynski
Bjoern Schiessle
Georg Ehrke
Bart Visscher
Brice Maron
Arthur Schiwon
Tom Needham
Florian Hülsmann
Robin Appelman
Frank Karlitschek
Thomas Mueller
Sam Tuke
Michael Gapczynski