rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-29 11:24:11 +01:00
Code Issues Releases Activity
3,641 Commits 18 Branches 95 Tags 40 MiB
6fd8405f6e
Commit Graph

954 Commits

Author SHA1 Message Date
jbtbnl
8b82a4328c Fixes #387. 2014-01-28 21:21:33 +01:00
jbtbnl
ecf8dc35e0 Fixes #384. 2014-01-28 18:31:12 +01:00
Thomas Tanghus
04dc2c8a12 Add some checks. Refs #386 2014-01-28 17:21:54 +01:00
Thomas Tanghus
67dda6a7c2 Newly created groups didn't accept drop. Close #357 2014-01-28 15:58:22 +01:00
Thomas Tanghus
255be7335b Remove trailing commas. Fix #372 2014-01-28 01:51:10 +01:00
Thomas Tanghus
d2f7247654 Remove name parsing confirmation. Refs. #264 2014-01-27 21:00:41 +01:00
Thomas Tanghus
11bdcb2810 Check if 'data' is set before acessing it's properties. Refs #373 2014-01-26 23:04:02 +01:00
Thomas Tanghus
4b92d3ed5f Check if opened contact is in current group. Close #346 2014-01-26 04:33:59 +01:00
Thomas Tanghus
b269bfce6d Fix photo loading 2014-01-26 03:22:49 +01:00
Thomas Tanghus
cbc4200fbe More JS groups management. Should finally fix #376 ;) 2014-01-25 23:54:05 +01:00
Thomas Tanghus
c738174937 Refactor groups management. Fix #370 
- Moved adding/removing groups to OCA\Contacts\VObject\VCard
- CATEGORIES property wasn't removed when empty
- When removing all groups from contact, it wasn't assigned to ungrouped.
- When adding contact(s) to group it wasn't removed from ungrouped until
  you changed to other group and back.
 2014-01-25 17:08:01 +01:00
jbtbnl
6d5f0eca9e Fixes actions not showing up 2014-01-24 15:21:48 +01:00
jbtbnl
d4f304bd8d Fixes contact thumbnails in "not grouped" 2014-01-24 15:04:51 +01:00
jbtbnl
4113bfff77 Fixes #362 2014-01-24 14:06:43 +01:00
Thomas Tanghus
a7e2111146 Remove non-ints from group sort. Temp. workaround for #369 2014-01-24 13:54:31 +01:00
jbtbnl
fd0a0e1ba6 Fixed JavaScript error caused by CSS selector 2014-01-23 21:00:46 +01:00
jbtbnl
fbf9a55467 Fixed 'select all' checkbox 2014-01-23 20:53:12 +01:00
Thomas Tanghus
a1754bac95 Merge branch 'master' of github.com:owncloud/contacts 2014-01-23 18:55:10 +01:00
Thomas Tanghus
77d2bb1403 No name split confirmation if only one name part. Fixes #264 2014-01-23 18:55:01 +01:00
Thomas Tanghus
8d7625e0c6 Fix typo in 54d79ae751 2014-01-23 15:15:31 +01:00
jbtbnl
859bdde08d Fixed toggeling checkbox on click label 2014-01-23 13:16:08 +01:00
Thomas Tanghus
54d79ae751 Check for dupes when renaming group. Fixes #359 2014-01-23 11:50:24 +01:00
Thomas Tanghus
84b7583d16 Hide updated list element. Fix #297 2014-01-23 09:47:01 +01:00
Jan-Christoph Borchardt
dea0c0ad6d also remove parentheses from favorites count 2014-01-10 13:23:24 +01:00
Jan ten Bokkel
99a12e77d5 Removed parentheses around contact count of groups. 2014-01-02 14:12:08 +01:00
Jan
1c7ccfdc92 Larger clickable space for checkboxes. Possibly fixes owncloud/#326. 2014-01-02 13:51:13 +01:00
Jan
ea58df34a4 Revert "Larger clickable space for checkboxes. Possibly fixes owncloud/#327." 
This reverts commit 174105e44d.
 2014-01-02 13:49:22 +01:00
