Commit Graph

1302 Commits

Author SHA1 Message Date
Bart Visscher 86d2927c02 Calendar: Correct calendarcolor format for ical color property 2012-02-21 20:10:40 +01:00
Marvin Thomas Rabe 21f8d0992f Added missing files 2012-02-21 18:29:49 +01:00
VicDeo d5f7a39936 Contact list scroll fix 2012-02-20 23:54:23 +03:00
Thomas Tanghus ffdfe8257b Contacts: Fix adding/updating address book with empty name. 2012-02-20 15:24:54 +01:00
Thomas Tanghus 456ada01fa Contacts: Apply strip_tags on compound values. 2012-02-20 14:36:21 +01:00
Thomas Tanghus 12bcbcdc62 Update ctag in deleteFromDAVData. 2012-02-20 14:24:10 +01:00
Arthur Schiwon 7ff4e40b20 Combing LDAP backend with LDAP extended backend 2012-02-20 10:39:55 +01:00
Alessandro Cosentino 490c9db15d Added bookmarklet for browser. Inspired by Google Bookmarks 2012-02-19 20:18:27 -05:00
Florian Pritz 9d2379742b apps/calendar: update ctag after deleteFromDAVData
Without this clients won't see the update because they compare ctags
before fetching the actual calendar to reduce traffic.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-02-19 21:42:47 +01:00
Michael Gapczynski 87627c7a50 Fix overwriting of internal sharing for shared folders - bug oc-260 2012-02-18 19:30:54 -05:00
Tom Needham 71a2241aee Fixed call to OC_User. Thanks Burillo on IRC 2012-02-18 23:53:10 +00:00
Thomas Tanghus 2ee2f87efe Strip tags on address on client side. 2012-02-18 11:49:31 +01:00
Thomas Tanghus 868cf6bb83 Avoid errors from missing GD library. 2012-02-18 11:49:31 +01:00
Thomas Tanghus 96612c506e Removed obsolete commented code and made minor speed improvements.
Added stub function for loading categories.
2012-02-18 11:49:31 +01:00
Michael Gapczynski 6f1ed85f0b Temporary fix for sharing files 2012-02-17 21:56:20 -05:00
Bart Visscher 6bbd67c3c6 Calendar: only update default view when it really changed 2012-02-17 22:10:02 +01:00
Bart Visscher 539fd7240c Calendar: optimize sending calendar events, also enabled caching of result 2012-02-17 22:09:31 +01:00
Bart Visscher a33b757b19 Calendar: Add default repeat values when editing a non-repeating event 2012-02-17 22:09:22 +01:00
Bart Visscher dab5531474 Bookmarks: Fix image urls in bookmarks.js 2012-02-17 22:07:15 +01:00
Bart Visscher e8b69d45a3 Fixup use of OC_Helper::linkTo function 2012-02-17 22:07:14 +01:00
Bart Visscher f47444e1f7 Use separate function to make absolute urls 2012-02-17 22:07:14 +01:00
Bart Visscher 5f3c549227 Contacts: Add removed app enabled check 2012-02-17 22:07:14 +01:00
Thomas Tanghus 86893ea78c UI tweaks for name selector combobox. 2012-02-16 10:38:00 +01:00
Thomas Tanghus fa7fabf024 Minor tweaks 2012-02-16 10:38:00 +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
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
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
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 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 e084386770 Gallery: Move login check to beginning of galleryOp.php 2012-02-13 22:33:52 +01:00
Bart Visscher e402896001 Gallery: Remove autoloaded includes from galleryOp.php 2012-02-13 22:33:48 +01:00
Georg Ehrke 40d343e2af fix oc-bug 239 - & => &amp; 2012-02-12 22:34:10 +01:00
Bart Visscher 5c816c0cc9 Contacts: Optimize thumbnail cache handling a bit 2012-02-12 20:40:52 +01:00
Bart Visscher 125cf79a37 OC_Response: add setExpiresHeader function 2012-02-12 20:40:52 +01:00
Bart Visscher 45bb6f5fd4 OC_Response: add redirect function 2012-02-12 20:40:52 +01:00
Bart Visscher ee7931f457 Contacts: Add missing parameter 2012-02-12 20:40:52 +01:00
Bart Visscher 0917bdecdd Contacts: Move response caching to OC_Response 2012-02-12 17:21:33 +01:00
Tom Needham a0bb6079c5 Add description to texteditor info.xml -fix oc-234 2012-02-12 15:42:05 +00:00
Bart Visscher f5385e4a63 Contacts: Add id to vars with id in them 2012-02-12 16:12:46 +01:00
Bart Visscher 623afb69b6 Contacts: cleanup OC_L10N usage 2012-02-12 16:11:41 +01:00
Bart Visscher 39f342d595 Contacts: Move debug logging of $_POST to after access checks 2012-02-12 15:58:55 +01:00
Bart Visscher 6eb1427ac0 Contacts: Document usage of OC_Contacts_App::getAddressbook
Remove redundant access checks and add comments to the calls to
OC_Contacts_App::getAddressbook that are access checks
2012-02-12 15:55:36 +01:00
Bart Visscher b77132edbe Contacts: Save last-modified time in REV property if not set 2012-02-12 15:14:25 +01:00
Bart Visscher 6bd0aad117 Contacts: Fix adding N property in getContactVCard 2012-02-12 15:14:24 +01:00
Bart Visscher facd4cbe17 Contacts: Cleanup photo and thumbnail code 2012-02-12 15:14:24 +01:00
Bart Visscher 90d189a8b3 Access check fix in contacts/ajax/activation.php
plus small cleanup
2012-02-12 15:14:24 +01:00
Bart Visscher 8f3da6ee9b Small coding style update
Fixup OC_Contacts_App
2012-02-12 15:14:23 +01:00
Bart Visscher 1a74f0a18c Improve logging in OC_Contacts_App
Add logging to errors paths in getAddressbook and getContactObject.
2012-02-12 15:14:23 +01:00
Bart Visscher c4ee924869 Cleanup OC_Contacts_Addressbook::find usage
Use OC_Contacts_App::getAddressbook($id) instead of OC_Contacts_Addressbook::find($id), it contains access checks.
2012-02-12 15:14:23 +01:00
Bart Visscher b5418173e5 Derive the user principles from the owncloud users
The code for updating the principles table is still there. To make it easier to
revert this commit if that is necessary.
2012-02-11 21:09:51 +01:00
Thomas Tanghus 1d6b4f8f3c Merge branch 'tanghus_contacts' 2012-02-10 16:44:06 +01:00
Thomas Tanghus b4924ed1e5 Variable wasn't reset. 2012-02-10 16:43:40 +01:00
Thomas Tanghus fd9ce6da35 Merge gitorious.org:owncloud/owncloud into tanghus_contacts 2012-02-10 16:42:45 +01:00
Thomas Tanghus c95e8a1fc5 Added custom combobox widget. 2012-02-10 16:40:40 +01:00
Bart Visscher 9379c3e128 Gallery: remove unset call, not needed anymore 2012-02-09 22:47:05 +01:00
Thomas Tanghus 25f1263c11 Merge gitorious.org:owncloud/owncloud into tanghus_contacts 2012-02-09 19:07:54 +01:00
Thomas Tanghus ff53b0c209 Keep js data structure in sync on changes.
More checks for missing properties.
2012-02-09 19:04:07 +01:00
Bart Visscher 88b2391d2b Fix wrong var name in sharedstorage.php 2012-02-08 21:12:31 +01:00
Bart Visscher 7cd1a302d3 Gallery: Add caching headers to album thumbnail sending 2012-02-08 21:12:31 +01:00
Bart Visscher 158360c09b Gallery: use thumbnails of images for the album thumbnail
The thumbnails were already generated in this function, but now we save them
for displaying of the album.
2012-02-08 21:12:31 +01:00
Bart Visscher 43d2266f5c Add caching to gallery thumbnail generation 2012-02-08 21:12:30 +01:00
Bart Visscher eb5de4d4f7 Change gallery thumbnail generation to OC_Image 2012-02-08 21:12:30 +01:00
Bart Visscher 7c03b612d2 OC-41: [Calendar] Date format not translatable 2012-02-08 21:12:30 +01:00
Robin Appelman c4a6b99814 use oc_filecache and oc_eventsource for music scanning 2012-02-08 17:30:16 +01:00
Robin Appelman 36d696c30d dont load pdfview for ie 2012-02-08 16:28:59 +01:00
Robin Appelman 5f7727629a Merge branch 'filesystem' 2012-02-08 15:50:58 +01:00
Thomas Tanghus 25faa40bd0 More @£#¤ conflicts
Merge branch 'temp' into tanghus_contacts
2012-02-08 09:36:16 +01:00
Thomas Tanghus f4a586a52c Fix merge conflicts 2012-02-08 09:18:58 +01:00
Thomas Tanghus c191ef6459 Added files for new contact editor/viewer. 2012-02-08 09:14:10 +01:00
Thomas Tanghus 0c5eb542bd Fixed broken "Add new" contact.
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-08 08:47:03 +01:00
Thomas Tanghus 6112cdc7e8 Hide container for emails/phones/adresses if there are none. 2012-02-08 08:47:03 +01:00
Thomas Tanghus 9f1370a6d1 Updated copyrights.
Element menu didn't update.
2012-02-08 08:47:03 +01:00
Thomas Tanghus c0c6b5310e Added files for new contact editor/viewer. 2012-02-08 08:47:03 +01:00
Thomas Tanghus 3e9a69b9b7 Merge branch 'tanghus_contacts' of gitorious.org:owncloud/owncloud into tanghus_contacts
Conflicts:
	apps/contacts/ajax/contactdetails.php
	apps/contacts/js/contacts.js
