Commit Graph

552 Commits

Author SHA1 Message Date
Hendrik Langer 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
Robin Appelman b975f11514 make sharing work with the new mouting mechanism 2011-10-18 21:19:13 +02:00
Robin Appelman 28ab39073a mount filesystems on demand 2011-10-18 21:01:49 +02:00
Brice Maron ebd36d56ca Remove unnecessary exec for getting timezone and fix spacings 2011-10-17 21:42:38 +02:00
Robin Appelman 595b13f1e0 prevent the remaining ob_clean related errors 2011-10-17 01:18:02 +02:00
Robin Appelman 77378fa189 fix now() function for sqlite3 2011-10-17 00:25:13 +02:00
Brice Maron 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
Robin Appelman b0127e3918 use OC_Log instead of error_log 2011-10-16 21:42:24 +02:00
Robin Appelman d9372ac766 make log level configurable 2011-10-16 21:11:03 +02:00
Robin Appelman 820cd0fb75 provide a logging mechanism 2011-10-16 21:11:03 +02:00
Robin Appelman d11a8f4103 some minor tweaks to oc_db 2011-10-16 21:11:03 +02:00
Brice Maron 90c54ade67 Fix typo in getting var from config 2011-10-16 21:08:07 +02:00
Brice Maron c105268a1d Fetch prefix from config at installation instead of a hardcoded value 2011-10-16 21:06:48 +02:00
Brice Maron 543537ef29 Fix installer for postgresql : correct table detection query 2011-10-16 20:23:43 +02:00
Georg Ehrke 9ce15667d5 Merge branch 'calendar' of gitorious.org:owncloud/owncloud 2011-10-16 15:41:00 +02:00
Robin Appelman 512d226d43 merge database into master 2011-10-16 13:54:21 +02:00
Georg Ehrke a01d10e57d Merge branch 'master' into calendar 2011-10-13 21:59:16 +02:00
Robin Appelman db2fb38746 prevent error involving webdav workaround 2011-10-13 21:55:02 +02:00
Robin Appelman f1fd374a6f webdav workaround for apache+php-cgi 2011-10-13 16:33:39 +02:00
Robin Appelman d7fa2a0f77 mimetype icon improvements 2011-10-13 16:33:39 +02:00
Robin Appelman ffb9a0475e webdav workaround for apache+php-cgi 2011-10-13 16:31:01 +02:00
Joar Wandborg 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
Georg Ehrke 4cbae823eb Merge branch 'master' into calendar 2011-10-10 21:08:11 +02:00
Robin Appelman 9ba384b9a4 merge master into database 2011-10-10 21:05:39 +02:00
Robin Appelman 8b3c4e9a52 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-10 20:57:15 +02:00
Frank Karlitschek 6163351ea2 master is now on the way to ownCloud 3 2011-10-10 18:48:40 +02:00
Robin Appelman 949494ccfd mimetype icon improvements 2011-10-08 21:18:47 +02:00
Tom Needham 538abb99f1 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-07 17:10:50 +01:00
Robin Appelman 1f562a2e83 fixes for the mimetype icons 2011-10-07 18:09:49 +02:00
Tom Needham 65a491eabd Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-07 17:02:56 +01:00
Borjan Tchakaloff 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
Tom Needham 2d9c3d75f3 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-04 19:17:23 +01:00
Marvin Thomas Rabe 33f24a42b8 redirect url fixed 2011-10-04 19:27:57 +02:00
Tom Needham 02d7b1a1fc Added breadcrumb and control bar. 2011-10-03 22:59:40 +01:00
Marvin Thomas Rabe baf2fa3a9f Merge branch 'master' of git://gitorious.org/owncloud/owncloud 2011-10-03 14:47:41 +02:00
Marvin Thomas Rabe 6d8985ceb2 added infield labels. readded fade in of login button. updated label on install page. 2011-10-03 14:41:55 +02:00
Georg Ehrke 25544d31f9 added mime type for calendar files 2011-10-03 12:16:06 +02:00
Frank Karlitschek 0eddc5cae2 bump version number 2011-10-02 18:15:01 +02:00
Robin Appelman 88f4f5413a add OC_Appconfig::hasKey 2011-10-02 14:30:51 +02:00
Bart Visscher 21a88613a1 Merge branch 'lostpassword'
Conflicts:
	core/templates/login.php
	index.php
	lib/util.php