Jan ten Bokkel
174105e44d Larger clickable space for checkboxes. Possibly fixes owncloud/#327. 2014-01-02 13:46:04 +01:00
Jan ten Bokkel
ff3e5cc833 Fixes owncloud/#327. 2014-01-02 13:00:00 +01:00
Jan ten Bokkel
75e14d8476 Fixed groups action disappearing after using it once. 2013-12-31 12:54:12 +01:00
Jan
2fa9b95cad Merge branch 'master' of https://github.com/owncloud/contacts.git 2013-12-31 12:21:23 +01:00
Jan ten Bokkel
a00e0a030b Fixed merge and groups icon. Fixed add address book icon. CSS fixes for Firefox. 2013-12-31 12:06:12 +01:00
Thomas Tanghus
9976117da5 Escape group name 2013-12-30 13:57:52 +01:00
Jan
6f8888c9b1 Merge branch 'master' of https://github.com/owncloud/contacts.git 2013-12-21 16:50:06 +01:00
Thomas Tanghus
453978e23b Give a warning before downloading > 300 selected contacts. 2013-12-20 01:29:28 +01:00
Thomas Tanghus
3cb61fc10c Shorten request URI on selected export. Refs. #304 2013-12-20 00:11:48 +01:00
Thomas Tanghus
39a74188ea Don't select the toggle button and think it's a contact. Refs. #304 2013-12-19 23:48:14 +01:00
Thomas Tanghus
d717b1d59e Test if contact exists. Fix #304 2013-12-19 22:44:03 +01:00
Jan ten Bokkel
425c8b0c49 Move add-contact and add-group buttons back to menu. 2013-12-18 16:59:39 +01:00
Jan ten Bokkel
90afc480d3 Redesign of actions, relocated to table header. 2013-12-18 15:35:41 +01:00
Jan ten Bokkel
8afbe24087 Fix for avatar placeholder to use whole name. 2013-12-18 11:48:42 +01:00
Jan
0b2d5a788c Merge branch 'master' of https://github.com/owncloud/contacts.git 2013-12-18 11:45:43 +01:00
Thomas Tanghus
a0b0540767 Fix empty displayname. Close #305 2013-12-17 17:53:53 +01:00
Jan ten Bokkel
8f05a6beca Change avatar placeholder on sort order change, fixes owncloud#287. 2013-12-17 17:07:04 +01:00
Jan ten Bokkel
0386e1fcfc Implemented default ownCloud contact avatars. Fixes https://github.com/owncloud/contacts/issues/287 2013-12-14 15:22:42 +01:00
Jan
9dfe94c6dd Merge branch 'master' of https://github.com/owncloud/contacts.git 2013-12-13 22:41:01 +01:00
Jan ten Bokkel
de871581b2 Delete, download and close buttons moved to the right. 
Increased the size of input fields.
Improved styling of parameter selection.
 2013-12-13 18:34:46 +01:00
