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

319 commits

Author SHA1 Message Date
Marvin Thomas Rabe
b3f3b8c23f UI problems solved. Bookmarks app updated. 2012-02-22 16:04:31 +01:00
Thomas Tanghus
faf6055baa Translate and fix copy/paste error. 2012-02-22 14:19:23 +01:00
Thomas Tanghus
9794e7e427 Fix merge conflict. 2012-02-22 11:20:57 +01:00
Thomas Tanghus
c5c843bfef Improved upgrading VCARD v. 2.1 => 3.0. Improved import of malformed cards. Remove duplicate code. 2012-02-21 23:22:06 +01:00
Thomas Tanghus
e0c92662f8 JS fix on address book creation. 2012-02-21 23:22:06 +01:00
Thomas Tanghus
a79f5d40de Remove my FIXME comments when I've fixed it :-P 2012-02-21 23:22:06 +01:00
Thomas Tanghus
7a49c8e59c Merge gitorious.org:owncloud/owncloud into vcategories 2012-02-20 23:42:06 +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
Thomas Tanghus
c62673d360 Added public static OC_VCategories object to OC_Contacts_App. 
Parse cards for new categories in add and edit methods.
 2012-02-19 23:32:09 +01: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
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
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
594dcf13f2 Contacts+OC_Respone: Move enableCaching out of setEtagHeader and setLastModifiedHeader 2012-02-13 22:47:31 +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
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
c95e8a1fc5 Added custom combobox widget. 2012-02-10 16:40:40 +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
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
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
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
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
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
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
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
6fccf12299 update translations 2012-01-24 00:42:08 +01:00
Robin Appelman
7ea2923fa8 translation updates 2012-01-20 18:53:45 +01:00
Thomas Tanghus
ca03a26f15 - Added fix for empty 'FN' field on import via CardDAV clients. 
- Make sure that the contact in the list has a display name.
- More tweaks on thumbnail caching.
 2012-01-19 19:47:09 +01:00
Thomas Tanghus
137c630377 Optimizations and more aggressive caching. 2012-01-19 18:28:17 +01:00
Thomas Tanghus
5bd117dd6d UI fixes in contact editor and address book dialog. 
Error checking in ajax methods.
Localize menu entry.
 2012-01-19 16:07:17 +01:00
Thomas Tanghus
dc942d6f3e Added redirecting to static image file and caching for contacts with no photo embedded. 2012-01-19 16:07:17 +01:00
Robin Appelman
965ea96439 update translations 2012-01-16 17:34:53 +01:00
Robin Appelman
b0dbca0cc7 fix export link for contacts 2012-01-16 02:27:59 +01:00
Robin Appelman
7cd809b286 update translations 2012-01-15 15:12:58 +01:00
Bartek Przybylski
3ec5ffe24e Simple translation for gallery 2012-01-15 12:15:22 +01:00
Georg Ehrke
360778e520 use backslash n instead of a real new line 2012-01-15 00:56:11 +01:00
Georg Ehrke
0e428ec595 fix newline problem in contacts 2012-01-15 00:47:50 +01:00
Thomas Tanghus
0ba472c18a Too quick on the copy/paste trigger... 2012-01-12 23:43:00 +01:00
Thomas Tanghus
1697347045 Oops. Missing ')' :-P 2012-01-12 22:55:43 +01:00
Thomas Tanghus
e60860148c Don't chunk_split encoded image string. 
Don't return json error but null if card can't be parsed.
Small check for non-parsable card in index.php.
 2012-01-12 22:50:12 +01:00
Thomas Tanghus
22356533a0 Added search. Thanks to icewind it was mostly copy/paste :-) 2012-01-12 22:50:12 +01:00
Thomas Tanghus
0d120efda5 Add PRODID to vcards created by ownCloud. 2012-01-12 22:50:12 +01:00
Thomas Tanghus
c6eeb4a808 Don't add address if none of the fields are filled out. 2012-01-12 02:39:33 +01:00
Thomas Tanghus
24dc1aec8e Tweaked some tipsys. 2012-01-11 23:05:34 +01:00
Thomas Tanghus
237ba65a20 Localizin strings and adding error checking. 2012-01-11 20:07:15 +01:00
Thomas Tanghus
eae3e134ff Make sure VERSION is set. 
Set REV for each edit.
Download single VCard.
 2012-01-11 06:20:06 +01:00
Thomas Tanghus
d93a5a0774 Added files for error messages, removed old syle sheet. 2012-01-11 04:05:30 +01:00
Thomas Tanghus
1a6ad816a3 CSS cleanup, more error checking, better error messages, general cleanup. 2012-01-11 04:05:30 +01:00
Thomas Tanghus
5500041cca Added missing } 2012-01-11 04:05:29 +01:00
Robin Appelman
f67e5d18e7 update translations 2012-01-11 01:06:59 +01:00
Thomas Tanghus
e316cddf65 More fixes on saving TYPE parameters. 
Use jQuery Dialog for error messages instead of alert()
 2012-01-10 14:59:31 +01:00
