Commit Graph

2379 Commits

Author SHA1 Message Date
Michael Gapczynski f328f53ec1 Fix filesystem hash, no longer using basicOperation()
Conflicts:
	lib/filesystemview.php
2012-07-30 10:07:19 -04:00
Thomas Tanghus 01f25119d5 Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 2012-07-30 12:28:40 +02:00
Thomas Tanghus f91783e9ab Fix errors when no addressbook. 2012-07-30 12:28:10 +02:00
Georg Ehrke d8aca0c78e apply fix suggested in oc-1132 - bugfix for oc-1132 2012-07-26 18:40:12 +02:00
Georg Ehrke 8cff0d997f convert through caldav transmitted rgba calendarcolor to rgb 2012-07-26 14:48:00 +02:00
Lukas Reschke 95936024bc Updated packages 2012-07-26 01:12:58 +02:00
Arthur Schiwon 3c9919e475 LDAP: check if php-ldap is installed. If not, give an error output. FIX: blank Users page when the module is not installed. 2012-07-25 18:21:16 +02:00
Georg Ehrke 9b0870bb91 add some calendar sharing hooks in stable4 - bugfix for oc-1325 2012-07-25 17:02:24 +02:00
Bjoern Schiessle 73734c98e0 - remove namespace from file property name (webdav)
- update script to fix broken properties in the database
2012-07-23 11:00:37 +02:00
Lukas Reschke 38271ded75 Added CSRF checks 2012-07-20 20:12:36 +02:00
Arthur Schiwon 0bd7d14b7a Sharing: offer an option to allow sharing with everyone, i.e. do not check group memberships 2012-07-17 14:09:01 +02:00
Thomas Tanghus 9326f4f535 Added hooks for postCreateUser to add default address book and calendar. Fixes oc-1265. 2012-07-17 10:45:15 +02:00
Thomas Tanghus f4a8c233cf Added hook for postCreateUser. Probably fix for oc-1265.
Conflicts:

	apps/calendar/appinfo/app.php
2012-07-17 10:35:46 +02:00
Thomas Tanghus eb2a15d58f Format birthday as BDAY;VALUE=DATE:YYYY-MM-DD. Fixes oc-1276. 2012-07-16 23:36:11 +02:00
Thomas Tanghus 47d50fc424 Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 2012-07-16 21:22:07 +02:00
Thomas Tanghus d64300251b Corrected javascript definition. 2012-07-16 21:21:37 +02:00
Georg Ehrke d4e2cb6e62 fix encoding fail in calendar app - bugfix for oc-1194 2012-07-16 19:53:19 +02:00
Thomas Tanghus 225726c8d9 latin1 => utf8. I thought I did this a month ago? 2012-07-16 01:41:45 +02:00
Bjoern Schiessle 50eef9a71c update script to fix fscache 2012-07-13 15:17:36 +02:00
Michael Gapczynski 7b2ec41477 Revert santizing toaddress, because PHPMailer now throws exceptions
Conflicts:
	apps/files_sharing/ajax/email.php
2012-07-11 19:38:57 -04:00
Michael Gapczynski ebcf5bce3c Sanitize toaddress for emailing private links
Conflicts:
	apps/files_sharing/ajax/email.php
2012-07-11 19:38:56 -04:00
Lukas Reschke d203fa2c50 Sanitizing file names 2012-07-11 19:15:11 +02:00
Robin Appelman 7f57591ef1 suppress error when using is_dir on non directory in smb backend 2012-07-10 14:20:30 +02:00
Robin Appelman aeed130b3a improve caching smb results a bit 2012-07-10 14:20:19 +02:00
Robin Appelman 8a902d8f65 improve filecache support for smb 2012-07-10 14:20:11 +02:00
Robin Appelman a1fefea66f split share and root config for smb backend, also sanitize config a bit more 2012-07-10 14:19:51 +02:00
Robin Appelman 8fcce55e76 share code between smb and ftp filestorage backends 2012-07-10 14:19:40 +02:00
Robin Appelman 539e4a1813 smb filestorage backend 2012-07-10 14:19:31 +02:00
Thomas Tanghus 197086a952 Make it possible to import files using CR as eol. 2012-07-08 18:34:00 +02:00
Thomas Tanghus 747b7fbbfe Set the loading class on the property being changed, not on its container. Now on all the places relevant ;-) 2012-07-08 16:17:10 +02:00
Thomas Tanghus d730d3edd4 Set the loading class on the property being changed, not on its container. 2012-07-08 16:10:12 +02:00
Thomas Tanghus 25b95a9ec7 Improve checking for active addressbooks and creating default addressbook. 2012-07-08 15:41:38 +02:00
Thomas Tanghus 554cb2d3ab Add missing requesttoken. 2012-07-08 14:48:49 +02:00
Thomas Tanghus 47f96e2d5e Missing semi-colon. 2012-07-08 14:42:33 +02:00
Thomas Tanghus 746eef0d5c Format error response correctly. 2012-07-08 14:31:40 +02:00
Thomas Tanghus b11b6afbb9 Hopefully fix for drag'n'drop import in oc-813. 2012-07-05 00:25:38 +02:00
Thomas Tanghus 5fb9b3e965 Disable expires header on thumbnail and photo. 2012-07-04 15:32:41 +02:00
Thomas Tanghus f72a11f852 Moved action buttons down to the add field menu. Fixes oc-1155. 2012-07-04 13:49:39 +02:00
Michael Gapczynski bf93dd4661 Don't reload the page after sending private link to email address 2012-07-01 11:53:29 -04:00
Michael Gapczynski 895d5707ee Don't overwrite fake directory stream for Shared storage 2012-06-27 12:09:11 -04:00
Bjoern Schiessle c0e86489c9 no reason to strip tags at this point 2012-06-27 17:56:00 +02:00
Bjoern Schiessle 7af76e36e1 enable highlighting of address in OSM. 2012-06-27 11:41:52 +02:00
Georg Ehrke ae00f40b97 add OC_Calendar_Object::createUID() 2012-06-26 15:21:41 +02:00
Arthur Schiwon a72eddeef7 LDAP: compare base trees case insensitively 2012-06-25 20:54:21 +02:00
Thomas Tanghus 2ad93849ab Idiot proof dialog ;-) 2012-06-25 19:33:51 +02:00
Thomas Tanghus ad5aa5ac15 Try to conserve some memory. Should fix oc-1106 for stable4. 2012-06-25 17:16:34 +02:00
Thomas Tanghus 42a5cd21b9 Missing requesttoken. 2012-06-25 17:15:33 +02:00
Thomas Tanghus ddf321d534 Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 2012-06-25 16:22:19 +02:00
Thomas Tanghus 56ed8ba70b Select which address book to add a contact to. Fixes oc-1071. 2012-06-25 16:21:29 +02:00
Arthur Schiwon 594e19bddc LDAP: always sanitize DN and DN-containing attributes 2012-06-25 13:22:49 +02:00