2012-02-08 08:33:51 +01:00
Thomas Tanghus 424c64c0eb Don't import cards that can't be parsed by Sabre, but log it instead.
Fix missing 'N' or 'FN' fields on import.
2012-02-08 07:59:39 +01:00
Thomas Tanghus 249e46c5b7 Some fixes for malformed VCards. 2012-02-08 07:59:39 +01:00
Thomas Tanghus 4db661ba9d Fixed broken "Add new" contact.
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-08 07:59:39 +01:00
Thomas Tanghus 23396721e4 Hide container for emails/phones/adresses if there are none. 2012-02-08 07:59:39 +01:00
Thomas Tanghus 1e4444f25b Updated copyrights.
Element menu didn't update.
2012-02-08 07:59:39 +01:00
Thomas Tanghus 90a830baba Added files for new contact editor/viewer. 2012-02-08 07:59:39 +01:00
Georg Ehrke cdf1cf82ba merge 64a617b2a1 into master 2012-02-07 22:49:23 +01:00
Thomas Tanghus 2cebfb50a4 Fixed broken "Add new" contact.
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-06 14:18:40 +01:00
Thomas Tanghus 5962e66b6d Hide container for emails/phones/adresses if there are none. 2012-02-06 08:15:23 +01:00
Thomas Tanghus bc79951f33 Updated copyrights.
Element menu didn't update.
2012-02-06 08:04:06 +01:00
Thomas Tanghus 3af427fa54 Added files for new contact editor/viewer. 2012-02-06 07:32:57 +01:00
Thomas Tanghus 89616d81f0 Modification for adding photos. 2012-02-06 07:24:39 +01:00
Robin Appelman 30673e4786 writable not writeable 2012-02-05 14:03:44 +01:00
Georg Ehrke 89073970d3 change comments in import.php 2012-02-05 12:13:53 +01:00
Georg Ehrke 8337eaa1ec add import function for contacts 2012-02-05 12:13:53 +01:00
Robin Appelman 36bc1a2102 Merge branch 'master' into filesystem 2012-02-05 01:22:29 +01:00
Bartek Przybylski cfc710e768 preferences store fix 2012-02-04 20:15:55 +01:00
Bartek Przybylski f6a27dfa28 stripping root from gallery name 2012-02-04 15:35:58 +01:00
Bartek Przybylski f1672d7d10 handling special chars in dirnames 2012-02-04 11:02:13 +01:00
Bartek Przybylski 5a106d1036 gallery: fix FS hooks 2012-02-04 10:30:32 +01:00
Bartek Przybylski 8df0650658 gallery settings, defining scan root and shor order 2012-02-03 21:38:44 +01:00
Bartek Przybylski ee01d1a81d removing console error in safari for bookmarks 2012-02-03 21:37:09 +01:00
Georg Ehrke ab31a890b6 use strip_tags for calendar names 2012-02-02 21:23:41 +01:00
Georg Ehrke bfa69c3e59 add a label calendar to the settings page - bugfix for oc-157 2012-02-02 18:37:06 +01:00
Thomas Tanghus 6225b5ec86 More in-/output sanitation, 2012-02-02 17:54:30 +01:00
Thomas Tanghus 66b96e4440 Sanitize in- and output. 2012-02-02 17:54:30 +01:00
Robin Appelman 7b9fb84fe9 Merge branch 'master' into filesystem 2012-02-02 17:30:54 +01:00
Georg Ehrke 92b8f32386 Calendar: Bugfix: better input validation 2012-02-02 15:01:05 +01:00
Bartek Przybylski f198296576 gallery works in safari now 2012-02-01 22:15:46 +01:00
Marvin Thomas Rabe f999fbf81a Bookmark layout updated 2012-02-01 22:02:06 +01:00
Marvin Thomas Rabe bbd10a3c94 Bookmark layout updated 2012-02-01 21:19:31 +01:00
Robin Appelman d514b1d92d Merge branch 'master' into filesystem 2012-02-01 15:57:32 +01:00
David Iwanowitsch 6583d30e26 fix javascript 2012-02-01 15:40:59 +01:00
David Iwanowitsch e229a6adec Added searchprovider for bookmarks, initial l10n support for bookmark plugin
moved some code from updateList.php to bookmarks.php, to make it reusable
2012-02-01 15:40:59 +01:00
Robin Appelman 0124809a42 prevent sharing from making aditional http requests while scanning
additional requests to the server can block feedback of scannning depending on server configuration
2012-02-01 15:33:12 +01:00
Thomas Tanghus 1f718d31e1 Merge branch 'tanghus_contacts' 2012-01-31 19:35:11 +01:00
Thomas Tanghus 6c340416d9 Resize profile picture if bigger than 200px on either x or y.
Bolded text on message box.
2012-01-31 19:32:24 +01:00
Thomas Tanghus 3f1486534f - Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-93
Property was added multiple times.
- Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-8
  "Missing "N" field: Contacts app not compatible with vcard 3.0 format"
