Commit graph

2858 commits

Author SHA1 Message Date
Georg Ehrke
e227a65f66 Merge remote-tracking branch 'origin/calendar_sharing' into calendar_sharing 2012-02-21 19:36:42 +01:00
Georg Ehrke
70a369e16d change links in the event form for the new ajax folders 2012-02-21 19:16:14 +01:00
Georg Ehrke
0ae2e250f5 change pathes in calendar/templates/* files to make them work with the new folder structure in /calendar/ajax 2012-02-20 11:52:19 +01:00
Georg Ehrke
a069d83f44 fix unexspected T-String in calendars index.php 2012-02-20 11:46:10 +01:00
Georg Ehrke
ec7ed3c882 add rw and r to events.php 2012-02-20 11:35:19 +01:00
Georg Ehrke
619c62e681 change parameter names for shared calendars 2012-02-20 11:31:41 +01:00
Georg Ehrke
548a2e6263 add readonly calendar to the eventsources 2012-02-20 11:28:20 +01:00
Georg Ehrke
3efa69bc84 update js files for new ajax pathes 2012-02-20 11:27:25 +01:00
Georg Ehrke
1cf7fc261f better var name in changeview.php 2012-02-20 11:26:43 +01:00
Georg Ehrke
8dff0fb58d add moved files to clean up ajax folder 2012-02-20 11:26:22 +01:00
Georg Ehrke
ceb0016bdc remove old ajax files 2012-02-20 11:25:42 +01:00
Georg Ehrke
d8734cee02 fix sql command 2012-02-18 11:21:07 +01:00
Georg Ehrke
011bc1e764 fix unsharing of groups 2012-02-17 21:19:04 +01:00
Georg Ehrke
a3b8d54576 Merge branch 'master' into calendar_sharing 2012-02-17 14:14:53 +01:00
Thomas Tanghus
86893ea78c UI tweaks for name selector combobox. 2012-02-16 10:38:00 +01:00
Thomas Tanghus
0e2531ba57 Added method for loading from file handle. 2012-02-16 10:38:00 +01:00
Thomas Tanghus
fa7fabf024 Minor tweaks 2012-02-16 10:38:00 +01:00
Robin Appelman
20553c1afe Revert "remove the 3rdparty files. everything is now in https://gitorious.org/owncloud/3rdparty"
This reverts commit dccdeca258.
2012-02-16 09:44:49 +01:00
Robin Appelman
19827b8b35 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-02-16 09:42:30 +01:00
Frank Karlitschek
dccdeca258 remove the 3rdparty files. everything is now in https://gitorious.org/owncloud/3rdparty 2012-02-15 20:40:37 +01:00
Robin Appelman
c2fb5fed02 use cached size for getting the size of a moved file 2012-02-15 14:43:06 +01:00
Tom Needham
e6b835bea8 Update breadcrumb css on close 2012-02-14 21:55:51 +00:00
Tom Needham
aec6a3c32f Fix editing shared files and file opening bug. Fixes oc-209 and oc-195 2012-02-14 21:49:51 +00:00
Frank Karlitschek
127c0c7033 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-02-14 16:34:33 +01:00
Frank Karlitschek
d53ed4b40b make it possible to override every image and logo with a new version from within a theme. I think we have a very cool theming here. *self-praise* 2012-02-14 16:32:38 +01:00
Thomas Tanghus
31dab0372d Added some fixes for what to show when address books are (de)selected, all contacts deleted etc. Still need some cleaning up. 2012-02-14 13:57:11 +01:00
Thomas Tanghus
ae426ad115 Added some check for when addinf deleting contacts. 2012-02-14 10:36:22 +01:00
Klaas Freitag
064f87680b Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-02-14 10:01:20 +01:00
Klaas Freitag
60a03580ff allow to set a files mtime through a PROPPATCH request on resource
'lastmodified'. Needed for syncing algorithms.
2012-02-14 09:59:54 +01:00
Thomas Tanghus
f7161bb48b Added some error checking as mentioned in http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-227 2012-02-14 02:15:21 +01:00
Thomas Tanghus
dc20900e10 Modify check for missing UID. 2012-02-14 01:56:38 +01:00
Thomas Tanghus
53503148f3 Use proper index file. 2012-02-14 01:47:18 +01:00
Thomas Tanghus
4446854f75 Don't try to load a profile picture for contacts the doesn't have any. 2012-02-14 01:11:21 +01:00
Thomas Tanghus
07c422d81d Removed superfluous debug. 2012-02-14 01:02:01 +01:00
Thomas Tanghus
3adaacc0ce Added OC_Contacts_VCard::moveToAddressBook 2012-02-14 01:00:41 +01:00
Thomas Tanghus
024405e4f1 Added function for later testing. 2012-02-14 01:00:41 +01:00
Robin Appelman
3c52ac7af3 make local filestorage comply with test cases 2012-02-14 01:00:41 +01:00
Robin Appelman
bfa18fde19 dummy data for tests cases 2012-02-14 01:00:41 +01:00
Robin Appelman
7323b52560 some additional test cases for file storage backends 2012-02-14 01:00:41 +01:00
Bart Visscher
a37bd93222 External: Use OC_Util::checkLoggedIn 2012-02-14 00:13:04 +01:00
Bart Visscher
777804fac2 Gallery: remove unused cover.php 2012-02-14 00:12:22 +01:00
Bart Visscher
525306c1e2 Replace Expires and caching headers by OC_Response functions 2012-02-13 23:48:05 +01:00
Bart Visscher
29fc82c364 Send gallery album thumbnail with OC_Response::sendFile 2012-02-13 23:35:37 +01:00
Bart Visscher
594dcf13f2 Contacts+OC_Respone: Move enableCaching out of setEtagHeader and setLastModifiedHeader 2012-02-13 22:47:31 +01:00
Bart Visscher
0fd5252cfc OC_Image: Move Content-Type header to show function 2012-02-13 22:41:05 +01:00
Bart Visscher
169ddc5b0b Gallery: Only get local file when generating photo thumbnail 2012-02-13 22:39:30 +01:00
Bart Visscher
e137020f67 Gallery: Use OC_Respone::enableCaching for (album)thumbnails 2012-02-13 22:38:34 +01:00
Bart Visscher
363fdc40b8 OC_Response: Set Expire and Cache-Control headers in enableCaching 2012-02-13 22:37:27 +01:00
Bart Visscher
7208abf618 OC_Response: fix var name bugs 2012-02-13 22:35:48 +01:00
Bart Visscher
e084386770 Gallery: Move login check to beginning of galleryOp.php 2012-02-13 22:33:52 +01:00