Tom Needham
|
6dcabdc61c
|
Fixed merge conflict in /files/ajax/move.php
|
2012-01-04 16:31:06 +00:00 |
|
Frank Karlitschek
|
e0a058c732
|
remove error output if symlink already exists. this can happen if a user removed config.php to trigger the setup wizzard
|
2012-01-03 17:23:50 +01: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 |
|
Tom Needham
|
ebe3ae58cf
|
removed data-read and fixed droppable logic
|
2012-01-02 18:08:20 +00:00 |
|
Tom Needham
|
0730077840
|
Used data-read and data-wite when binding drag and drop events
|
2012-01-02 17:07:10 +00:00 |
|
Tom Needham
|
39a7bd9c00
|
Added data-read and data-write attributes to file list
|
2012-01-02 17:02:30 +00:00 |
|
Robin Appelman
|
cc55f00481
|
fix is_readable and is_writable
|
2012-01-02 16:38:10 +01:00 |
|
Georg Ehrke
|
a1af757ef6
|
Fix whitespace username in the installation form
|
2012-01-02 14:21:46 +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 |
|
Michael Gapczynski
|
470bab9c68
|
Fix typo in move error message
|
2012-01-01 18:45:26 -05: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 |
|
Robin Appelman
|
1415cb8d19
|
add infieldlabel source
|
2012-01-01 23:48:38 +01:00 |
|
Robin Appelman
|
536bc3d3c5
|
add jplayer source
|
2012-01-01 23:48:38 +01:00 |
|
Thomas Tanghus
|
db6738478b
|
Mixed up two lines :-P
|
2012-01-01 23:34:26 +01:00 |
|
Thomas Tanghus
|
51dfb0a3e0
|
Merge git://gitorious.org/owncloud/owncloud into oc_image
|
2012-01-01 23:28:51 +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
|
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
|
853d1730c7
|
Merge git://gitorious.org/owncloud/owncloud into oc_image
|
2012-01-01 20:07:01 +01:00 |
|
Thomas Tanghus
|
929ce2b566
|
Small fixes
|
2012-01-01 20:06:35 +01:00 |
|
Michael Gapczynski
|
64a24191a3
|
Fix return for empty Shared folder in opendir()
|
2012-01-01 14:04:16 -05: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 |
|
Thomas Tanghus
|
5d8314cfb8
|
Merge git://gitorious.org/owncloud/owncloud into oc_image
|
2012-01-01 17:48:28 +01:00 |
|
Tom Needham
|
cbb2db8622
|
Fix merge conflicts
|
2012-01-01 01:18:02 +00:00 |
|
Tom Needham
|
e7de254342
|
Fix missing ;
|
2012-01-01 01:14:00 +00:00 |
|
Tom Needham
|
06d2a87ee4
|
Fix js error
|
2012-01-01 00:52:53 +00:00 |
|
Tom Needham
|
2c4ab355ac
|
Shared folder no longer draggable or droppable
|
2012-01-01 00:47:24 +00:00 |
|
Thomas Tanghus
|
1b146b85d2
|
Removed redundant DB queries.
|
2011-12-31 01:34:22 +01:00 |
|
Tom Needham
|
5a5b216ba0
|
Fixed error message
|
2011-12-30 23:20:44 +00:00 |
|
Tom Needham
|
5ebf8a87f2
|
Removed old jquery-ui css and js
|
2011-12-30 23:08:44 +00:00 |
|
Tom Needham
|
39e67707d7
|
Updated jquery ui js and css. Improved color scheme.
|
2011-12-30 22:47:39 +00:00 |
|
Thomas Tanghus
|
97471b5c2a
|
Thumbnails was overwriting default style so hover and active didn't work. Moved them to the 'a' element instead.
|
2011-12-30 23:39:31 +01:00 |
|
Thomas Tanghus
|
830a34a10a
|
Merge git://gitorious.org/owncloud/owncloud into tanghus_contacts
|
2011-12-30 21:09:42 +01: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 |
|
Thomas Tanghus
|
4793d25c57
|
Added license and waiver of conditions for jquery.inview.
CSS fix on contact list.
Query contacts from multiple address books.
|
2011-12-30 21:07:16 +01:00 |
|
Bartek Przybylski
|
31663cfff5
|
contacts entry duplication fix
|
2011-12-30 17:47:14 +01:00 |
|
Bartek Przybylski
|
96dc279e8e
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2011-12-30 17:06:48 +01:00 |
|
Bartek Przybylski
|
2ea20862fc
|
gallery fixes
|
2011-12-30 17:06:29 +01:00 |
|
Bart Visscher
|
ed2ba4e8e4
|
Merge branch 'contact_thumbnails' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud
|
2011-12-29 00:21:34 +01:00 |
|