Commit Graph

761 Commits

Author SHA1 Message Date
Robin Appelman 05d76dcd67 allow the usage of the filecache outside of the users home folder 2012-02-02 19:04:13 +01:00
Robin Appelman a69d3c3346 only show what folder we are scanning to save bandwith 2012-02-01 15:25:00 +01:00
Robin Appelman 371b4642bb proper file sorting 2012-01-31 16:33:47 +01:00
Robin Appelman f1c5dce75c dont try to use something that isn't there 2012-01-31 16:33:36 +01:00
Robin Appelman c46f701771 use filesystem cache for searching 2012-01-31 16:12:49 +01:00
Robin Appelman 7ff86cfebe provide live feedback while scanning files 2012-01-31 13:56:58 +01:00
Robin Appelman 803f86e0fc dont try to use the filesystem when it isnt setup yet 2012-01-31 12:44:01 +01:00
Robin Appelman ffecc3e434 start of proper feedback during filessytem scan 2012-01-30 23:32:55 +01:00
Robin Appelman 1191b57b34 Merge branch 'master' into filesystem 2012-01-30 23:20:47 +01:00
Robin Appelman 6a1121ab2e provide server side close option for EventStream 2012-01-30 23:19:58 +01:00
Robin Appelman 4522d19b4c merge master into filesystem 2012-01-30 20:29:33 +01:00
Robin Appelman 45038af948 provide small wrapper around server side events and provide a fallback for IE 2012-01-30 20:21:16 +01:00
Frank Karlitschek 21bf8e99ee increase version number to 3. YeeHaw party!! 2012-01-27 17:39:55 +01:00
Frank Karlitschek 05f1fffddc fix appstore download. 2012-01-27 17:34:47 +01:00
Robin Appelman 500407dbe9 change https detection a bit, hopefully fixing an edge case 2012-01-27 00:37:11 +01:00
Robin Appelman 2f4a289782 fix non-absolute symbolic links 2012-01-27 00:21:15 +01:00
Robin Appelman 935b828427 initialize all storage backends when searching for a file, fixed searching in the Shared folder 2012-01-26 17:56:13 +01:00
Frank Karlitschek 5238a7812c bump version number 2012-01-21 17:33:43 +01:00
Robin Appelman 6866165a37 make oc_image work when php_exif isn't enabled 2012-01-20 17:13:49 +01:00
Robin Appelman 3552626358 Merge branch 'master' into filesystem 2012-01-20 00:48:03 +01:00
Robin Appelman 11c848b221 initial work on filesystemview 2012-01-20 00:48:00 +01:00
Robin Appelman 941f199caf dont complain about non existing config files 2012-01-16 20:17:45 +01:00
Robin Appelman d7ed456f96 forgot to merge something 2012-01-16 14:36:11 +01:00
Robin Appelman 96e2f15d8a merge master into filesystem 2012-01-16 03:06:11 +01:00
Robin Appelman ebe10870cf fix database upgrading for pgsql 2012-01-16 02:06:19 +01:00
Robin Appelman 907dd4d24d some aditional feedback during database upgrade 2012-01-16 01:15:43 +01:00
Robin Appelman ac188ec74b properly check for write permissions to the config file 2012-01-15 23:58:00 +01:00
Georg Ehrke 9c04858631 added vcards to the mimetype fix list and renamed the icon for vcards 2012-01-15 11:02:08 +01:00
Georg Ehrke 0c76884f98 add icon for log app 2012-01-14 23:39:05 +01:00
Bartek Przybylski ef69abd4dc constans for signals handling 2012-01-14 23:13:01 +01:00
Robin Appelman 36a2649e37 use admin icon for log menu enty untill we have a proper icon 2012-01-14 22:02:26 +01:00
Robin Appelman f4ce399162 fix issue with moving music files 2012-01-14 21:13:46 +01:00
Robin Appelman 7d53b6f106 remove temporary files after updating 2012-01-13 20:05:44 +01:00
Robin Appelman 6e0ea7aaae use absolute path for db_structure.xml when updating 2012-01-13 20:05:24 +01:00
Daniel Köb 37dbf48434 Connect to the newly created database when checking if it needs to be filled. 2012-01-13 04:38:59 +01:00
Thomas Tanghus 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
Georg Ehrke 0fb73ec49d fix previous change 2012-01-12 21:54:58 +01:00
Georg Ehrke a1429085ee Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-12 21:43:32 +01:00
Georg Ehrke a0ff21a232 added a file to fix wrong recognised mime-types 2012-01-12 18:26:13 +01:00
Tom Needham fd4b63810d default table prefix to oc_ if not set 2012-01-10 14:41:08 +00:00
Thomas Tanghus 5f04b41ea6 Just a comment ;-) 2012-01-09 20:40:24 +01:00
Tom Needham 5e40653713 Missing line return 2012-01-08 21:18:21 +00:00
Robin Appelman fbb126cdd9 save updated version number of apps after updating 2012-01-08 19:58:20 +01:00
Tom Needham de3032fd00 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-08 17:02:07 +00:00
Robin Appelman ccc43f0ea0 merge master into filesystem 2012-01-08 18:01:33 +01:00
Robin Appelman 37f5a8cdb4 improve pgsql database detection 2012-01-08 17:49:53 +01:00
Tom Needham e5d3666280 Merge branch 'master' of gitorious.org:owncloud/owncloud into jqueryui 2012-01-08 16:45:28 +00:00
Robin Appelman 49337e0ad1 dont create a new user when it already exists 2012-01-08 14:25:38 +01:00
Robin Appelman ae711168c3 improve detection for mysql databases 2012-01-08 14:07:12 +01:00
Robin Appelman a4e14b49b1 load reverse driver when updating database 2012-01-08 13:16:11 +01:00
Robin Appelman 76b193c698 don't try to upgrade what isn't installed 2012-01-08 13:01:59 +01:00
Robin Appelman 034cf19159 allow changing database backends between PDO and MDB2 2012-01-08 02:57:52 +01:00
Michael Gapczynski 010bfa11e3 Fix updateApp() and add extra check to updateApps() 2012-01-08 02:12:52 +01:00
Robin Appelman fea68e08b4 update apps when their version number increases 2012-01-08 01:57:53 +01:00
Robin Appelman 001d06f2ff fix errors during database migration 2012-01-08 01:57:53 +01:00
Robin Appelman c6aa0f9854 set the installed version after updating the database 2012-01-08 01:57:53 +01:00
Robin Appelman 09a53170a3 fixes in the sqlite manager driver 2012-01-08 01:57:53 +01:00
Robin Appelman ecf6f2ca2f automatically upgrade the main database on version number increase (doesnt work with sqlite for now) 2012-01-08 01:57:53 +01:00
Robin Appelman 9a4e37483b small fix in sqlite3 driver 2012-01-08 01:57:53 +01:00
Robin Appelman 91a9688d07 minor changes to mysql setup 2012-01-08 01:57:53 +01:00
Robin Appelman 6c09d9e0f8 some fixes in the sqlite3 driver 2012-01-08 01:57:53 +01:00
Robin Appelman 799a7db638 Merge branch 'filesystem' of gitorious.org:owncloud/owncloud into filesystem 2012-01-08 01:57:14 +01:00
Robin Appelman d1edc360d9 merge master into filesystem 2012-01-08 01:53:40 +01:00
Robin Appelman 8f8985c3e5 Merge branch 'database' 2012-01-08 01:45:18 +01:00
Frank Karlitschek 0d81014fa6 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-06 19:15:29 +01:00
Frank Karlitschek 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
Tom Needham 47a275f389 Use parameter 2012-01-06 18:04:24 +00:00
Frank Karlitschek 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
Thomas Tanghus 2f86a6203a Added fixOrientation method which rotates the image based on EXIF data. 2012-01-05 17:42:40 +01:00
Thomas Tanghus d80b477ab5 Wrong permission checking on file save. 2012-01-04 23:31:32 +01:00
Thomas Tanghus 48a8f2a793 Content type header was sent when saving image to disk. 2012-01-04 22:57:42 +01:00
Michael Gapczynski b6d66c4727 Remove the keys in preferences when a user is deleted - Thanks rogerc 2012-01-04 15:19:16 -05:00
Tom Needham 6dcabdc61c Fixed merge conflict in /files/ajax/move.php 2012-01-04 16:31:06 +00:00
prcrst 868a3b5364 Fix sqlite detection for Ubuntu 11.10 2012-01-03 15:58:48 +01:00
Robin Appelman 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
Robin Appelman 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
Thomas Tanghus 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
Thomas Tanghus 2a184631d1 Merge git://gitorious.org/owncloud/owncloud into oc_image 2012-01-02 19:38:10 +01:00
Robin Appelman cc55f00481 fix is_readable and is_writable 2012-01-02 16:38:10 +01:00
Thomas Tanghus 6a7fbf9d13 Added more error checking and debug on missing image support. 2012-01-02 13:40:23 +01:00
Thomas Tanghus c62c55fb81 Added save() to OC_Image. 2012-01-02 12:09:45 +01:00
Georg Ehrke 534b6f3a09 Fix whitespace username 2012-01-02 11:49:53 +01:00
Thomas Tanghus 29048bf4bd Merge git://gitorious.org/owncloud/owncloud into oc_image 2012-01-02 11:47:02 +01:00
Michael Gapczynski 4374d55e5e Correct local permissions checks 2012-01-01 19:59:24 -05:00
Thomas Tanghus fb4c3bd9ce Merge git://gitorious.org/owncloud/owncloud into oc_image 2012-01-02 01:09:22 +01:00
Thomas Tanghus a8789ebe29 Removed static declaration from loadFrom* methods. 2012-01-02 00:43:27 +01:00
Michael Gapczynski a9bab168f5 Replace canRead()/canWrite() with is_readable()/is_writeable() for proper permission checks 2012-01-01 18:41:00 -05:00
Thomas Tanghus db6738478b Mixed up two lines :-P 2012-01-01 23:34:26 +01:00
Thomas Tanghus 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
Michael Gapczynski a22b5feda6 Initial commit of common filestorage 2012-01-01 17:05:22 -05:00
Michael Gapczynski 7250dc4e98 Fix updateApp() and add extra check to updateApps() 2012-01-01 16:58:51 -05:00
Michael Gapczynski 782d201191 Move to branch 2012-01-01 16:25:43 -05:00
Michael Gapczynski 19328fd8b2 Initial commit of common filestorage 2012-01-01 15:56:33 -05:00
Thomas Tanghus 929ce2b566 Small fixes 2012-01-01 20:06:35 +01:00
Thomas Tanghus c500c1e930 Removed some denug statements and an exception thrown. 2012-01-01 18:07:46 +01:00
Thomas Tanghus 6207c0444b Added class OC_Image 2012-01-01 17:57:26 +01:00
Tom Needham cbb2db8622 Fix merge conflicts 2012-01-01 01:18:02 +00:00
Tom Needham 39e67707d7 Updated jquery ui js and css. Improved color scheme. 2011-12-30 22:47:39 +00:00
Daniel Köb 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
Robin Appelman 3844fb0e4c also use fscache when getting used space for webdav 2011-12-14 01:19:23 +01:00
Robin Appelman 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
Robin Appelman c67c933d3f Merge branch 'database' into filesystem 2011-12-11 23:57:53 +01:00
Robin Appelman 9fdd1bafdc Merge branch 'master' into filesystem 2011-12-11 23:42:22 +01:00
Robin Appelman 5e711f37ca make filesize parsing case insensitive 2011-12-11 23:34:27 +01:00
Robin Appelman efecb694ef make filesize parsing case insensitive 2011-12-11 23:33:24 +01:00
Robin Appelman a8148fa94a update apps when their version number increases 2011-12-11 22:08:01 +01:00
Robin Appelman 7f1bb5fd78 Merge branch 'master' into database 2011-12-11 22:00:17 +01:00
Bart Visscher 1746cba249 Some small changes 2011-12-09 22:36:39 +01:00
Bart Visscher a3cb04013e Update OC_VObject 2011-12-09 21:56:03 +01:00
Bart Visscher eeaf539a44 Gallery: splitout model code 2011-12-08 20:05:12 +01:00
Bart Visscher 0342b5fc43 Fix filename of log icon 2011-12-07 20:41:00 +01:00
Bart Visscher c67ac46b6c Use a proxy class to interface with Sabre_VObject classes 2011-12-07 20:40:58 +01:00
Robin Appelman 153029a170 increase version to trigger database upgrade 2011-11-26 01:26:01 +01:00
Robin Appelman a8e4d2946a Merge branch 'database' into filesystem 2011-11-26 01:25:08 +01:00
Bart Visscher 43911d9a6f Template: output better html for select options 2011-11-24 21:36:34 +01:00
Frank Karlitschek fab70cb590 removed no longer used function and exec command
security++
2011-11-24 13:50:29 +01:00
Hendrik Langer 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
Georg Ehrke 6c4692380f Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar 2011-11-20 11:41:58 +01:00
Frank Karlitschek 7df9d934ca second half of the updating stuff 2011-11-19 12:02:34 +01:00
Frank Karlitschek 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
Robin Appelman 98dc0882cb fix errors during database migration 2011-11-15 16:08:08 +01:00
Robin Appelman 916c72b40b set the installed version after updating the database 2011-11-15 15:59:01 +01:00
Robin Appelman 9686c5b6aa fixes in the sqlite manager driver 2011-11-15 15:58:12 +01:00
Robin Appelman b2f1429b75 automatically upgrade the main database on version number increase (doesnt work with sqlite for now) 2011-11-13 16:16:21 +01:00
Robin Appelman aa7c5a971c small fix in sqlite3 driver 2011-11-13 16:08:47 +01:00
Robin Appelman 486a31bfa3 minor changes to mysql setup 2011-11-13 16:06:29 +01:00
Robin Appelman bf40691ace some fixes in the sqlite3 driver 2011-11-12 18:06:07 +01:00
Georg Ehrke e5a3ab8aad Merge branch 'master' into fullcalendar 2011-11-12 15:09:37 +01:00
Robin Appelman 024f4375b6 keep encrypted and versioned flag in fscache 2011-11-12 01:00:04 +01:00
Robin Appelman b2f2a87745 use cache for searching files 2011-11-10 23:50:43 +01:00
Robin Appelman 7543ffa3b1 always load the filecache 2011-11-10 16:53:08 +01:00
Robin Appelman 524e3686a0 tell the user when the files are being scanned 2011-11-10 16:40:09 +01:00
Bart Visscher ef124c3e21 Use a function to generate select options 2011-11-09 22:19:52 +01:00
Robin Appelman 5a6aba1e11 provide caching for file metadata 2011-11-09 18:41:57 +01:00
Jakob Sack b3a73c78e8 Fix comments/documentation 2011-11-09 11:35:50 +01:00
Robin Appelman 5cc6635eb8 remove OC_Filesystem::fromUploadedFile 2011-11-08 22:36:05 +01:00
Robin Appelman ca6c500799 remove OC_Filesystem::fileatime 2011-11-08 22:26:03 +01:00
Robin Appelman ec015a2e68 remove the need to register storage providers, pass the classname during mounting instead 2011-11-08 22:21:25 +01:00
Robin Appelman 878fc1d197 remove outdated remote storage prototype 2011-11-08 22:18:41 +01:00
Florian Vichot 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
Brice Maron 3940ca3df1 Display correctly the error message when nothing is retrieved from OCS servers 2011-11-06 16:48:26 +01:00
Brice Maron 7de591f5cc Avoid Huge error message when unable to read log file 2011-11-06 14:37:22 +01:00
Robin Appelman 7b3ae2edd4 use database table prefix from installer, not the old configured value 2011-11-03 13:09:51 +01:00
Brice Maron 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
Brice Maron e533e82bc9 Add sequence name in insertid to be more portable 2011-10-29 11:40:48 +02:00
Bart Visscher 7b01858c57 Enable php display_errors setting 2011-10-27 22:48:50 +02:00
Bart Visscher 9832a0817d Merge branch 'master' into fullcalendar
Conflicts:
	apps/calendar/index.php
