cfb3b633f5
Force sanitize function to use UTF8 (for php lower than 5.4)
2012-06-18 19:52:05 +00: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
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
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
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
709dbd82a6
Set default charset to utf-8.
2012-06-16 17:01:12 +02: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
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
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
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
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
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
c11f6cc3f9
fix variable name and undefined index notice
2012-06-10 17:25:50 +02:00
3947aa3ef7
apps paging is not yet implemented. increase pagesize to 100 as a quickfix
2012-06-09 22:00:28 +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
76de92477f
fix infinite redirect during setup for windows hosts
2012-06-09 14:38:05 +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
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
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
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
e747fd794e
fix login for hosts running on port 80
2012-06-05 15:26:31 +02:00
7621559d00
make groups not static, fixes oc-919
2012-06-05 14:02:13 +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
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
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
e90cbcaf5b
http user backend
2012-06-03 02:51:05 +02: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
66f1957e3b
Improve efficiency of retrieving log file entries
2012-06-01 14:39:50 -04: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
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
dcb06393a8
fix propper error reporting
2012-06-01 16:30:47 +02:00
ad6562d14f
sort users and groups. fixes oc-779
2012-06-01 14:18:14 +02:00
75d56f24f2
try to switch magic quotes off.
...
it´s evil and deprecated
2012-06-01 12:41:38 +02:00
93295994dc
fix oc-769
2012-06-01 12:15:03 +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
d4ea853fcf
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:26:09 +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
22a04d8e93
don´t hardcode /tmp
2012-05-30 14:14:32 +02:00
fbe58755e5
Restrict requested app to apps directory
2012-05-29 12:31:47 -04: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
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
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
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
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
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
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
Brice Maron
Bjoern Schiessle
Bart Visscher
Robin Appelman
Michael Gapczynski
Thomas Tanghus
Tom Needham
Frank Karlitschek
Bartek Przybylski
Thomas Mueller
Lukas Reschke
Georg Ehrke
Arthur Schiwon
Sam Tuke
Florian Hülsmann
Michiel de Jong