wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2296 commits 157 branches 562 tags 714 MiB
Commit graph

2296 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Tanghus
c62c55fb81 Added save() to OC_Image. 2012-01-02 12:09:45 +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
Thomas Tanghus
1b146b85d2 Removed redundant DB queries. 2011-12-31 01:34:22 +01: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
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
Thomas Tanghus
a70fbcea28 More missing js. 2011-12-28 10:31:45 +01:00
Thomas Tanghus
5a99310cdf Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails 
Fixed some conflicts.
Conflicts:
	apps/contacts/css/styles.css
	apps/contacts/templates/index.php
 2011-12-28 10:14:59 +01:00
Bart Visscher
16e4e6dcc3 Contacts: small merge cleanups 2011-12-27 22:44:52 +01:00
Bart Visscher
3e2e5196d2 Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud 
Conflicts:
	apps/calendar/export.php
	apps/contacts/index.php
 2011-12-27 22:18:01 +01:00
Bart Visscher
5fd595c0bf Calendar: add loading indicator 2011-12-27 21:50:31 +01:00
Michael Gapczynski
1cddfe8820 Keep the urls pretty, decode forward slashes 2011-12-27 12:43:58 -05:00
Michael Gapczynski
95b9f4ed23 Fix folder names with + characters in it 2011-12-27 12:35:29 -05:00
Robin Appelman
5bff1c8ad1 some coding style fixes for the pdf viewer 2011-12-27 14:19:07 +01:00
Robin Appelman
f009ede753 some styling changes for the pdf viewer 2011-12-27 14:09:22 +01:00
Robin Appelman
1efb4a0c61 remove debug messages in console 2011-12-27 13:41:22 +01:00
Bartek Przybylski
f7674d06d3 pdf viewer from Google Code-In program 2011-12-27 12:36:51 +01:00
Bartek Przybylski
524aaf0e5e Merge branch 'gallery' 2011-12-27 12:34:32 +01:00
Thomas Tanghus
16c8f62658 Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails 2011-12-26 13:27:53 +01:00
Robin Appelman
1fe55b6656 fix upload error reporting 2011-12-23 19:49:02 +01:00
Michael Gapczynski
9bb004963b Fix whitespace folder name 2011-12-23 12:28:44 -05:00
Bartek Przybylski
1383cb51e7 removing and renaming albums 2011-12-21 21:55:52 +01:00
Bartek Przybylski
6a1a7fcd26 merged with stash 2011-12-21 18:40:43 +01:00
Bartek Przybylski
25fa9bf8ec merged with stash 2011-12-21 18:37:17 +01:00