Thomas Tanghus
60653c0544 Return standard thumbnail even if contact couldn't be found as it could be because it was just added, 2012-01-09 23:16:07 +01:00
Thomas Tanghus
aadb81a32a OC_DB::insertid was being called too late to get the correct result. 2012-01-09 23:14:11 +01:00
Thomas Tanghus
ac63afbd95 Insert new contacts alphabetically correct in the list. 
Added some tipsys to the editor.
 2012-01-09 22:05:28 +01:00
Thomas Tanghus
978a08ab1c Fixed Phone types not being saved correctly when adding them. 2012-01-09 20:38:06 +01:00
Thomas Tanghus
604ca61d78 Some cleanup, better error messages and such. 2012-01-09 20:38:06 +01:00
Thomas Tanghus
47548fb8c6 Fixed showing first contact if non is selected. 2012-01-09 20:38:05 +01:00
Thomas Tanghus
85ab3b3924 Modified thumbnail.php to use OC_Image. Cut out 50 loc ;-) 2012-01-09 20:38:05 +01:00
Thomas Tanghus
d91a4fcaf3 Changed SQL queries for looking up contacts to only query once and sort at the same time. 2012-01-09 20:38:05 +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
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
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
Thomas Tanghus
16c8f62658 Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails 2011-12-26 13:27:53 +01:00
Bart Visscher
fbad1da9e2 Contacts: check if PREF parameter is set before useing it 2011-12-18 23:10:43 +01:00
Bart Visscher
dff9585f64 Contacts: add missing property_options template var 2011-12-18 23:10:43 +01:00
Thomas Tanghus
092c41f375 Added missing files and tried to revert the wrong commit of app/contacts/js/interfaces.js 2011-12-17 20:38:52 +01:00
Thomas Tanghus
a7b048dc05 Added thumbnails to contact list. The contacts have a default thumbnail when the page is 
first loaded. Once the page is loaded the thumbnails will be lazy-loaded to the contacts
viewable.
 2011-12-17 20:05:54 +01:00
Thomas Tanghus
feeb0c742a Misc. changes after review by bartv. 2011-12-16 17:42:07 +01:00
Thomas Tanghus
59ad0a6c9c Update README 2011-12-13 10:39:31 +01:00
Thomas Tanghus
d55e689261 Added readme.tanghus 2011-12-11 21:17:10 +01:00
Thomas Tanghus
c7b7758816 Updating of contact list when activating/adding/deleting address books now works. 2011-12-11 16:26:00 +01:00
Thomas Tanghus
5cb10548b3 Resolved conflict 2011-12-09 15:28:51 +01:00
Thomas Tanghus
7aa8eb3427 Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 
Conflicts:
	apps/contacts/ajax/deletebook.php
	apps/contacts/index.php
 2011-12-09 15:25:26 +01:00
Thomas Tanghus
b3661adf02 Various fixes to multiple address books handling 2011-12-09 15:10:51 +01:00
Bart Visscher
546b7279a3 Contacts: Add "Preferred" before phone label for preferred numbers 2011-12-07 20:40:59 +01:00
Bart Visscher
1220edd4df Contacts: Add direct link to details of a contact 2011-12-07 20:40:59 +01:00
Bart Visscher
36abf22a48 Contacts: Fix postname var spelling 2011-12-07 20:40:59 +01:00
Bart Visscher
7e990a8e5c Contacts: refactor common ajax functions to OC_Contacts_App 2011-12-07 20:40:59 +01:00
Bart Visscher
247146f703 Contacts: refactor rendering of part.details template 2011-12-07 20:40:58 +01:00
Bart Visscher
c67ac46b6c Use a proxy class to interface with Sabre_VObject classes 2011-12-07 20:40:58 +01:00
Thomas Tanghus
830efdccac Fixed adding, editing and deleting address books. One minor UI flaw remains. 2011-12-05 03:38:06 +01:00
Thomas Tanghus
95ae0f23f1 Added UI for selecting/editing address books. 
Export, CardDAV link and activation/deactivation of address books done.
 2011-12-04 20:25:46 +01:00
Bart Visscher
31846141b0 Contacts: make name editable again 2011-12-02 21:24:48 +01:00
Thomas Tanghus
58d1a3516a Removed some debug statements. 
Changed double quotes to single quotes.
 2011-12-01 16:06:27 +01:00
Thomas Olsen
21d613cbc6 Added export.php for contacts app. Works the same way as the one in the calendar app, except there is no UI for it. 
Fixed indentation in /index.php
 2011-12-01 02:02:45 +01:00
Bart Visscher
53ff85e2ad Contacts: layout updates 2011-11-24 21:36:35 +01:00