1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-29 11:24:11 +01:00
Commit Graph

2387 Commits

Author SHA1 Message Date
Georg Ehrke
2c1a64c782 use backslash n instead of a real new line 2012-01-15 00:56:11 +01:00
Georg Ehrke
1fd413a6d2 fix newline problem in contacts 2012-01-15 00:47:50 +01:00
Tom Needham
8d78bb73cd Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2012-01-13 16:55:55 +00:00
Thomas Tanghus
6203fc9b75 Too quick on the copy/paste trigger... 2012-01-12 23:43:00 +01:00
Thomas Tanghus
3d412e2ebe Oops. Missing ')' :-P 2012-01-12 22:55:43 +01:00
Thomas Tanghus
cb5b166b52 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
02180541a3 Added search. Thanks to icewind it was mostly copy/paste :-) 2012-01-12 22:50:12 +01:00
Thomas Tanghus
1e9453ea37 Add PRODID to vcards created by ownCloud. 2012-01-12 22:50:12 +01:00
Thomas Tanghus
2859f5d607 Don't add address if none of the fields are filled out. 2012-01-12 02:39:33 +01:00
Thomas Tanghus
24eeefc342 Tweaked some tipsys. 2012-01-11 23:05:34 +01:00
Thomas Tanghus
56c1d9ee54 Localizin strings and adding error checking. 2012-01-11 20:07:15 +01:00
Thomas Tanghus
30e1fffe15 Make sure VERSION is set.
Set REV for each edit.
Download single VCard.
2012-01-11 06:20:06 +01:00
Thomas Tanghus
57f9a00ccf Added files for error messages, removed old syle sheet. 2012-01-11 04:05:30 +01:00
Thomas Tanghus
3702428369 CSS cleanup, more error checking, better error messages, general cleanup. 2012-01-11 04:05:30 +01:00
Thomas Tanghus
6a85d92dfe Added missing } 2012-01-11 04:05:29 +01:00
Robin Appelman
3b1d6f0383 update translations 2012-01-11 01:06:59 +01:00
Thomas Tanghus
253e0474e6 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
24e48ac2d9 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
6e88659b69 OC_DB::insertid was being called too late to get the correct result. 2012-01-09 23:14:11 +01:00
Tom Needham
8b08072a27 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2012-01-09 21:17:41 +00:00
Thomas Tanghus
82148746d3 Insert new contacts alphabetically correct in the list.
Added some tipsys to the editor.
2012-01-09 22:05:28 +01:00
Thomas Tanghus
7ccda1eb9f Fixed Phone types not being saved correctly when adding them. 2012-01-09 20:38:06 +01:00
Thomas Tanghus
1e2a44039c Some cleanup, better error messages and such. 2012-01-09 20:38:06 +01:00
Thomas Tanghus
4e095cb3f0 Fixed showing first contact if non is selected. 2012-01-09 20:38:05 +01:00
Thomas Tanghus
c76097f7fe Modified thumbnail.php to use OC_Image. Cut out 50 loc ;-) 2012-01-09 20:38:05 +01:00
Thomas Tanghus
35b3b8756e 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
Tom Needham
76bdcd9674 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-31 12:21:40 +00:00
Thomas Tanghus
aa2fabaef9 Removed redundant DB queries. 2011-12-31 01:34:22 +01:00
Thomas Tanghus
6c8c89a57d 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
db7cc3a85e Merge git://gitorious.org/owncloud/owncloud into tanghus_contacts 2011-12-30 21:09:42 +01:00
Thomas Tanghus
a3bbcb16d2 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
a98c728877 contacts entry duplication fix 2011-12-30 17:47:14 +01:00
Tom Needham
6392f3044c Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-28 16:16:35 +00:00
Thomas Tanghus
56581b8c82 More missing js. 2011-12-28 10:31:45 +01:00
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