Jan ten Bokkel
695e2682ff Redesign of contact editing. 2013-12-12 16:45:48 +01:00
Jan ten Bokkel
bcd913ad0c Redesign of contact editing. 2013-12-11 01:22:41 +01:00
Thomas Tanghus
9cd8b2799e camelCase index name 2013-12-10 19:09:41 +01:00
Jan ten Bokkel
677a901f56 Adjustments based on recommendations from @Kondou-ger. 2013-12-10 18:45:05 +01:00
Jan ten Bokkel
0382cee171 Some design changes 2013-12-09 21:44:57 +00:00
Thomas Tanghus
7030b117e7 Avoid non-group ids in groupsort. Fix #274 2013-11-28 13:32:05 +01:00
Thomas Tanghus
45ff2f20b6 Fix deleting from list. Close #248 2013-11-04 15:03:04 +01:00
Thomas Tanghus
85a16f8241 Add placeholder to name and focus it. Fix #237 2013-10-29 21:19:10 +01:00
Thomas Tanghus
ac114ee53c Fix contact positioning 2013-10-29 21:08:35 +01:00
Thomas Tanghus
839b6be33c Don't add more that one new contact. Fix #240 2013-10-29 19:27:44 +01:00
Thomas Tanghus
232af99e61 Fix deleting from open contact 2013-10-28 20:18:58 +01:00
Thomas Tanghus
24dbbdc7c0 Fix missing progress key on import 2013-10-24 14:36:11 +02:00
Thomas Tanghus
bf095621e0 Fix editing contact photos. 2013-10-22 17:10:23 +02:00
Thomas Tanghus
155a61c867 Misc cleanup 2013-10-18 15:29:32 +02:00
Thomas Tanghus
1d29b943ae Finally works with core master 2013-10-17 02:10:50 +02:00
Thomas Tanghus
dfffa028fb camelCase 2013-10-11 14:47:54 +02:00
Thomas Tanghus
96f0d5e584 Use OC.Tags 2013-10-04 20:08:08 +02:00
Thomas Tanghus
6e3a90c17d Update doc for Storage.patchContact 2013-10-03 04:16:28 +02:00
Thomas Tanghus
f8c46f1ad1 Various route and request adjustments 
* All request bodies are now JSON.
* Contact property add/update/delete uses the same PATCH route.
 2013-10-03 04:15:12 +02:00
Thomas Tanghus
8b6f877fea PATCH test WiP 2013-10-01 19:15:22 +02:00
Thomas Tanghus
8e0b6e45fd Simplify js JSONResponse data assignment 2013-10-01 19:15:22 +02:00
Thomas Tanghus
44a41c184c Tweak groups CSS. Close #212 and #211 2013-10-01 19:15:22 +02:00
Thomas Tanghus
67412f3679 Port controllers to OCP\AppFramework 2013-10-01 19:15:22 +02:00
Thomas Tanghus
cfd8cd02b3 Now loads with OCP\AppFramework 2013-10-01 19:15:22 +02:00
Thomas Tanghus
0aa9559c52 Select contact/range of contacts by Ctrl/Shift-click. Close #200 2013-09-15 19:04:19 +02:00
Thomas Tanghus
4df0905192 Properly size crop dialog. 2013-09-15 00:58:46 +02:00
Thomas Tanghus
9450436336 Fix adding contact inline. 2013-09-14 18:35:44 +02:00
Thomas Tanghus
2aaf58ca78 Animate contact close. 2013-09-14 18:35:44 +02:00
Thomas Tanghus
f919966321 Check if progressbar is initialized before destroying it. 2013-09-14 18:35:44 +02:00
Thomas Tanghus
767d5add75 First step at opening contact inline in the list. #93 2013-09-11 05:50:00 +02:00
Thomas Tanghus
6435ec0393 Check for invalid BDAY in js. Port #194 to master 2013-09-10 21:30:48 +02:00
Thomas Tanghus
b9c5d465a5 Let AddressBookList.add return $.Deferred 2013-09-10 07:18:12 +02:00
Thomas Tanghus
322357dba1 New FileActions script for importing from filesystem. Closes #190 
Needs owncloud/core#4784 to work properly
 2013-09-10 00:30:39 +02:00
