6e0ea7aaae
use absolute path for db_structure.xml when updating
2012-01-13 20:05:24 +01:00
37dbf48434
Connect to the newly created database when checking if it needs to be filled.
2012-01-13 04:38:59 +01:00
e60860148c
Don't chunk_split encoded image string.
...
Don't return json error but null if card can't be parsed.
Small check for non-parsable card in index.php.
2012-01-12 22:50:12 +01:00
0fb73ec49d
fix previous change
2012-01-12 21:54:58 +01:00
a1429085ee
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-12 21:43:32 +01:00
a0ff21a232
added a file to fix wrong recognised mime-types
2012-01-12 18:26:13 +01:00
fd4b63810d
default table prefix to oc_ if not set
2012-01-10 14:41:08 +00:00
5f04b41ea6
Just a comment ;-)
2012-01-09 20:40:24 +01:00
5e40653713
Missing line return
2012-01-08 21:18:21 +00:00
fbb126cdd9
save updated version number of apps after updating
2012-01-08 19:58:20 +01:00
de3032fd00
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-08 17:02:07 +00:00
ccc43f0ea0
merge master into filesystem
2012-01-08 18:01:33 +01:00
37f5a8cdb4
improve pgsql database detection
2012-01-08 17:49:53 +01:00
e5d3666280
Merge branch 'master' of gitorious.org:owncloud/owncloud into jqueryui
2012-01-08 16:45:28 +00:00
49337e0ad1
dont create a new user when it already exists
2012-01-08 14:25:38 +01:00
ae711168c3
improve detection for mysql databases
2012-01-08 14:07:12 +01:00
a4e14b49b1
load reverse driver when updating database
2012-01-08 13:16:11 +01:00
76b193c698
don't try to upgrade what isn't installed
2012-01-08 13:01:59 +01:00
034cf19159
allow changing database backends between PDO and MDB2
2012-01-08 02:57:52 +01:00
010bfa11e3
Fix updateApp() and add extra check to updateApps()
2012-01-08 02:12:52 +01:00
fea68e08b4
update apps when their version number increases
2012-01-08 01:57:53 +01:00
001d06f2ff
fix errors during database migration
2012-01-08 01:57:53 +01:00
c6aa0f9854
set the installed version after updating the database
2012-01-08 01:57:53 +01:00
09a53170a3
fixes in the sqlite manager driver
2012-01-08 01:57:53 +01:00
ecf6f2ca2f
automatically upgrade the main database on version number increase (doesnt work with sqlite for now)
2012-01-08 01:57:53 +01:00
9a4e37483b
small fix in sqlite3 driver
2012-01-08 01:57:53 +01:00
91a9688d07
minor changes to mysql setup
2012-01-08 01:57:53 +01:00
6c09d9e0f8
some fixes in the sqlite3 driver
2012-01-08 01:57:53 +01:00
799a7db638
Merge branch 'filesystem' of gitorious.org:owncloud/owncloud into filesystem
2012-01-08 01:57:14 +01:00
d1edc360d9
merge master into filesystem
2012-01-08 01:53:40 +01:00
8f8985c3e5
Merge branch 'database'
2012-01-08 01:45:18 +01:00
0d81014fa6
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-06 19:15:29 +01:00
d485a70e7d
finish the application store feature so that users can download and install ownCloud apps from our website. there is still a small problem with write permissions. will look into this later
2012-01-06 19:08:35 +01:00
47a275f389
Use parameter
2012-01-06 18:04:24 +00:00
f9db4249a3
add a formfactor session variable which is autodetected but can also manually overwritten via a get variable.
...
currently we have:
* default -> the normal desktop browser interface
* mobile -> interface for smartphones
* tablet -> interface for tablets
* standalone -> the default interface but without header, footer and sidebar. just the application. useful to use just a specific app on the desktop in a standalone window.
In the future we should adapt the userinterface to the specific formfactor.
2012-01-06 17:21:24 +01:00
2f86a6203a
Added fixOrientation method which rotates the image based on EXIF data.
2012-01-05 17:42:40 +01:00
d80b477ab5
Wrong permission checking on file save.
2012-01-04 23:31:32 +01:00
48a8f2a793
Content type header was sent when saving image to disk.
2012-01-04 22:57:42 +01:00
b6d66c4727
Remove the keys in preferences when a user is deleted - Thanks rogerc
2012-01-04 15:19:16 -05:00
6dcabdc61c
Fixed merge conflict in /files/ajax/move.php
2012-01-04 16:31:06 +00:00
868a3b5364
Fix sqlite detection for Ubuntu 11.10
2012-01-03 15:58:48 +01:00
9e9bc1430b
don't check if the target path is writable for operations that can create a new file
...
fixes file upload
2012-01-03 15:55:38 +01:00
4c8f17ad47
don't try to use mod_rewrite when it isn't enabled
...
having a broken web/card/caldav is much better as having no ownCloud at all :)
2012-01-03 04:55:57 +01:00
b8cffbc0ee
OC_Image::__invoke didn't return anything thus causing contacts/thumbnail.php to spit out lots of error messages.
2012-01-02 23:17:15 +01:00
2a184631d1
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-02 19:38:10 +01:00
cc55f00481
fix is_readable and is_writable
2012-01-02 16:38:10 +01:00
6a7fbf9d13
Added more error checking and debug on missing image support.
2012-01-02 13:40:23 +01:00
c62c55fb81
Added save() to OC_Image.
2012-01-02 12:09:45 +01:00
534b6f3a09
Fix whitespace username
2012-01-02 11:49:53 +01:00
29048bf4bd
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-02 11:47:02 +01:00
4374d55e5e
Correct local permissions checks
2012-01-01 19:59:24 -05:00
fb4c3bd9ce
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-02 01:09:22 +01:00
a8789ebe29
Removed static declaration from loadFrom* methods.
2012-01-02 00:43:27 +01:00
a9bab168f5
Replace canRead()/canWrite() with is_readable()/is_writeable() for proper permission checks
2012-01-01 18:41:00 -05:00
db6738478b
Mixed up two lines :-P
2012-01-01 23:34:26 +01:00
312e7993bb
Added image type specific loading and displaying.
...
Added method 'valid()' to tell if image contains a valid resource.
Renamed imageResource() to resource().
2012-01-01 23:26:24 +01:00
a22b5feda6
Initial commit of common filestorage
2012-01-01 17:05:22 -05:00
7250dc4e98
Fix updateApp() and add extra check to updateApps()
2012-01-01 16:58:51 -05:00
782d201191
Move to branch
2012-01-01 16:25:43 -05:00
19328fd8b2
Initial commit of common filestorage
2012-01-01 15:56:33 -05:00
929ce2b566
Small fixes
2012-01-01 20:06:35 +01:00
c500c1e930
Removed some denug statements and an exception thrown.
2012-01-01 18:07:46 +01:00
6207c0444b
Added class OC_Image
2012-01-01 17:57:26 +01:00
cbb2db8622
Fix merge conflicts
2012-01-01 01:18:02 +00:00
39e67707d7
Updated jquery ui js and css. Improved color scheme.
2011-12-30 22:47:39 +00:00
eb4cd86910
Include PostgreSQL when checking for available database drivers.
...
Signed-off-by: Brice Maron <brice@bmaron.net>
2011-12-30 21:09:29 +01:00
3844fb0e4c
also use fscache when getting used space for webdav
2011-12-14 01:19:23 +01:00
835d6a9b6e
save quota in human readable format (42 MB), should prevent some of the overflow related problems
2011-12-14 01:16:14 +01:00
c67c933d3f
Merge branch 'database' into filesystem
2011-12-11 23:57:53 +01:00
9fdd1bafdc
Merge branch 'master' into filesystem
2011-12-11 23:42:22 +01:00
5e711f37ca
make filesize parsing case insensitive
2011-12-11 23:34:27 +01:00
efecb694ef
make filesize parsing case insensitive
2011-12-11 23:33:24 +01:00
a8148fa94a
update apps when their version number increases
2011-12-11 22:08:01 +01:00
7f1bb5fd78
Merge branch 'master' into database
2011-12-11 22:00:17 +01:00
1746cba249
Some small changes
2011-12-09 22:36:39 +01:00
a3cb04013e
Update OC_VObject
2011-12-09 21:56:03 +01:00
eeaf539a44
Gallery: splitout model code
2011-12-08 20:05:12 +01:00
0342b5fc43
Fix filename of log icon
2011-12-07 20:41:00 +01:00
c67ac46b6c
Use a proxy class to interface with Sabre_VObject classes
2011-12-07 20:40:58 +01:00
153029a170
increase version to trigger database upgrade
2011-11-26 01:26:01 +01:00
a8e4d2946a
Merge branch 'database' into filesystem
2011-11-26 01:25:08 +01:00
43911d9a6f
Template: output better html for select options
2011-11-24 21:36:34 +01:00
fab70cb590
removed no longer used function and exec command
...
security++
2011-11-24 13:50:29 +01:00
76bfc3b547
set http auth headers for apache+php-cgi work around if variable gets renamed by apache
2011-11-24 02:59:22 +01:00
6c4692380f
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-11-20 11:41:58 +01:00
7df9d934ca
second half of the updating stuff
2011-11-19 12:02:34 +01:00
949bd2c47a
first small step to an automatic updating system.
...
At the moment we only have a hint that a new version is avaiable and a link to a not yet existing page if updating information. This has to be improved.
2011-11-19 11:56:40 +01:00
98dc0882cb
fix errors during database migration
2011-11-15 16:08:08 +01:00
916c72b40b
set the installed version after updating the database
2011-11-15 15:59:01 +01:00
9686c5b6aa
fixes in the sqlite manager driver
2011-11-15 15:58:12 +01:00
b2f1429b75
automatically upgrade the main database on version number increase (doesnt work with sqlite for now)
2011-11-13 16:16:21 +01:00
aa7c5a971c
small fix in sqlite3 driver
2011-11-13 16:08:47 +01:00
486a31bfa3
minor changes to mysql setup
2011-11-13 16:06:29 +01:00
bf40691ace
some fixes in the sqlite3 driver
2011-11-12 18:06:07 +01:00
e5a3ab8aad
Merge branch 'master' into fullcalendar
2011-11-12 15:09:37 +01:00
024f4375b6
keep encrypted and versioned flag in fscache
2011-11-12 01:00:04 +01:00
b2f2a87745
use cache for searching files
2011-11-10 23:50:43 +01:00
7543ffa3b1
always load the filecache
2011-11-10 16:53:08 +01:00
524e3686a0
tell the user when the files are being scanned
2011-11-10 16:40:09 +01:00
ef124c3e21
Use a function to generate select options
2011-11-09 22:19:52 +01:00
5a6aba1e11
provide caching for file metadata
2011-11-09 18:41:57 +01:00
b3a73c78e8
Fix comments/documentation
2011-11-09 11:35:50 +01:00
5cc6635eb8
remove OC_Filesystem::fromUploadedFile
2011-11-08 22:36:05 +01:00
ca6c500799
remove OC_Filesystem::fileatime
2011-11-08 22:26:03 +01:00
ec015a2e68
remove the need to register storage providers, pass the classname during mounting instead
2011-11-08 22:21:25 +01:00
878fc1d197
remove outdated remote storage prototype
2011-11-08 22:18:41 +01:00
452a463764
Make OC_Connector_Sabre_File::get() return a PHP stream instead of the file content, as is recommended by SabreDAV to handle large files.
2011-11-06 22:39:24 +01:00
3940ca3df1
Display correctly the error message when nothing is retrieved from OCS servers
2011-11-06 16:48:26 +01:00
7de591f5cc
Avoid Huge error message when unable to read log file
2011-11-06 14:37:22 +01:00
7b3ae2edd4
use database table prefix from installer, not the old configured value
2011-11-03 13:09:51 +01:00
c7d1737d47
attempt to manage some special chars in file list
...
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
2011-11-01 22:35:13 +01:00
e533e82bc9
Add sequence name in insertid to be more portable
2011-10-29 11:40:48 +02:00
7b01858c57
Enable php display_errors setting
2011-10-27 22:48:50 +02:00
9832a0817d
Merge branch 'master' into fullcalendar
...
Conflicts:
apps/calendar/index.php
2011-10-24 22:40:22 +02:00
f073041b0b
provide function for updating the database scheme
2011-10-23 15:25:38 +02:00
6592fbb948
improve detection of database backend
2011-10-23 12:32:33 +02:00
122fa190c6
improve mimetype detection
2011-10-23 11:35:29 +02:00
38bb503ff6
fix fopen
2011-10-23 11:35:29 +02:00
3acea2f574
change the error hint from suggesting to change the owner of a directory to changing the permissions. changing the owner of a director is not possible via ftp.
2011-10-22 19:39:05 +02:00
0011c42669
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-10-22 13:12:13 +02:00
7761765a4b
change licencing headers for sqlite3 driver
2011-10-22 12:31:07 +02:00
af1f0305eb
fix log level check
2011-10-22 12:22:57 +02:00
4fe48a50f0
Translation of calendar interface
2011-10-20 23:49:27 +02:00
3a937f79f7
escape filenames for getMimeType
2011-10-20 22:55:27 +02:00
8f77179d29
Merge commit 'refs/merge-requests/64' of git://gitorious.org/owncloud/owncloud
2011-10-20 01:24:23 +02:00
273972b75a
prevent sql error while initializing apps on sqlite2
2011-10-20 01:17:02 +02:00
466b41c36b
Don't use sys_get_temp_dir(), as it reports the wrong path in restricted environments
2011-10-19 23:38:35 +02:00
b975f11514
make sharing work with the new mouting mechanism
2011-10-18 21:19:13 +02:00
28ab39073a
mount filesystems on demand
2011-10-18 21:01:49 +02:00
ebd36d56ca
Remove unnecessary exec for getting timezone and fix spacings
2011-10-17 21:42:38 +02:00
595b13f1e0
prevent the remaining ob_clean related errors
2011-10-17 01:18:02 +02:00
77378fa189
fix now() function for sqlite3
2011-10-17 00:25:13 +02:00
1f6be85719
Fix bookmarks app to work with postgresql.
...
Rework the bookmark app to manage postgresql.
Add a fetchOne function into the PdoStmtWrapper
Fix a tipo in comments.
2011-10-16 23:03:03 +02:00
b0127e3918
use OC_Log instead of error_log
2011-10-16 21:42:24 +02:00
d9372ac766
make log level configurable
2011-10-16 21:11:03 +02:00
820cd0fb75
provide a logging mechanism
2011-10-16 21:11:03 +02:00
d11a8f4103
some minor tweaks to oc_db
2011-10-16 21:11:03 +02:00
90c54ade67
Fix typo in getting var from config
2011-10-16 21:08:07 +02:00
c105268a1d
Fetch prefix from config at installation instead of a hardcoded value
2011-10-16 21:06:48 +02:00
543537ef29
Fix installer for postgresql : correct table detection query
2011-10-16 20:23:43 +02:00
9ce15667d5
Merge branch 'calendar' of gitorious.org:owncloud/owncloud
2011-10-16 15:41:00 +02:00
512d226d43
merge database into master
2011-10-16 13:54:21 +02:00
a01d10e57d
Merge branch 'master' into calendar
2011-10-13 21:59:16 +02:00
db2fb38746
prevent error involving webdav workaround
2011-10-13 21:55:02 +02:00
f1fd374a6f
webdav workaround for apache+php-cgi
2011-10-13 16:33:39 +02:00
d7fa2a0f77
mimetype icon improvements
2011-10-13 16:33:39 +02:00
ffb9a0475e
webdav workaround for apache+php-cgi
2011-10-13 16:31:01 +02:00
9d3c7badb5
Fixed a bug in checkWebserverUser
...
checkWebserverUser would return the owner of the document
root instead of the owner of the web server process.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-11 21:46:14 +02:00
4cbae823eb
Merge branch 'master' into calendar
2011-10-10 21:08:11 +02:00
9ba384b9a4
merge master into database
2011-10-10 21:05:39 +02:00
8b3c4e9a52
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-10 20:57:15 +02:00
6163351ea2
master is now on the way to ownCloud 3
2011-10-10 18:48:40 +02:00
949494ccfd
mimetype icon improvements
2011-10-08 21:18:47 +02:00
538abb99f1
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:10:50 +01:00
1f562a2e83
fixes for the mimetype icons
2011-10-07 18:09:49 +02:00
65a491eabd
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:02:56 +01:00
3388381deb
Fixed the 'Undefined index "user_id"' bug when requesting a publicly shared folder and being logged-out.
...
The OC_App::navigation array contains by default only the help menu.
2011-10-05 14:31:33 +04:00
2d9c3d75f3
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-04 19:17:23 +01:00
33f24a42b8
redirect url fixed
2011-10-04 19:27:57 +02:00
02d7b1a1fc
Added breadcrumb and control bar.
2011-10-03 22:59:40 +01:00
baf2fa3a9f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-10-03 14:47:41 +02:00
6d8985ceb2
added infield labels. readded fade in of login button. updated label on install page.
2011-10-03 14:41:55 +02:00
25544d31f9
added mime type for calendar files
2011-10-03 12:16:06 +02:00
0eddc5cae2
bump version number
2011-10-02 18:15:01 +02:00
88f4f5413a
add OC_Appconfig::hasKey
2011-10-02 14:30:51 +02:00
21a88613a1
Merge branch 'lostpassword'
...
Conflicts:
core/templates/login.php
index.php
lib/util.php
2011-09-30 23:48:20 +02:00
f4782a7690
Check if the application is actually enabled
2011-09-30 23:17:18 +02:00
ccfa2dd24c
Error when only oc_remember_login cookie set fixed.
...
Filled username field when oc_username is set repaired.
Problems with "advanced settings" button in installation wizard fixed.
CSS improved - login and installation now looks more clean.
Request password link removed (email feature not implemented yet).
Database radio button bugs removed.
It is possible to have an empty database password, now ownCloud will support this "security issue".
Ignore Mac OS X ".DSstore" files.
Fade in/out of login button and remember checkbox removed due to some display errors.
2011-09-30 18:25:34 +02:00
c3b57944ac
Revert "enhance detection of un-initialized database", conflicted with setup step, needs rework
...
This reverts commit 7fb89c5386
2011-09-30 17:03:04 +02:00
7fb89c5386
enhance detection of un-initialized database
2011-09-30 14:40:17 +02:00
182333a781
use central method for checking webserver user
2011-09-29 15:54:41 +02:00
6636720d2d
enhance warning
2011-09-29 15:53:58 +02:00
19d4121763
Change json content-type to correct IANA type
2011-09-28 23:17:25 +02:00
1f74e76d83
Implemented ace-edtior as an app. Basic file editing and saving supported.
2011-09-28 15:15:04 +01:00
f14a62c875
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-28 13:53:51 +02:00
f2a7f230f1
add status file. useful for external administration. show the ownClopud version at least in the config dialog.
2011-09-28 13:52:26 +02:00
475dd72ea4
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-28 11:52:13 +02:00
0fcd765bd5
add check for ctype
2011-09-28 11:47:29 +02:00
40b47defcb
enhance errormessages on setup
2011-09-28 11:46:04 +02:00
c6f78fbe43
Add flag in info.xml to control the apps that are installed by default
2011-09-27 22:36:14 +02:00
10c5178e31
check for php modules
2011-09-27 19:08:38 +02:00
2d3c1a3f00
Fix space in comment
2011-09-26 21:18:37 +02:00
aae6881494
Move display of login page to function in OC_Util
2011-09-26 21:17:17 +02:00
bcf92badd1
dont set content type to json for Apps
2011-09-26 00:19:34 +02:00
17e631bc5e
Use OC_JSON for json responses
...
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
2011-09-25 22:19:28 +02:00
6c2b22406c
remove some debug statements
2011-09-25 01:33:53 +02:00
57bffdb46a
fix uploading files using webdav
2011-09-25 01:20:43 +02:00
36c31b0e83
fix warning when uploading file using webdav
...
When uploading a file using davfs php warned about a missing argument to
OC_FileProxy_Quota::preFile_put_contents(). Since we get a resource from
OC_Connector_Sabre_File->put(), we have to convert that before running
strlen because it expects a string.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:01 +02:00
c7d4e72341
set cookie secure if forcessl is enabled
...
This also moves session_start in lib/base.php down a bit because we need
OC::$SERVERROOT to get the config settings.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:00 +02:00
8648e3c43c
only call error_log() if DEBUG is true
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:47 +02:00
2267b6e97d
use jquery 1.6.4
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:43 +02:00
e9950defb2
Make event category choice multiselect
2011-09-23 19:40:06 +02:00
e990ef3542
Move some common code to OC_Util
...
Created the following function:
- checkLoggedIn
- checkAdminUser
- redirectToDefaultPage
2011-09-18 21:31:56 +02:00
8966ed5a00
Cleanup lib/base.php
2011-09-18 20:57:05 +02:00
82c7598861
Remove global vars and use the OC static version.
...
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
2011-09-18 19:37:54 +02:00
6e980d419c
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-09-18 15:06:51 +02:00
94696ea7de
remember changed not to store password in cookie
2011-09-18 15:05:53 +02:00
39fa5d1c7f
always use mdb2 for installation
2011-09-18 14:05:38 +02:00
b86367866e
merge master into database
2011-09-18 13:47:15 +02:00
0714e83a8e
fix creating groups
2011-09-18 13:35:27 +02:00
Robin Appelman
Daniel Köb
Thomas Tanghus
Georg Ehrke
Tom Needham
Michael Gapczynski
Frank Karlitschek
prcrst
Georg Ehrke
Bart Visscher
Hendrik Langer
Frank Karlitschek
Jakob Sack
Florian Vichot
Brice Maron
Georg Ehrke
Joar Wandborg
Borjan Tchakaloff
Marvin Thomas Rabe
Thomas Schmidt
Florian Pritz
Bart Visscher
Bartek Przybylski