2011-09-30 23:48:20 +02:00
Bart Visscher f4782a7690 Check if the application is actually enabled 2011-09-30 23:17:18 +02:00
Marvin Thomas Rabe 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
Thomas Schmidt 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
Thomas Schmidt 7fb89c5386 enhance detection of un-initialized database 2011-09-30 14:40:17 +02:00
Thomas Schmidt 182333a781 use central method for checking webserver user 2011-09-29 15:54:41 +02:00
Thomas Schmidt 6636720d2d enhance warning 2011-09-29 15:53:58 +02:00
Bart Visscher 19d4121763 Change json content-type to correct IANA type 2011-09-28 23:17:25 +02:00
Tom Needham 1f74e76d83 Implemented ace-edtior as an app. Basic file editing and saving supported. 2011-09-28 15:15:04 +01:00
Frank Karlitschek f14a62c875 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-09-28 13:53:51 +02:00
Frank Karlitschek 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
Frank Karlitschek 475dd72ea4 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-09-28 11:52:13 +02:00
Frank Karlitschek 0fcd765bd5 add check for ctype 2011-09-28 11:47:29 +02:00
Thomas Schmidt 40b47defcb enhance errormessages on setup 2011-09-28 11:46:04 +02:00
Bart Visscher c6f78fbe43 Add flag in info.xml to control the apps that are installed by default 2011-09-27 22:36:14 +02:00
Frank Karlitschek 10c5178e31 check for php modules 2011-09-27 19:08:38 +02:00
Bart Visscher 2d3c1a3f00 Fix space in comment 2011-09-26 21:18:37 +02:00
Bart Visscher aae6881494 Move display of login page to function in OC_Util 2011-09-26 21:17:17 +02:00
Robin Appelman bcf92badd1 dont set content type to json for Apps 2011-09-26 00:19:34 +02:00
Bart Visscher 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
Robin Appelman 6c2b22406c remove some debug statements 2011-09-25 01:33:53 +02:00
Robin Appelman 57bffdb46a fix uploading files using webdav 2011-09-25 01:20:43 +02:00
Florian Pritz 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
Florian Pritz 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
Florian Pritz 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
Florian Pritz 2267b6e97d use jquery 1.6.4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:43 +02:00
Bart Visscher e9950defb2 Make event category choice multiselect 2011-09-23 19:40:06 +02:00
Bart Visscher e990ef3542 Move some common code to OC_Util
Created the following function:
 - checkLoggedIn
 - checkAdminUser
 - redirectToDefaultPage
