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
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
5e711f37ca
make filesize parsing case insensitive
2011-12-11 23:34:27 +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
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
e5a3ab8aad
Merge branch 'master' into fullcalendar
2011-11-12 15:09:37 +01:00
ef124c3e21
Use a function to generate select options
2011-11-09 22:19:52 +01:00
b3a73c78e8
Fix comments/documentation
2011-11-09 11:35:50 +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
Thomas Tanghus
Michael Gapczynski
Tom Needham
Daniel Köb
Robin Appelman
Bart Visscher
Frank Karlitschek
Hendrik Langer
Georg Ehrke
Frank Karlitschek
Jakob Sack
Florian Vichot
Brice Maron
Georg Ehrke
Joar Wandborg
Borjan Tchakaloff
Marvin Thomas Rabe
Thomas Schmidt