2011-10-24 22:40:22 +02:00
Robin Appelman f073041b0b provide function for updating the database scheme 2011-10-23 15:25:38 +02:00
Robin Appelman 6592fbb948 improve detection of database backend 2011-10-23 12:32:33 +02:00
Robin Appelman 122fa190c6 improve mimetype detection 2011-10-23 11:35:29 +02:00
Robin Appelman 38bb503ff6 fix fopen 2011-10-23 11:35:29 +02:00
Frank Karlitschek 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
Georg Ehrke 0011c42669 Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar 2011-10-22 13:12:13 +02:00
Robin Appelman 7761765a4b change licencing headers for sqlite3 driver 2011-10-22 12:31:07 +02:00
Robin Appelman af1f0305eb fix log level check 2011-10-22 12:22:57 +02:00
Bart Visscher 4fe48a50f0 Translation of calendar interface 2011-10-20 23:49:27 +02:00
Robin Appelman 3a937f79f7 escape filenames for getMimeType 2011-10-20 22:55:27 +02:00
Robin Appelman 8f77179d29 Merge commit 'refs/merge-requests/64' of git://gitorious.org/owncloud/owncloud 2011-10-20 01:24:23 +02:00
Robin Appelman 273972b75a prevent sql error while initializing apps on sqlite2 2011-10-20 01:17:02 +02:00
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