2011-09-18 21:31:56 +02:00
Bart Visscher 8966ed5a00 Cleanup lib/base.php 2011-09-18 20:57:05 +02:00
Bart Visscher 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
Bartek Przybylski 6e980d419c Merge branch 'master' of git://gitorious.org/owncloud/owncloud 2011-09-18 15:06:51 +02:00
Bartek Przybylski 94696ea7de remember changed not to store password in cookie 2011-09-18 15:05:53 +02:00
Robin Appelman 39fa5d1c7f always use mdb2 for installation 2011-09-18 14:05:38 +02:00
Robin Appelman b86367866e merge master into database 2011-09-18 13:47:15 +02:00
Robin Appelman 0714e83a8e fix creating groups 2011-09-18 13:35:27 +02:00
Bartek Przybylski 68e7666293 Changed behaviour of remember checkbox 2011-09-18 09:15:30 +02:00
Robin Appelman 8c7aa06088 dont use numRows when it's not needed since it can be expensive 2011-09-17 02:49:40 +02:00
Robin Appelman 5e3ecbbf96 dont use numRows when it's not needed since it can be expensive 2011-09-17 02:36:04 +02:00
Robin Appelman 0e2b957dac add pdo backend to oc_db 2011-09-17 02:30:58 +02:00
Jan-Christoph Borchardt b1e3961825 removed excess white space inside parentheses 2011-09-12 12:30:57 +02:00
Jan-Christoph Borchardt 014f4af79c fixed translation detection thanks to Xuetian Weng 2011-09-12 12:29:43 +02:00
Bart Visscher 760b47a62f Use OC_Helper::linkTo also for absolute urls.
One central place to check for https.
2011-09-09 22:19:15 +02:00
Jan-Christoph Borchardt 252bca5057 removed database table prefix choice, use oc_ 2011-09-04 14:56:09 +02:00
Aloisio Almeida Jr ec87e2eac4 setup.php: Get 'datadirectory' from config file instead of 'datadir'
Signed-off-by: Aloisio Almeida Jr <aloisiojr@gmail.com>
2011-09-03 21:22:09 -03:00
Bart Visscher 3130234640 Remove execute permissions from source files 2011-09-03 22:15:23 +02:00
Côme BERNIGAUD 3972774a2e Removed db4app and test_db 2011-09-01 15:58:47 +02:00
Côme BERNIGAUD 40d9439d4e Merge branch 'master' of git.kde.org:owncloud 2011-09-01 15:21:27 +02:00
Jan-Christoph Borchardt 7fa1f8161c do not user directories when navigating to /data. Needs more security. 2011-08-31 11:41:09 +02:00
Jan-Christoph Borchardt e4f70d5bbb files not viewable from the outside by adresses anymore 2011-08-31 11:28:18 +02:00
Jan-Christoph Borchardt efa3085073 fixed picture preview broken for some, thanks to Felix on Shapado 2011-08-29 17:09:22 +02:00
Côme BERNIGAUD b92603b3fd Translation for date column 2011-08-28 23:11:45 +02:00
Robin Appelman 5c9178f851 Fixed a bug in appconfig, where an initially empty set value led to endless duplicates of this app/key pair.
Path by Elias Probst <mail@eliasprobst.eu>
2011-08-28 19:36:23 +02:00
Michael Gapczynski 74c7890fbb Fix undefined index license in Apps 2011-08-27 17:56:22 -04:00
Côme BERNIGAUD 52ca447efc Merge branch 'master' of git.kde.org:owncloud 2011-08-27 18:11:32 +02:00
Côme BERNIGAUD e8fa2d3442 Added db4app lib, and apps test_db that shows how it works.
Also fixed a typo in db.php
2011-08-27 18:09:14 +02:00
Jan-Christoph Borchardt 11c2aff8c9 fixed installer failing due to htaccess. Thanks to Elias Probst 2011-08-27 10:19:45 +02:00
Robin Appelman ee0954b236 fix issue with login being case insensitve 2011-08-25 21:51:13 +02:00
Robin Appelman 391e064e67 allow apps to register form for the settings and admin pages 2011-08-23 01:41:18 +02:00
Robin Appelman d851bdac90 fix .htaccess file crashing apache+php-cgi 2011-08-22 17:18:54 +02:00
Robin Appelman af3080402b fix installing shipped apps 2011-08-22 14:17:38 +02:00
Frank Karlitschek 109302a928 add some todos 2011-08-20 11:53:14 +02:00
Jan-Christoph Borchardt d9aae20003 more valid HTML, alt attributes, refactored pagenavi etc. 2011-08-20 05:07:58 +02:00
Jan-Christoph Borchardt 683e125042 Merge branch 'sharing' 2011-08-17 13:48:36 +02:00
Frank Karlitschek cb9fc6d901 make the help section working and pretty. knowledge base entries are fetched via OCS from a different server. cool stuff 2011-08-17 00:24:50 +02:00
Michael Gapczynski e4c9871299 This should actually make the 'Shared' directory automatically everytime 2011-08-15 20:45:07 -04:00
Michael Gapczynski 5fbed936bf Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' directory 2011-08-15 20:33:02 -04:00
Michael Gapczynski 1ec75330ec Merge branch 'master' into sharing 2011-08-15 17:49:36 -04:00
Robin Appelman 13cbd7f578 some filesystem fixes 2011-08-15 22:55:14 +02:00
Robin Appelman 6173c0fbc2 a bit of refactoring for oc_filesystem and implement user quota 2011-08-15 21:09:13 +02:00
Jan-Christoph Borchardt 2cb231d0a4 resolved merge conflict 2011-08-14 19:31:38 +02:00
Jan-Christoph Borchardt 9648be97fb better error messages for installation, still need to be inline 2011-08-13 05:37:12 +02:00
Jan-Christoph Borchardt 4a5ee765cf merged admin, help and settings to settings 2011-08-13 05:13:34 +02:00
Michael Gapczynski 122018889a Merge branch 'master' into sharing
Conflicts:
	files/css/files.css