Thomas Tanghus
196ad4bd34 Remove outdated comment 2013-09-10 00:30:39 +02:00
Thomas Tanghus
e8d0807fd2 Update contact list on adding/removing to/from groups. Fix #118 2013-09-06 20:33:31 +02:00
Thomas Tanghus
92f99e6925 Don't resolve empty Etags as valid. 2013-09-06 18:16:35 +02:00
Thomas Tanghus
0c23565b85 Force Accept header 2013-09-06 18:15:58 +02:00
Thomas Tanghus
8c3303c760 Cache address books in localStorage. 2013-09-06 06:15:23 +02:00
Thomas Tanghus
feb200bba6 Finally (re)implemented (de)activate address books. Closes #48 2013-09-05 22:08:34 +02:00
Thomas Tanghus
dcb9ad4356 Check for type before pushing to deletion queue. 2013-09-04 20:07:18 +02:00
Thomas Tanghus
8ff09aab27 Move profile photo handling to separate controller 2013-09-04 08:03:33 +02:00
Thomas Tanghus
4cf204fc7a Remove redundant buttons array 2013-09-03 19:26:29 +02:00
Thomas Tanghus
5578d02e4a Don't mark no content as error on status code 204 2013-09-03 19:25:29 +02:00
Thomas Tanghus
31c19e9b57 Don't try to select a group that doesn't exist. 2013-09-03 19:23:43 +02:00
Thomas Tanghus
83d3320339 First iteration of barch deletion #110 2013-09-03 14:09:13 +02:00
Thomas Tanghus
e86669e3bf Small adjustments to photo handling 2013-09-03 14:09:13 +02:00
Thomas Tanghus
5953ec79e8 Update notifier 2013-09-03 14:09:13 +02:00
Thomas Tanghus
b28b1b6560 Remove Jcrop from repo 2013-09-03 14:09:13 +02:00
Thomas Tanghus
4a67ad28ca Improved unit tests and adjust backend method signatures. 2013-08-26 20:10:29 +02:00
Thomas Tanghus
7b4d2fc762 Auto-fill FN from NICKNAME and ORG 2013-08-19 18:57:18 +02:00
Thomas Tanghus
972babf63d Format BDAY according to 'datepickerFormatDate' 2013-08-15 20:11:40 +02:00
Thomas Tanghus
c155faff21 Aha, now jqueryui.progressbar doesn't accept a string as value. 
I wouldn't call that progress...
 2013-08-15 20:11:40 +02:00
