f1e4c845ce
fix duplicates showing up in the filecache
2012-06-23 23:32: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
a8868fa007
work with non existing apps directory. thanks toAntonio for the hint
2012-06-23 16:20:31 +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
60f558cdbb
Fix initialization of OC_Filesystem setup from DAV
2012-06-22 17:20:10 +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
e5d458c068
Correct File cache error with postgresql
2012-06-22 10:46:49 +02:00
ba2d203a54
some path fixes for multi-dir app
2012-06-22 09:56:54 +02:00
ca6339c480
4.0.3
2012-06-22 09:25:41 +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
bae592d69b
Prefer requested app before redirecting to default page
2012-06-21 20:15:23 +02:00
a7e427a3cc
Remember result of OC_User::isLoggedIn, can be very expensive to check
2012-06-21 20:14:53 +02:00
8aa7ed39a5
Only check for apps owncloud version requirment when there is a new owncloud version
2012-06-21 20:13:30 +02: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
da9107fe69
fix saved file size for uploaded files
2012-06-21 18:07:56 +02:00
7b4cb44af8
truncate decrypted files based on size
2012-06-21 17:51:54 +02:00
d0455c5819
truncate decrypted files based on filelength
2012-06-21 17:38:00 +02:00
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
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
43674b1759
fix mimetype for cdr files - bugfix for oc 559
2012-06-21 09:58:04 +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
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
9ba467d629
fix encryption for binary files
2012-06-20 20:18:42 +02:00
e3f1507374
use absolute path for file proxies
2012-06-20 20:18:41 +02: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
902c649dad
use new sanitize HTML function backported
...
Conflicts:
lib/template.php
2012-06-20 16:59:51 +02:00
d9607df26f
backport of sanitizeHTML() function
2012-06-20 16:43:31 +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
c4d1363419
don't show other users file if the filesystem is not index already
2012-06-20 11:35:45 +02:00
13a9ef36fb
don't show other users file if the filesystem is not index already
2012-06-20 11:34:17 +02:00
0524f6fd3c
Fix webdav property name compare
2012-06-19 23:18:07 +02:00
2d4e1b45ce
Load app before running update script
2012-06-19 23:17:40 +02:00
cff1b6e699
Don't use substr to get first char of string
2012-06-19 23:16:17 +02:00
bb649dd0d5
Smarter code for OC_FileProxy
...
Conflicts:
lib/fileproxy.php
2012-06-19 23:15:33 +02:00
598a090db4
Add cache for getStorage and getInternalPath functions.
...
These are called for almost every file operation.
2012-06-19 23:13:24 +02:00
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
98bc916016
Make check for writable apps dir configurable
...
Conflicts:
config/config.sample.php
2012-06-19 23:11:14 +02:00
f54ef5a464
Remove OC::$CONFIG_DATADIRECTORY, not used
2012-06-19 22:54:14 +02:00
d8b32c2f0e
Move check code from setupFS to checkServer
2012-06-19 22:54:13 +02:00
637f8398ba
fixes oc-668
2012-06-19 22:37:25 +02:00
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
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
4b6f6291c5
Remember result of OC_User::isLoggedIn, can be very expensive to check
2012-06-19 17:54:19 +02:00
089ae980c4
use new sanitize HTML function
2012-06-19 17:24:55 +02:00
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
ccacb6f918
Merge branch 'master' into oc_error
2012-06-19 11:30:18 +02:00
1b142a1155
quota calculation fixed
2012-06-19 09:36:50 +02:00
0469f529fa
quota calculation fixed
2012-06-19 09:35:13 +02:00
db7542b640
Reverting 249190c89b. Fixed in master
2012-06-19 00:56:48 +03:00
c1df0539a0
fixes oc-668
2012-06-18 23:33:02 +02:00
249190c89b
Fix mime-type detection
2012-06-19 00:20:33 +03:00
d4044d0283
Delay loading of translations until they are used
2012-06-18 23:07:32 +02:00
cfb3b633f5
Force sanitize function to use UTF8 (for php lower than 5.4)
2012-06-18 19:52:05 +00:00
92bb59c95d
fixed broken function call
2012-06-18 17:30:21 +02:00
814cab97cf
ignore "Shared"-directory when calculating free space
...
Conflicts:
lib/fileproxy/quota.php
2012-06-18 17:27:42 +02:00
e6384251eb
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-18 17:25:00 +02:00
d496a5e19f
ignore "Shared"-directory when calculating free space
2012-06-18 17:23:54 +02:00
6bd0a158f7
Merge branch 'master' into oc_error
2012-06-18 15:59:39 +02:00
2f00384b51
Use TemplateLayout functions for finding js and css files in minimizer
2012-06-18 15:40:48 +02:00
3000e8f9d5
Prepare template js and css functions for use in the js and css minimizers
2012-06-18 15:40:48 +02:00
180243d92a
Move page layout handling to its own class
2012-06-18 15:40:48 +02:00
332603a263
Move formfactor code to OC_Template
2012-06-18 15:40:48 +02:00
e31c9a7b6f
Merge branch 'master' into oc_error
2012-06-18 14:34:49 +02:00
977cd0df6b
Fix errors for minimizer
2012-06-18 11:33:24 +02:00
a5a1a9fd4a
Forgot a file
2012-06-18 11:12:53 +02:00
617de811f7
Cache the minimized output also on the server
2012-06-18 11:11:46 +02:00
06c610c2ee
Merge branch 'master' into oc_error
2012-06-17 08:36:33 +02:00
549541215e
get the correct metadate from updated folders to put in the cache
2012-06-17 02:15:11 +02:00
e8dd86ce0d
Revert "Set default charset to utf-8."
...
This reverts commit 709dbd82a6
2012-06-16 19:48:03 -04:00
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
6f93176a4b
Be smarter when checking single app language availability
2012-06-16 20:52:10 +02:00
6e9cd63fa1
Only check for apps owncloud version requirment when there is a new owncloud version
2012-06-16 20:52:10 +02:00
12f6205fa8
Merge branch 'master' into oc_error
2012-06-16 17:10:53 +02:00
709dbd82a6
Set default charset to utf-8.
2012-06-16 17:01:12 +02:00
14f6d4dcba
Merge branch 'master' into oc_error
2012-06-16 09:35:57 +02:00
c1744d2eb6
Move user import to personal settings. Fix user migration between servers.
2012-06-15 23:17:31 +00:00
8484e16516
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-15 23:14:48 +00:00
e37ef6dd47
Move user import to personal settings. Fix user migration between servers.
2012-06-15 23:14:40 +00:00
6d3ae575b6
Remove $DOCUMENTROOT, not used
2012-06-16 00:11:36 +02:00
e11c5a23d5
Optimize WebDav access by preloading dav custom properties
2012-06-15 21:21:42 +02:00
e905b14758
Spelling fix
2012-06-15 21:21:42 +02:00
463a506fcb
Fix webdav property name compare
2012-06-15 21:21:42 +02:00
27efdbd58f
Use setter for FileinfoCache
2012-06-15 21:21:42 +02:00
2c8a61ae9c
Merge branch 'master' into oc_error
2012-06-15 20:48:37 +02:00
f06c08a637
cleanup oc_filecache, splitting it in several parts and using the new hasUpdated
2012-06-15 19:56:15 +02:00
a9a424a519
also add hasUpdated to oc_filesystem and oc_filesystemview
2012-06-15 17:42:39 +02:00
449760f665
add hasUpdated to oc_filestorage
2012-06-15 16:43:24 +02:00
400769ab40
Optimize WebDav access using OC_FileCache
2012-06-15 16:04:07 +02:00
2b228fba34
Load app before running update script
2012-06-15 11:18:44 +02:00
0d3f5f736f
Disable minizing when DEBUG is true
2012-06-15 11:18:44 +02:00
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
6da5a2fdd4
Add possibility to choose the installation folder
2012-06-14 21:00:02 +00:00
625cd822c3
Backport CSRF prevention.
2012-06-14 13:52:22 +02:00
8fd9cbcc54
White-space fix.
2012-06-14 13:23:12 +02:00
a34db3fbe0
Don't add slash if it's there already.
2012-06-14 13:23:12 +02:00
12b34d2dda
Whitespace fix
2012-06-13 21:39:12 +02:00
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
9e7c28835b
Allow same host redirects (/somepath).
2012-06-13 18:32:07 +02:00
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
9e9c40eabd
fix time call
2012-06-13 17:27:49 +02:00
9f82edc157
Merge branch 'master' into oc_error
2012-06-13 15:30:04 +02:00
db1353655b
check for view before trying to invoke method on object
2012-06-13 00:32:44 +02:00
521294d0bf
fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-987
2012-06-12 23:16:26 +02:00
790ae70e32
Create directory for mount point if it doesn't already exist
2012-06-12 15:25:34 -04:00
2b22c538c8
Make some apps compatible
2012-06-11 19:07:51 +02:00
6d68b7620c
Check for string
2012-06-11 18:12:46 +02:00
2ee809fd86
Allow same host redirects (/somepath).
2012-06-11 15:21:37 +02:00
18e44ba2f3
Some updates...
2012-06-11 15:03:45 +02:00
b63795ccb8
Handling arrays
2012-06-11 14:36:11 +02:00
c009bc4b87
Revert
2012-06-11 13:27:32 +02:00
6817a6b102
First try of implementing assignHTML
2012-06-11 12:45:07 +02:00
cd16c5e479
implement a simple request token session garbage collector
2012-06-11 12:13:08 +02:00
a21fd725d6
Categories: Turned the debugging down a bit.
2012-06-11 03:07:20 +02:00
1cb1980d62
Categories: Turned the debugging down a bit.
2012-06-11 03:05:33 +02:00
3c57fb935b
Mount personal mount points into filesystem
2012-06-10 16:34:44 -04:00
cfea28101a
4.0.2
2012-06-10 20:31:31 +02:00
82abbed883
Merge branch 'master' into oc_error
2012-06-10 18:38:38 +02:00
c11f6cc3f9
fix variable name and undefined index notice
2012-06-10 17:25:50 +02:00
3970be3d7f
fix variable name and undefined index notice
2012-06-10 17:25:19 +02:00
f1250a3867
add function in filesystem to strip webroot
2012-06-10 13:19:10 +02:00
e7d1af48fb
handle encrypted images files in oc_image
2012-06-10 13:19:05 +02:00
7ee722e0da
removing app access check, fix title for links in tiles
2012-06-10 13:18:55 +02:00
9b2b5e0f6d
git status
2012-06-10 13:15:23 +02:00
689c8f5f09
paging not yet implemented. increasing pagesize to 100 as a temporary quickfix
2012-06-09 22:02:29 +02:00
3947aa3ef7
apps paging is not yet implemented. increase pagesize to 100 as a quickfix
2012-06-09 22:00:28 +02:00
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
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
601bac746d
use absolute path for file proxies
2012-06-09 17:34:13 +02:00
b16136642b
Bump version to trigger db update.
2012-06-09 16:05:21 +02:00
43501309e3
add function in filesystem to strip webroot
2012-06-09 15:26:26 +02:00
120997112c
handle encrypted images files in oc_image
2012-06-09 15:22:18 +02:00
001293a702
removing app access check, fix title for links in tiles
2012-06-09 15:12:50 +02:00
344299a074
add two csrf check calls. Review and lot´s of porting needed.
2012-06-09 15:05:14 +02:00
6e1ca36207
fix infinite redirect during setup for windows hosts
2012-06-09 14:38:50 +02:00
76de92477f
fix infinite redirect during setup for windows hosts
2012-06-09 14:38:05 +02:00
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
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
ac36512102
Don't use substr to get first char of string
2012-06-08 21:38:10 +02:00
b9a1524508
Smarter code for OC_FileProxy
2012-06-08 21:38:10 +02:00
6af980c20c
Add cache for getStorage and getInternalPath functions.
...
These are called for almost every file operation.
2012-06-08 21:38:10 +02:00
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
7c5c257bf6
Comment layout and spelling fixes
2012-06-08 21:38:10 +02:00
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
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
f43fd1765e
fix merge conflicts
2012-06-08 11:23:58 +02:00
0575d149b4
Use the default parameter of OC_Config::getValue to set defaults
2012-06-07 22:49:50 +02:00
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
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
9f1c46b6f6
Correct Minizer inclusions
2012-06-07 19:22:43 +00:00
0f7fdd4148
ReAdd possibility to load existing app folders
2012-06-07 19:15:31 +00:00
cf02f3c107
Merge branch 'master' into multi_app_dir
2012-06-07 19:11:55 +00:00
c696f449a2
Make it easier to subclass OC_L10N.
2012-06-07 17:26:28 +02:00
e8447e0bda
Rework to fit with minizer
2012-06-06 21:11:15 +00:00
8dba47d466
Add layer to select fast or slow cache for storing values
2012-06-06 22:41:36 +02:00
5c2b2fc842
Change app path logic in templates
2012-06-06 20:24:16 +00:00
6a812644e4
Correct remote and public, and last occurence of OC::
2012-06-06 20:24:15 +00:00
6a250d0d20
Correct css file inclusion
2012-06-06 20:24:15 +00:00
cc494259d3
Unit path and webpath, correct some more
2012-06-06 20:24:15 +00:00
6832aec60f
Correct installer
2012-06-06 20:23:17 +00:00
b6c5ca126b
First almost working version
2012-06-06 20:23:17 +00:00
6d211155ab
git status
2012-06-06 22:13:48 +02:00
6ca2b49292
avoid too-early database access and thus make owncloud installable again
2012-06-06 17:29:57 +02:00
2ddb72bb58
fix wrong documentation
2012-06-06 14:18:30 +02:00
fa0c45b005
Merge branch 'master' into oc_error
2012-06-06 10:12:54 +02:00
826a439c15
Supress any warnings if log file does not exist
2012-06-05 18:42:16 -04:00
3ce6344d40
Supress any warnings if log file does not exist
2012-06-05 17:44:07 -04:00
fc56a668ce
Add OC_Cache implementation for APC
2012-06-05 23:19:28 +02:00
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
9984c2a593
Spelling fixes in XCache files
2012-06-05 23:07:11 +02:00
f6298cb74f
add hasKey for XCache backend
2012-06-05 20:54:07 +02:00
098beae751
Added hasKey() method to OC_Cache.
2012-06-05 20:34:12 +02:00
9dbb07b806
Added data() method to OC_Image to return raw image data.
2012-06-05 20:31:15 +02:00
301a14dcd6
add XCache backend and testcases for OC_Cache
2012-06-05 19:58:30 +02:00
e11bf460e0
add OC_Cache::clear
2012-06-05 19:57:49 +02:00
10eef49c3c
return null when a cache variable is not set
2012-06-05 19:33:15 +02:00
dcf1eed816
add unique instance id
2012-06-05 19:32:48 +02:00
eed0450351
Fix remap dir for CSS minimizer
2012-06-05 18:09:32 +02:00
9d936976a9
Make check for writable apps dir configurable
2012-06-05 17:51:52 +02:00
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
edecc5bca3
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-05 15:29:59 +02:00
4bc7387d7c
fi login for hosts running n port 80
2012-06-05 15:28:00 +02:00
e747fd794e
fix login for hosts running on port 80
2012-06-05 15:26:31 +02:00
5c9325bbe0
CLI is no availabe in stable4
2012-06-05 14:10:50 +02:00
7621559d00
make groups not static, fixes oc-919
2012-06-05 14:02:13 +02:00
d3bb01b598
more reliable host detection for reverse proxy scenarios
2012-06-05 12:53:48 +02:00
e3031ae28b
more reliable host detection for reverse proxy servers
2012-06-05 12:52:23 +02:00
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
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
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
dfc90021ca
load authentication apps before checking wether user exists. fixes oc-910
2012-06-04 21:40:32 +02:00
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
454f81fb15
load authentication apps before checking wether user exists. fixes oc-910
2012-06-04 21:31:35 +02:00
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
b117a1e3ec
update file paths in filecache when the parent is renamed
2012-06-04 18:12:25 +02:00
ca64a4080f
don't allow user to delete Shared dir via webdav and sync client (bug #774 )
2012-06-04 18:08:51 +02:00
6d70f42dd4
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-04 18:04:29 +02:00
c6a1d9491b
don't allow user to delete Shared dir via webdav and sync client (bug #774 )
2012-06-04 18:03:16 +02:00
59086fe082
update file paths in filecache when the parent is renamed
2012-06-04 17:59:42 +02:00
7fbe306990
no move (rename) operation for "Shared" directory
2012-06-04 14:00:35 +02:00
c8f670dfab
Don't allow user to delete, rename and re-share the "Shared" directory
2012-06-04 14:00:35 +02:00
64fe06710a
add deprecated warning
2012-06-04 12:49:33 +02:00
8755fd88bb
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-04 12:46:22 +02:00
1e6802e567
add deprecated warning
2012-06-04 12:45:45 +02:00
4eba41a2a0
no move (rename) operation for "Shared" directory
2012-06-04 11:04:05 +02:00
2d80c148ba
Don't allow user to delete, rename and re-share the "Shared" directory
2012-06-04 10:42:09 +02:00
b8275691e7
Merge branch 'master' into oc_error
2012-06-04 10:35:50 +02:00
300f6894e0
4.0.1
2012-06-03 21:06:07 +02:00
e90cbcaf5b
http user backend
2012-06-03 02:51:05 +02:00
0145c65bf3
Verify user exists when checking if logged in, fix for bug oc-863
2012-06-02 20:09:44 -04:00
993ebc4c90
Verify user exists when checking if logged in, fix for bug oc-863
2012-06-02 20:06:52 -04:00
cc84bd2993
Fix typo in log message
2012-06-01 15:15:05 -04:00
4db5481ad5
Improve efficiency of retrieving log file entries
2012-06-01 14:42:14 -04:00
66f1957e3b
Improve efficiency of retrieving log file entries
2012-06-01 14:39:50 -04:00
52b3305892
add a pdo check
2012-06-01 20:01:23 +02:00
3d7143c730
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-01 19:01:00 +01:00
4aa96de537
add a check for pdo
2012-06-01 20:00:33 +02:00
2ccf3da411
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-01 19:00:28 +01:00
07e1e3a945
check if apps folder is writable
2012-06-01 19:54:07 +02:00
3ef944521e
add check if apps folder is writable. needed to install 3rd party apps
2012-06-01 19:52:45 +02:00
4b4d13165a
Minor change to comment
2012-06-01 16:46:18 +01:00
7203f6951e
Extended class comment
2012-06-01 16:34:09 +01:00
aa9824d35b
fix proper error reporting
2012-06-01 16:33:24 +02:00
dcb06393a8
fix propper error reporting
2012-06-01 16:30:47 +02:00
aa88ec81c7
sort users and groups. fixes oc-779
2012-06-01 14:21:24 +02:00
ad6562d14f
sort users and groups. fixes oc-779
2012-06-01 14:18:14 +02:00
0468f53f73
switch magic quotes off.
...
they are evil and deprecated
2012-06-01 12:42:50 +02:00
75d56f24f2
try to switch magic quotes off.
...
it´s evil and deprecated
2012-06-01 12:41:38 +02:00
1b34bda76b
fix oc-874
2012-06-01 12:16:04 +02:00
93295994dc
fix oc-769
2012-06-01 12:15:03 +02:00
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
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
a72e6cc113
fix oc-780
2012-05-31 21:28:58 +02:00
3a6341c880
fix oc-780
2012-05-31 21:27:46 +02:00
d4ea853fcf
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:26:09 +02:00
5d425a9f79
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:16:44 +02:00
ec0c0f3907
Added & improved documentation
2012-05-31 17:57:34 +01:00
ef60dcc23e
fixed typo
2012-05-31 17:38:35 +01:00
6b3df8ae9c
Improved class comment block
2012-05-31 17:32:34 +01:00
8744b09959
added extensive class comment based on icewind's January list email
2012-05-31 17:02:35 +01:00
fc400e06c3
fixed typos in var names
2012-05-31 14:53:52 +01:00
43fcae0409
clarified comment
2012-05-31 14:50:41 +01:00
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
4434016a8b
Whitespace fixes
2012-05-31 13:01:30 +02:00
54001ec7d8
Merge branch 'master' into oc_error
2012-05-31 12:21:06 +02:00
4dc7ed139b
don´t hardcode /tmp
2012-05-30 14:18:47 +02:00
22a04d8e93
don´t hardcode /tmp
2012-05-30 14:14:32 +02:00
c1f7d320e8
mark as 4.0.1 pre
2012-05-29 22:18:07 +02:00
49689dbc7a
Merge branch 'master' into oc_error
2012-05-29 19:48:07 +02:00
1d983c28aa
Restrict requested app to apps directory
2012-05-29 12:35:52 -04:00
fbe58755e5
Restrict requested app to apps directory
2012-05-29 12:31:47 -04:00
2f8412defc
Set table prefix if not set in postgresql install
2012-05-28 20:56:21 +00:00
94c633b6b7
Merge branch 'master' into oc_error
2012-05-26 22:54:49 +02:00
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
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
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
dfd5a9759c
only enable compatible apps
2012-05-25 11:31:46 +02:00
2774ff1ad8
Add HEAD request management for files ajax/download.php
2012-05-25 11:19:38 +02:00
79bf933319
Merge branch 'master' into oc_error
2012-05-25 10:30:44 +02:00
9c2a6fb551
Add HEAD request management for files ajax/download.php
2012-05-24 22:48:10 +00:00
24318354f2
changed the default from Berlin to UTC.
...
Greetings form Berlin by the way ;-)
2012-05-24 00:49:21 +02:00
f97f1b4266
use UTC instead of Berlin as default
2012-05-24 00:47:03 +02:00
60fdc13ae6
enable running unit tests from cli
2012-05-22 20:22:53 +02:00
d2e2a2b2c0
prevent apps from printing output from app.php
2012-05-22 13:10:42 +02:00
3775c0d8b2
dont throw errors when apps dont have types configured
2012-05-20 18:52:44 +02:00
3b4c47c52e
files app is always enabled
2012-05-20 18:52:27 +02:00
cb23bae8d9
dont throw errors when apps dont have types configured
2012-05-20 18:52:03 +02:00
f00b57f8be
files app is always enabled
2012-05-20 18:52:03 +02:00
c0db603d29
this is 5 pre alpha now
2012-05-19 18:21:33 +02:00
8a0dc774bc
4
2012-05-19 18:20:23 +02:00
7e49a33d64
getStorage belongs to files not to apps.
2012-05-19 10:44:08 +02:00
08f7d4c552
document the public classes a bit more
2012-05-19 10:36:57 +02:00
a2cc772aa5
dont run update scripts for apps that arent enabled
2012-05-19 02:00:46 +02:00
b096fd9ed8
log upgrades
2012-05-19 01:55:20 +02:00
df64b9b0e9
strict standards fixes for sqlite3
2012-05-19 01:39:41 +02:00
90cbc32c77
Fix redirect after login, prevent open redirects
2012-05-18 16:56:48 -04:00
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
2d3c709163
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-18 15:56:15 +02:00
db77dc91bc
only try to install apps that are compatible with oC4
2012-05-18 15:54:36 +02:00
2e9115efe0
increase to RC2
2012-05-18 15:54:17 +02:00
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
1a874b4c56
make redirect safe by restricting it to current host
2012-05-18 15:32:41 +02:00
9b5e8a2c63
fix redirect to desired page after login
2012-05-18 15:11:01 +02:00
48505c5626
improve tar archive backend
2012-05-18 01:54:59 +02:00
3d713e711b
Merge branch 'master' into oc_error
2012-05-17 22:17:31 +02:00
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
aac9629e88
add support for custom ports for mysql/pgsql by adding :portnumber to the database host
2012-05-17 01:06:22 +02:00
5fe7200a7f
update documentation of oc_user::checkpassword
2012-05-17 00:57:43 +02:00
2c99924f7d
make sure the group exists in the backend before adding a user to it
2012-05-17 00:47:43 +02:00
22dd155e4d
Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable
2012-05-16 18:30:35 +01:00
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
c645a7d0f8
Fix empty jsfiles and cssfiles in layout template
2012-05-16 18:53:46 +02:00
ce1e4425c2
Combine and minimize core and default app js files
2012-05-16 18:53:46 +02:00
f71fec8cdc
Combine and minimize core and default app css files
2012-05-16 18:53:46 +02:00
2faae817f1
Template: Fix var name
2012-05-16 18:53:46 +02:00
6d20fe4012
Template: Make getFormFactorExtension function public
2012-05-16 18:53:46 +02:00
b39f01fce6
Comment spelling fix
2012-05-16 18:52:40 +02:00
5d72681d10
Better place to check caching headers
2012-05-16 18:52:40 +02:00
01b366df80
avoid corrupt ZIP files on lighttpd, should fix oc-467
2012-05-15 11:57:24 +02:00
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
6779f28af4
cache app types during install or update
2012-05-14 22:49:31 +02:00
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
e7c106d91e
selective app loading for remote/public
2012-05-14 00:28:28 +02:00
a332c39472
Check if path_info is empty as well, fixes bug oc-632. Thanks to die3lustigen2.
2012-05-13 15:26:30 -04:00
8d475debe0
additional logging when db upgrade fails
2012-05-13 21:21:39 +02:00
1a2ab2ef68
prevent user creation with empty password
2012-05-13 20:53:56 +02:00
a5f0ac811f
Merge branch 'master' into oc_error
2012-05-13 19:13:31 +02:00
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
9e6221b229
VCategories: Suppress error messages stemming from import from file app.
2012-05-13 09:16:53 +02:00
af77ce9a9b
This is RC now
2012-05-13 05:11:10 +02:00
9eb91a111d
update to jquery 1.7.2
2012-05-12 00:37:19 +02:00
5b7c69f978
Change sqlite escaping of identifier to double quote. Fixing some issues
2012-05-11 19:45:53 +00:00
919681f3e6
Make processed css files cachable
2012-05-11 21:33:02 +02:00
97233b77cd
Remove DOCUMENTROOT static var, and make SUBURI var private
2012-05-11 21:31:51 +02:00
847832ae77
also set remote/public paths on installing apps
2012-05-11 20:58:23 +02:00
d12021e3c4
fix sqlite3 driver against updated MDB2
2012-05-11 20:56:02 +02:00
cf3940425f
don't do the initial scanning of the users home folder trough the update system
2012-05-11 20:49:19 +02:00
0622fa79ba
add temporary filestorage backend for testing purposed
2012-05-11 20:33:56 +02:00
b40f9670ae
allow clearing hooks and fileproxies
2012-05-11 20:33:56 +02:00
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
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
347ce2aafa
match setup script to .htaccess from repo
2012-05-11 17:30:27 +02:00
4462b26160
oops, typo in lib/setup.php
2012-05-11 17:09:10 +02:00
2dff357a4e
add new htaccess things into setup script too
2012-05-11 17:06:04 +02:00
8f2217ca2e
make default app choosable
2012-05-11 13:56:52 +02:00
709b0a1ddc
Check if app is enabled before exporting its data
2012-05-10 23:06:53 +00:00
de95bf62a2
Prevent any null bytes related exploits, thanks to Lukas Reschke
2012-05-10 11:44:06 -04:00
d9fbdae758
Prevent XSS exploit by checking if path-info is set, thanks to Lukas Reschke
2012-05-10 10:26:12 -04:00
b055ebc1fc
added documentation to OCP namespace
2012-05-10 14:19:17 +01:00
c2230580c1
Remove unused OC static variable CONFIG_DATADIRECTORY_ROOT
2012-05-10 09:14:27 +02:00
b022ccb863
Whitespace fixes
2012-05-10 09:14:26 +02:00
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
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
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
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
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
bc60b8d87a
fix bug in public api
2012-05-09 18:33:40 +02:00
bba434ca37
fixed typo in lib/public/util.php:106 (varname to )
2012-05-09 15:17:40 +02:00
051442bc76
Sanitize redirect urls
2012-05-08 17:41:50 -04:00
9c47346373
Protect admin from evil log messages
2012-05-08 19:41:31 +00:00
52717d2a1b
remove comments
2012-05-08 17:07:50 +02:00
9921ca11b5
Add protection for non-authorized char in installation form
2012-05-07 22:12:30 +00:00
43978abd80
increase to 4 beta
2012-05-07 22:58:22 +02:00
10d291d6b3
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-07 22:56:34 +02:00
40b823bc8b
some more docu fixes
2012-05-07 22:55:44 +02:00
4dbc2093c6
Create a function for linking to remote.php
2012-05-07 21:47:14 +02:00
5b7cefb1e5
make ampache work with remote.php
2012-05-07 20:26:09 +02:00
d032345191
fix validation of getfile parameter - i hate this bloody merge conflicts
2012-05-07 13:23:55 +02:00
640ba1828f
Start of audit app
...
Audit the filesystem action
2012-05-07 09:04:07 +02:00
cde60dba0f
Fix typo.
2012-05-07 04:46:09 +02:00
aa0c3ddcfe
Fix updateFolder() in OC_FileCache
2012-05-06 20:11:10 -04:00
e0db22cc07
Provide feedback when user creation fails
2012-05-06 18:04:48 -04:00
1945cd6946
ported the oc_template class
2012-05-06 23:00:36 +02:00
5d55c709dd
some more documentation cleanups. much more is needed.
...
And greeting from the Atlanta airport. ;-)
2012-05-06 22:02:16 +02:00
2edf59c026
first part of documentation update. lot´s more to come
2012-05-06 21:46:39 +02:00
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
e459309511
Fixed escaping of filename when determining MIME type
2012-04-25 10:33:52 +02:00
f991948a71
Fix loading by apptype in webdav
2012-05-05 21:58:10 +02:00
d46bea8867
fixing file headers with copy right
2012-05-05 18:13:40 +02:00
c0e67fa24a
fix opening encrypted files from the browser
2012-05-05 16:49:48 +02:00
9bcc5c11a8
porting the hooks and starting with the templates
2012-05-05 10:18:45 +02:00
4a89eb77c1
Escape strings for DB and User creation at setup. Fix oc-124
2012-05-04 22:54:55 +00:00
eab4a05d78
implement missing getusers call
2012-05-04 11:13:07 +02:00
a22a79cddd
fix filecache for postgresql
2012-05-03 23:17:03 +02:00
9e03ea4a28
ensure the files app is always loaded
2012-05-03 20:47:18 +02:00
97a8af7f25
ported oc_db
2012-05-03 13:06:08 +02:00
43caa3b3b9
ported oc_json
2012-05-03 12:23:29 +02:00
351740601a
port oc_response
2012-05-03 10:46:27 +02:00
e5ef3e1340
move archive library to core so we can properly depend on it
2012-05-02 23:48:23 +02:00
31d623f426
Fix log viewing bug
2012-05-02 15:26:42 -04:00
10bbbc8cd2
new checkAppEnabled call
2012-05-02 18:54:31 +02:00
da03d05700
create folder 'remote' for the remote services like caldav, carddav and webdav
2012-05-02 16:41:23 +02:00
82a61e2e1a
port oc_preferences
2012-05-02 15:54:34 +02:00
ff66600bc0
port appconfig
2012-05-02 14:11:29 +02:00
8e99475886
first part of the config stuff
2012-05-02 13:28:56 +02:00
8c7f854671
move all the files stuff into a files class
2012-05-02 12:54:31 +02:00
6750998984
files is not internal any more, part II
2012-05-02 11:26:22 +02:00
d71600213a
files is not internal any more
2012-05-02 11:14:11 +02:00
c9eaffd336
send downloadfile piece by piece. saves RAM and is better suited for large files.
2012-05-02 11:02:13 +02:00
2fe646dcec
ported the oc_app calls
2012-05-02 00:50:26 +02:00
93b63cf375
ported the rest of the OC_Helper calls
2012-05-02 00:20:45 +02:00
e48f511606
port linkto and serverHost
2012-05-01 23:19:39 +02:00
31e32e3c10
ported checkLoggedIn and checkAdmin
2012-05-01 22:59:38 +02:00
e2fb094693
some more porting
2012-05-01 21:07:08 +02:00
d0554bef06
finish porting of the LOG calls or the apps to the public api
2012-05-01 17:38:27 +02:00
7ded9cf520
Checks if config folder is writable on begin of the installation.
2012-05-01 16:35:46 +02:00
d3ce2cacd6
OC_User: handle success properly
2012-05-01 14:40:56 +02:00
8a69116e94
OC_User: don't say password changed when it is not true
2012-05-01 13:40:01 +02:00
0195d5b439
some more work on the public API
2012-05-01 09:39:12 +02:00
04c6582af1
load the files app in a way that doesn´t break oC3 configurations
2012-04-30 13:58:48 +02:00
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
f0701f75a9
tiny typo
2012-04-30 13:08:08 +02:00
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
c7e7767f58
don´t hardcode files app. we have no a standard info.xml in files
2012-04-29 21:27:02 +02:00
4d3ef9a824
improve rescanning folders
2012-04-29 16:11:17 +02:00
e3adbcb7d5
remove non existing files from the cache when rescanning a folder
2012-04-29 15:09:47 +02:00
09a5c59cca
only install shipped apps on setup that should be enabled by default
2012-04-29 14:38:56 +02:00
3aedbc5f95
remove debug message
2012-04-27 22:22:58 +02:00
06e9ac8591
fix parsing of app parameter and fix external app
2012-04-27 22:22:03 +02:00
993d655aad
Merge branch 'master' into movable_apps_2
2012-04-27 10:30:50 +02:00
ee0cb68f5e
some csrf fixes. needs testing
2012-04-27 01:18:21 +02:00
74b5e22a68
some more csrf fixes
2012-04-26 23:17:46 +02:00
5483c1be42
hide fails
2012-04-26 21:58:43 +02:00
5fda0e4b3b
make *DAV work with movable apps
2012-04-26 21:56:29 +02:00
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
40f95ffdf3
fix security check for the path of the requested file
2012-04-26 17:55:00 +02:00
ebcaa46482
fix loading of css files that are core related
2012-04-26 15:19:27 +02:00
3f64eb25ab
some fixes fore movable apps
2012-04-26 14:52:55 +02:00
d76552a009
Merge branch 'sabredav_1.6'
2012-04-25 10:39:31 +02:00
476043ecb9
add a proper 404
2012-04-25 10:17:20 +02:00
cc2bfd313d
minor filecache improvements
2012-04-25 00:12:12 +02:00
9015c46e31
emit the correct hooks for file_put_contents and some readfile improvements
2012-04-25 00:12:12 +02:00
60b924c954
initial mount configuration work
2012-04-25 00:12:12 +02:00
f17eea506a
fix merge conflicts
2012-04-24 21:59:56 +02:00
fb84d0aff8
fix php fail
2012-04-24 21:37:19 +02:00
9b29bc96de
remove debug message
2012-04-24 21:36:54 +02:00
0b06eff3a0
another fix for linkto function
2012-04-24 20:17:00 +02:00
29b9e27078
fix linkto function in OC_Helper
2012-04-24 20:14:42 +02:00
6848b069c9
OC_App::getStorage() failed if app dir didn't exist.
2012-04-24 01:44:07 +02:00
95c220a246
remove debug code in lib base
2012-04-23 20:31:03 +02:00
Robin Appelman
Georg Ehrke
Florian Hülsmann
Frank Karlitschek
Brice Maron
Bart Visscher
Thomas Mueller
Sam Tuke
Michael Gapczynski
Bjoern Schiessle
Victor Dubiniuk
Thomas Tanghus
Tom Needham
Bartek Przybylski
Lukas Reschke
Arthur Schiwon
Michiel de Jong
Sam Tuke
Philipp Roggan
Daniel
Jernej Virag
Marvin Thomas Rabe
Frank Karlitschek
Frank Karlitschek