2011-08-12 21:00:41 -04:00
Michael Gapczynski 67156f87e3 Add missing parameter to usersInGroup() 2011-08-12 20:53:36 -04:00
Michael Gapczynski ffe9da91af Add missing parameter to usersInGroup() 2011-08-12 20:51:01 -04:00
Frank Karlitschek c2a5b49834 better error reporting during installation 2011-08-12 19:22:29 +02:00
Jan-Christoph Borchardt 0b4ed25776 fixed downloading of files with spaces in name for Firefox 2011-08-12 12:03:59 +02:00
Jan-Christoph Borchardt 6c4d075bd6 added jquery-tipsy for nice title tooltips 2011-08-12 11:26:13 +02:00
Michael Gapczynski 4830555cce Merge branch 'master' into sharing
Conflicts:
	.gitignore
2011-08-11 17:42:37 -04:00
Jan-Christoph Borchardt 99790d6805 lots of image changes, use svg EVERYWHERE POSSIBLE 2011-08-11 19:00:32 +02:00
Frank Karlitschek aa582ec43a more work on encryption 2011-08-11 17:49:36 +02:00
Frank Karlitschek d75faac09e Merge branch 'master' of git.kde.org:owncloud 2011-08-11 16:33:53 +02:00
Frank Karlitschek 5b9f6b4001 hide the files admin page as long as we don have settings on the page 2011-08-11 16:24:53 +02:00
Robin Appelman 50c1553c38 automaticaly login after setup 2011-08-11 16:22:25 +02:00
Robin Appelman bc5bf18eed bit of work on app management 2011-08-11 15:11:06 +02:00
Jan-Christoph Borchardt b4e89871dd merged master into sharing 2011-08-11 13:29:22 +02:00
Robin Appelman bfd72501a1 add OC_Group::usersInGroup() to get a list of all users in a group 2011-08-11 10:12:17 +02:00
Jan-Christoph Borchardt 05f3910718 moved search box directly to template 2011-08-10 22:56:55 +02:00
Robin Appelman f03874ac49 work on user management 2011-08-10 22:38:28 +02:00
Michael Gapczynski e1bde1a78e Merge branch 'master' into sharing
Conflicts:
	files/templates/index.php
2011-08-10 13:40:47 -04:00
Frank Karlitschek 613ab41eb3 more work on the encryption library 2011-08-10 17:24:38 +02:00
Robin Appelman 1f1498ceca remove Log completely 2011-08-10 14:03:54 +02:00
Robin Appelman cdf91b6b3e work in new app management 2011-08-10 14:03:54 +02:00
Robin Appelman 9059b55979 make more strings translatable 2011-08-10 14:03:54 +02:00
Jakob Sack c958a44e46 Copying globals to OC::* 2011-08-10 11:18:35 +02:00
Jakob Sack 7b653dbca6 use sprintf for translations 2011-08-10 11:08:30 +02:00
Michael Gapczynski ec6aed8475 Merge branch 'master' into sharing 2011-08-09 10:42:50 -04:00
Serge Martin 97462b018d Merge MySQL and PostgreSQL input fields 2011-08-09 11:32:22 +02:00
Robin Appelman 7b38e5d7c7 apps can now add their own forms to the Personal page 2011-08-08 23:46:52 +02:00
Jakob Sack 962907ee6f Merge branch 'master' of git://anongit.kde.org/owncloud
Conflicts:
	lib/template.php
2011-08-08 23:16:30 +02:00
Jakob Sack 4b967a9414 Minor improvements 2011-08-08 23:14:47 +02:00
Robin Appelman d1d47eb5eb do proper styling for settings pages 2011-08-08 22:38:42 +02:00
Robin Appelman e6f6d3dabc dont use a different navigation page for settings stuff 2011-08-08 21:43:31 +02:00
Bartek Przybylski 8bd82b96f3 checking for apache server in setup 2011-08-08 21:41:20 +02:00
Michael Gapczynski 1aa89b7cbb Merge branch 'master' into sharing
Conflicts:
	files/css/files.css
	lib/base.php
2011-08-07 15:56:26 -04:00
Serge Martin 3e8ae8636c Add postgresql support
REVIEW: 102101
2011-08-07 21:06:53 +02:00
Serge Martin acf7916e71 user is a reserved word in postgresql 2011-08-07 19:02:41 +02:00
Frank Karlitschek a0b7b85c56 remove debug 2011-08-07 18:00:35 +02:00
Frank Karlitschek 58c2d29f8c report the right webserver user to simplify setup and debug 2011-08-07 17:58:56 +02:00
Frank Karlitschek b2702c4406 fix include path 2011-08-07 17:39:38 +02:00
Frank Karlitschek 51caa624bb first step to file encription 2011-08-07 17:32:48 +02:00