1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-04 15:24:35 +01:00
Commit Graph

1503 Commits

Author SHA1 Message Date
Thomas Tanghus
dca605b41c 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
b5b216fb3c Contacts: small merge cleanups 2011-12-27 22:44:52 +01:00
Bart Visscher
45dc7ea0be 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
f41400e010 Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails 2011-12-26 13:27:53 +01:00
Bart Visscher
1f1a22cfec Contacts: check if PREF parameter is set before useing it 2011-12-18 23:10:43 +01:00
Bart Visscher
e6cb120c73 Contacts: add missing property_options template var 2011-12-18 23:10:43 +01:00
Thomas Tanghus
8d6713e238 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
477c5d34b8 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
ae4bb0b1cb Misc. changes after review by bartv. 2011-12-16 17:42:07 +01:00
Thomas Tanghus
f21d4d61f3 Update README 2011-12-13 10:39:31 +01:00
Thomas Tanghus
3565221540 Added readme.tanghus 2011-12-11 21:17:10 +01:00
Tom Needham
f8f13a8dfd Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-11 18:16:14 +00:00
Thomas Tanghus
82fc2095c6 Updating of contact list when activating/adding/deleting address books now works. 2011-12-11 16:26:00 +01:00
Thomas Tanghus
98475d5fbd Resolved conflict 2011-12-09 15:28:51 +01:00
Thomas Tanghus
7a63a0cbc5 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
6401ccef2e Various fixes to multiple address books handling 2011-12-09 15:10:51 +01:00
Bart Visscher
5c0ad56e27 Contacts: Add "Preferred" before phone label for preferred numbers 2011-12-07 20:40:59 +01:00
Bart Visscher
e91bb2d46e Contacts: Add direct link to details of a contact 2011-12-07 20:40:59 +01:00
Bart Visscher
44f54485ac Contacts: Fix postname var spelling 2011-12-07 20:40:59 +01:00
Bart Visscher
18f9d177d5 Contacts: refactor common ajax functions to OC_Contacts_App 2011-12-07 20:40:59 +01:00
Bart Visscher
e53e413c6c Contacts: refactor rendering of part.details template 2011-12-07 20:40:58 +01:00
Bart Visscher
9ab66b5e9b Use a proxy class to interface with Sabre_VObject classes 2011-12-07 20:40:58 +01:00
Tom Needham
e63cc13c9d Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-06 23:11:36 +00:00
Thomas Tanghus
b77bb04972 Fixed adding, editing and deleting address books. One minor UI flaw remains. 2011-12-05 03:38:06 +01:00
Thomas Tanghus
51b21f2969 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
be0dcc2898 Contacts: make name editable again 2011-12-02 21:24:48 +01:00
Thomas Tanghus
04cbaecfcb Removed some debug statements.
Changed double quotes to single quotes.
2011-12-01 16:06:27 +01:00
Thomas Olsen
313476bc8e 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
Tom Needham
8f162e166c Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-11-29 22:45:26 +00:00
Tom Needham
868f196381 Disable save button while saving. Streamlined code. 2011-11-29 22:11:42 +00:00
Bart Visscher
59e3d53e62 Contacts: layout updates 2011-11-24 21:36:35 +01:00
Bart Visscher
0e9fa8b88f Contacts: better label for saving a property 2011-11-24 21:36:35 +01:00
Bart Visscher
adab7b7012 Contacts: make type of phone property also multiselect in addproperty 2011-11-24 21:36:34 +01:00
Bart Visscher
f076db00dc Contacts: remove redundant li in setpropertyform template 2011-11-23 21:07:32 +01:00
Bart Visscher
5372e61d34 Contacts: support multiple phone type parameter 2011-11-23 21:07:32 +01:00
Bart Visscher
3abb1a1285 Add type selects to editing ADR & TEL contact property types 2011-11-23 21:07:32 +01:00
Bart Visscher
33e0263509 Use a function to generate select options 2011-11-09 22:19:52 +01:00
Jakob Sack
e6cf001105 contacts: every card needs a version! 2011-11-09 11:35:50 +01:00
Jakob Sack
f2484423a7 contacts: put property key in background, the value is important! 2011-11-09 11:35:50 +01:00
Jakob Sack
312aaa02f2 Improve style in contacts 2011-11-09 11:35:50 +01:00
Brice Maron
05ba42ae8b Add sequence name in insertid to be more portable 2011-10-29 11:40:48 +02:00
Bart Visscher
2af852c57d Fix html id's in part.addcardform.php 2011-10-27 22:47:56 +02:00
Bart Visscher
4a966cd102 Fix setproperty form 2011-10-25 20:01:40 +02:00
Jakob Sack
94c44f2413 improved style in contacts 2011-10-22 21:32:07 +02:00
Jakob Sack
f2bc7cfa7d Some improvements on the contact application 2011-10-22 19:23:22 +02:00
Jakob Sack
fb96093964 Fix translations, empty properties 2011-10-22 19:23:22 +02:00
Bart Visscher
0490c8138f Fix function name error in contacts app 2011-10-21 21:49:58 +02:00
Bart Visscher
7cc1301f6d Move contact delete button to top right corner 2011-10-09 00:04:37 +02:00
Bart Visscher
4cee6abe6b Show add contact form on opening contacts page 2011-10-09 00:04:37 +02:00
Bart Visscher
f6df768405 Fixes for adding contact property 2011-10-07 23:01:49 +02:00