Thomas Tanghus
8895b6ff15 No need for progress on an indetermined progressbar. 2013-08-15 20:11:40 +02:00
Thomas Tanghus
0f625797ab Fix showing firstrun when no more contacts. 2013-08-15 20:11:40 +02:00
Thomas Tanghus
8701cfd444 Fix wrong var on error in groups deletion. 2013-08-15 20:11:40 +02:00
Thomas Tanghus
20694185ed Also hide contacts header when there are no contacts. 2013-08-15 20:11:40 +02:00
Nicolas Mora
6f75041b58 use specific branch 2013-08-11 20:41:02 -04:00
Nicolas Mora
fcbb555ab2 personalsettings draft 2013-08-03 22:55:26 -04:00
Thomas Tanghus
6c7fddb91e Give new fields focus. Closes #145 2013-08-01 16:18:03 +02:00
Thomas Tanghus
e86f9c1c72 Don't ignore type INTERNET 2013-08-01 12:13:16 +02:00
Thomas Tanghus
73b3c7346d Fix group/category deletion. 2013-06-27 15:53:31 +02:00
Thomas Tanghus
57e9e42fb3 Removed wrong option to address book multiselect. 2013-06-27 15:53:31 +02:00
Thomas Tanghus
40fb53d074 Remove obsolete TODO 2013-06-27 15:53:31 +02:00
Thomas Tanghus
b77f104447 Improve feedback on import. 2013-06-27 15:53:31 +02:00
raghunayyar
3e291356ef Removes original title directive from Add Group Input. 2013-06-16 16:20:59 +05:30
Thomas Tanghus
8abedf43fc Use ocdialog.modal instead of dimming contactlist. 2013-06-03 17:27:48 +02:00
Thomas Tanghus
3f27ac253b Removed local copy of ocdialog. 2013-06-03 17:27:48 +02:00
Thomas Tanghus
e7531485ec Don't hide toggle checkbox 2013-06-03 17:27:48 +02:00
Thomas Tanghus
fbeeb09266 Move all error message handling to one event handler. 2013-06-03 17:27:48 +02:00
Thomas Tanghus
a6ed5d381b Delete button in contact list. #101 2013-06-02 12:17:43 +02:00
Thomas Tanghus
6c6d2aca8e Don't sort rows twice :P 2013-06-01 18:04:50 +02:00
Thomas Tanghus
bb3012fa0f Add event handler for contact list delete button. Refs #101 2013-06-01 01:26:55 +02:00
Thomas Tanghus
5c90ab6b1c Minor speedups in loading. 2013-06-01 01:26:55 +02:00
Thomas Tanghus
73f8c354a0 Action bar improvements. 2013-05-31 21:32:45 +02:00
Thomas Tanghus
6b82d084d9 Minor speedup on show/hide. 2013-05-31 21:32:45 +02:00
Thomas Tanghus
15cabea73a Attempt to speedup show/hide contacts. Saved for reference. 2013-05-31 21:32:45 +02:00
Thomas Tanghus
d53181bc7a Some IE8 workarounds 2013-05-29 12:56:34 +02:00
Thomas Tanghus
e6bfe1d660 Added TODO 2013-05-26 22:16:43 +02:00
Thomas Tanghus
4dee9ca451 Missing translation 2013-05-26 22:16:43 +02:00
Thomas Tanghus
54a978bd25 Move sorting into ContactList.setSortOrder() 2013-05-26 22:16:43 +02:00
Thomas Tanghus
4dd2fa28c7 Added TODOs 2013-05-26 22:16:43 +02:00
Thomas Tanghus
e5f54d900b Unbind event when closing contact 2013-05-26 22:16:43 +02:00
Thomas Tanghus
62b25af612 Show import select on address book creation. 2013-05-25 01:35:42 +02:00
Thomas Tanghus
c97f498905 Ported export. Fixes #108 2013-05-24 20:35:23 +02:00
Thomas Tanghus
7da79bd071 camelCase template id. 2013-05-24 17:43:01 +02:00
Thomas Tanghus
0d37aaa07d Reenabled URL and EMAIL event handlers. Fix owncloud/contacts#109 2013-05-24 15:30:59 +02:00
Thomas Tanghus
ab7d3f3b19 Also remember to hide First Run... 2013-05-24 03:34:07 +02:00
Thomas Tanghus
2cbbc12ebf Fix fail() handlers 2013-05-24 03:34:07 +02:00
Thomas Tanghus
879cf7c35b JSONResponse didn't set error 2013-05-24 03:34:07 +02:00
Thomas Tanghus
cf2c956e01 Remember First Run if no contacts. 2013-05-24 03:34:06 +02:00
Thomas Tanghus
7c6ee2e45b Fix fail handlers 2013-05-24 03:34:06 +02:00
Thomas Tanghus
eba736a03b Made changing name order ~30% faster. 2013-05-23 21:37:39 +02:00
Thomas Tanghus
d5ad910d57 Made sorting 10 times faster 2013-05-23 21:37:39 +02:00
Thomas Tanghus
6045d85122 Sort order improvements. 2013-05-22 21:44:39 +02:00
Thomas Tanghus
ac61f08534 Code for sorting by last, first/first last/formatted. Ref #63 2013-05-22 05:29:29 +02:00
Thomas Tanghus
ec7b45129e Only add your own contacts to groups. 2013-05-22 05:28:47 +02:00
Thomas Tanghus
494d3944a5 Finish moving contacts between address books/backends. Ref #57 2013-05-22 03:23:24 +02:00
Thomas Tanghus
17dfcbe99c Minot fixes to the addnew plugin. 2013-05-21 23:40:37 +02:00
Thomas Tanghus
e8c7047869 Implement rename group. Refs #97 2013-05-21 23:39:50 +02:00
Thomas Tanghus
18701ef9d9 Select most of picture on crop. Fix #98 2013-05-20 15:11:06 +02:00
Thomas Tanghus
620ea28204 Apply a min-width on contact popup. Fix owncloud/contacts#46 2013-05-20 13:21:12 +02:00
Thomas Tanghus
996597574c Don't keep attaching event. Fix #24 2013-05-19 05:19:58 +02:00
Thomas Tanghus
aab66afb03 Let backend add/remove CATEGORIES instead of firering N requests 2013-05-19 03:16:36 +02:00
Thomas Tanghus
0495f547e7 Don't use central ajax error handler 2013-05-18 05:45:48 +02:00
Thomas Tanghus
cab617f0e0 Implement HTTP Middleware 
Intercept exceptions thrown and return suitable HTTP responses.
 2013-05-18 04:58:41 +02:00
