Commit graph

2501 commits

Author SHA1 Message Date
Georg Ehrke
5ccd26959f remove unused js 2012-01-02 11:39:23 +01:00
Georg Ehrke
e6739d230e add function to detect always the timezone 2012-01-02 11:35:50 +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
Tom Needham
65c37abef9 added ace source 2012-01-01 23:29:23 +00: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
Tom Needham
67854a94bf Removed old code 2012-01-01 21:27:38 +00: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
Tom Needham
5d9b7bf1dd Added ace license file 2012-01-01 20:05:30 +00:00
Tom Needham
ad9a81bf41 Added support for more file types 2012-01-01 20:04:46 +00:00
Tom Needham
4eb7487e61 Updated ace-editor software 2012-01-01 19:45:30 +00: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
Tom Needham
e04951f8fd Fixed keyboard shortcuts 2011-12-31 12:28:25 +00:00
Tom Needham
8efec8e900 Remove repeated code 2011-12-31 12:23:08 +00:00
Tom Needham
215cb1e6e0 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-31 12:21:40 +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
Georg Ehrke
3bb11db943 Merge branch 'master' into calendar 2011-12-29 19:16:33 +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
Michael Gapczynski
86b65c269a Keep the urls pretty, decode forward slashes for newly added directories 2011-12-28 13:01:36 -05:00
Michael Gapczynski
349923c5b8 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-12-28 12:48:08 -05:00
Michael Gapczynski
9b59bf40df Fix encoding again and update the link after renaming files 2011-12-28 12:47:27 -05:00
Tom Needham
8afb2e98fa Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-28 16:16:35 +00:00
Thomas Tanghus
a70fbcea28 More missing js. 2011-12-28 10:31:45 +01:00