- Almost sure I've fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-27
  "Full name in Contacts app doesn't sync to iOS 5 contacts" because it is caused by oc-8
2012-01-31 19:30:56 +01:00
Thomas Tanghus db1f77e4f5 Some reminders in the code of what I have to change post OC3.0 2012-01-31 19:30:56 +01:00
Robin Appelman 803f86e0fc dont try to use the filesystem when it isnt setup yet 2012-01-31 12:44:01 +01:00
Robin Appelman 1191b57b34 Merge branch 'master' into filesystem 2012-01-30 23:20:47 +01:00
Michael Gapczynski e0f655fb70 Sharing app needs to be loaded for public link of file in Shared folder - fixes bug 113 2012-01-30 16:49:24 -05:00
Robin Appelman 4522d19b4c merge master into filesystem 2012-01-30 20:29:33 +01:00
Bartek Przybylski 5574b87e9b new gallery look and feel 2012-01-30 19:36:33 +01:00
Georg Ehrke 30f1de71a6 remove debug file 2012-01-29 16:08:09 +01:00
Georg Ehrke 928e9b121b fix version-compare in calendars app.php 2012-01-29 10:59:15 +01:00
Robin Appelman ad4e305c96 update translations 2012-01-27 00:59:24 +01:00
Robin Appelman 830cf87697 use the correct hooks to remove contact/calendars of remvoed users 2012-01-26 19:05:46 +01:00
Robin Appelman 266fbb442e use oc_filesystem::getlocalfile instead of manually trying to get the correct local file when creating album covers
fixes broken album covers on shared files
2012-01-26 18:12:59 +01:00
Bartek Przybylski 63ae4b3dfc db cleanup after gallery remove 2012-01-25 21:15:27 +01:00
Bartek Przybylski 5172e0a7a3 creating thumbnails on upload, recursive remove 2012-01-25 21:07:43 +01:00
Thomas Tanghus e6298325f6 Removed debug output 2012-01-24 23:08:40 +01:00
Thomas Tanghus 5458e52935 Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-92
"Character '&' in address data causes wrong data".
This was also the case for the 'N' property.
2012-01-24 23:08:40 +01:00
Robin Appelman a77f3a07a1 Fix some issues in ampache resonponse
Patch by Markus Germeier
2012-01-24 02:56:57 +01:00
Robin Appelman 6fccf12299 update translations 2012-01-24 00:42:08 +01:00
Robin Appelman cdfb252ced Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-24 00:24:09 +01:00
Bartek Przybylski 456394d3ec oc-89 handling no photos in collection alert 2012-01-23 23:25:36 +01:00
Tom Needham e1a499f65d disable keyboard shortcuts as temp fix 2012-01-23 20:59:37 +00:00
Georg Ehrke b8e01939e9 fix undefined indices - bugfix for oc-99 2012-01-23 15:05:53 +01:00
Georg Ehrke 66f8a0e1a3 validate the calendar name 2012-01-21 17:42:52 +01:00
Georg Ehrke 78c5c2e7d5 fix Undefined variable - bugfix for oc-69 2012-01-21 17:42:52 +01:00
Robin Appelman 01ebb74a33 some gallery css fixes 2012-01-21 00:54:02 +01:00
Bartek Przybylski 437d50c6f6 recognizing img basing on extension 2012-01-20 23:28:40 +01:00