Thomas Tanghus
03ae02c155 Test for contact not being rendered. owncloud/contacts#91 2013-05-16 16:04:16 +02:00
Thomas Tanghus
23b6e074da Proper updating on deletion of contact photo. Fix #77 2013-05-15 01:02:38 +02:00
Thomas Tanghus
3f3d701322 Add meta group "Ungrouped". Refs #28 2013-05-12 21:59:24 +02:00
Thomas Tanghus
5940855319 Don't offer to select address book on import if there's only one 2013-05-11 01:42:09 +02:00
Thomas Tanghus
f9aeec98fd Remove loading gif after groups load 2013-05-11 01:41:24 +02:00
Thomas Tanghus
c8e87021ad Trigger showing contacts in current group after import/address book deletion 2013-05-10 02:15:24 +02:00
Thomas Tanghus
14f84921f5 Get rid of some more integer ids 2013-05-09 21:18:32 +02:00
Thomas Tanghus
06c971c0ec Add an extra check to popstate/hashchange 2013-05-09 06:11:02 +02:00
Thomas Tanghus
4dcaa98c20 Make doc string almost understandable 2013-05-09 05:55:44 +02:00
Thomas Tanghus
a9c1f00152 Binding on popstate gave some weird side effects 2013-05-09 05:54:17 +02:00
Thomas Tanghus
f1322fbe6d We don't use ints for ids anymore! 2013-05-09 05:53:46 +02:00
Thomas Tanghus
10015deb8f Missing variable. 2013-05-08 15:54:55 +02:00
Thomas Tanghus
7eb6a29cd5 Wrong argument to loadGroups 2013-05-08 06:53:33 +02:00
Thomas Tanghus
e7267209ef Backgroung load on import and async load on init. Closes #49 2013-05-08 06:47:36 +02:00
Thomas Tanghus
d1a9a84233 Fix addnew plugin auto close detection 2013-05-07 19:18:46 +02:00
Thomas Tanghus
f76ca64ba4 Add renaming address books. 2013-05-07 19:16:06 +02:00
Thomas Tanghus
f9be55a833 Pixel pushing setting components. 2013-05-07 14:57:59 +02:00
Thomas Tanghus
757bc10216 Contacts: Implement move to address book. Still some rough edges. 2013-05-06 01:49:10 +02:00
Thomas Tanghus
64454d2aba Contacts: Don't check for ID being number. 2013-05-05 16:26:19 +02:00
Thomas Tanghus
7bcd206679 Wrong variable name 2013-05-04 22:45:16 +02:00
Thomas Tanghus
8ee05eb430 Contacts: Get proper metadata on Contact instantiation. 2013-05-04 22:44:23 +02:00
Thomas Tanghus
a1e2b2ec64 Contacts: Add getOwner() and getMetaData() to js AddressBook object. 2013-05-04 22:41:44 +02:00
Thomas Tanghus
d435175b4e Contacts: Save status code and header functions in response object. 2013-05-03 05:56:55 +02:00
Thomas Tanghus
c649b4cbf1 General cleanup 2013-05-03 05:00:50 +02:00
Thomas Tanghus
2bd98c3cb7 Contacts: Use addnew plugin for groups. 2013-05-02 22:01:37 +02:00
Thomas Tanghus
c560af4375 Contacts: Tweak addnew plugin. 2013-05-02 21:59:06 +02:00
Thomas Tanghus
ea7ce48914 Contacts: Get display name from either FN, ORG or EMAIL. 2013-05-02 20:45:52 +02:00
Thomas Tanghus
d4b18987ae Contacts: Abstract js address book access and further simplify import. 2013-05-02 20:42:24 +02:00
Thomas Tanghus
44aebd7111 Contacts: Add widget plugin for easy creation of misc. entries. 2013-05-02 20:42:24 +02:00
Thomas Tanghus
9c6b655c63 Contacts: Start on js AddressBook object 2013-05-02 20:42:23 +02:00
Thomas Tanghus
eef100e7a0 Misc. cleanup 2013-05-01 01:48:12 +02:00
Thomas Tanghus
c3722606ba Contacts: Set a data reference to Contact object on list element 2013-05-01 01:48:11 +02:00
Thomas Tanghus
ea02dab874 Contacts: Move draggable setting to Contact object. 2013-05-01 01:48:11 +02:00
Thomas Tanghus
6c1ff13838 Contacts: Make group adding a little smoother 2013-05-01 01:48:11 +02:00
Thomas Tanghus
1f77d32438 Contacts: Log if load of settings fails 2013-05-01 01:48:11 +02:00
Thomas Tanghus
7da675a1d5 Contacts: Port to new apps styles. 2013-04-30 20:00:33 +02:00
Thomas Tanghus
a7b30d8c5a Contacts: Property parameters wasn't saved 2013-04-27 04:38:28 +02:00
Thomas Tanghus
ec86678dec Contacts: Small steps towards RESTfulness 2013-04-25 04:50:45 +02:00
Thomas Tanghus
5ccd3a04bb Contacts: Remove userid from Storage requests 2013-04-25 04:40:12 +02:00
Thomas Tanghus
6bc6d8f478 Contacts: Fix loading default contact image 2013-04-25 00:59:03 +02:00
Thomas Tanghus
c3fa18e4a7 Merge branch 'contacts_backends' into contacts_oc6 
Conflicts:
	contacts/ajax/categories/add.php
	contacts/ajax/contact/add.php
	contacts/appinfo/app.php
	contacts/appinfo/migrate.php
	contacts/css/contacts.css
	contacts/index.php
	contacts/js/app.js
	contacts/js/contacts.js
	contacts/js/groups.js
	contacts/lib/app.php
	contacts/lib/carddav/addressbook.php
	contacts/lib/sabre/backend.php
	contacts/lib/vcard.php
	contacts/templates/contacts.php
	contacts/thumbnail.php
 2013-04-17 15:07:59 +02:00
Thomas Tanghus
92d0c83574 Contacts: Use octemplate from core. 2013-04-15 22:47:11 +02:00
Thomas Tanghus
13e7448fca Contacts: Prevent double adding address books. Fix #1005 2013-04-12 12:33:25 +02:00
Thomas Tanghus
917a40e4df Contacts: Use done() and fail() from $.ajax() 2013-04-11 15:35:17 +00:00
Thomas Tanghus
bf620ad512 Contacts: Use a more generic error message for failed ajax requests. 2013-04-09 23:19:22 +02:00
Thomas Tanghus
e06f8d04a7 Contacts: Avoid double escape in contact list. Fix #970 2013-04-09 00:46:07 +02:00
Thomas Tanghus
7b977bce45 Contacts: Removed some console.log() 2013-04-08 22:37:37 +02:00
Thomas Tanghus
3c1ee05d53 Contacts: Improved image upload 2013-04-08 22:35:28 +02:00