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
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
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
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
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
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
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
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
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
Thomas Mueller
ba2d203a54
some path fixes for multi-dir app
2012-06-22 09:56:54 +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
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
d0455c5819
truncate decrypted files based on filelength
2012-06-21 17:38:00 +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
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
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
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
13a9ef36fb
don't show other users file if the filesystem is not index already
2012-06-20 11:34:17 +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
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
0469f529fa
quota calculation fixed
2012-06-19 09:35:13 +02:00
Thomas Mueller
c1df0539a0
fixes oc-668
2012-06-18 23:33:02 +02: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
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
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
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
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
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
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
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
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
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
Georg Ehrke
b8275691e7
Merge branch 'master' into oc_error
2012-06-04 10:35:50 +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
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
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
dcb06393a8
fix propper error reporting
2012-06-01 16:30:47 +02:00
Frank Karlitschek
ad6562d14f
sort users and groups. fixes oc-779
2012-06-01 14:18:14 +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
93295994dc
fix oc-769
2012-06-01 12:15:03 +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
d4ea853fcf
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:26:09 +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
22a04d8e93
don´t hardcode /tmp
2012-05-30 14:14:32 +02:00
Georg Ehrke
49689dbc7a
Merge branch 'master' into oc_error
2012-05-29 19:48:07 +02:00
Michael Gapczynski
fbe58755e5
Restrict requested app to apps directory
2012-05-29 12:31:47 -04:00
Georg Ehrke
94c633b6b7
Merge branch 'master' into oc_error
2012-05-26 22:54:49 +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
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
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
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
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