[commits] Horde branch master updated. 5a021f983ec8c5ea5972293ba801e2b9eccbe8fb

Jan Schneider jan at horde.org
Mon Jul 5 10:38:12 UTC 2010


The branch "master" has been updated.
The following is a summary of the commits.

from: a55a240fee0e6fe4908e44211fd25f70e68a7b2a

79dc94f Move search templates to separate directory.
1deecf3 Modernize javascript.
c99a103 Convert search templates to Horde_View.
6496bd3 Turba_ListView -> Turba_View_List
3c60eac Implement duplicate searching, for now just in the SQL driver.
7857f58 phpdoc
daf7ac7 Improve horde-table layout. Add .horde-block-links.
5ce6076 Add duplicate searching interface. Just list the duplicate counts for now.
2bb7416 Reorganize forms.
2823d84 Move history retrieval to Turba_Object.
4d97125 Style
68a1271 Remove unnecessary source name prefix.
5bfe633 Simplify
6344d04 Tweak .horde-table.
7ab2b24 Display selected set of duplicates and allow to delete them.
f1d2a97 One more border color.
ee158f8 Load attributes, use PHP 5 foreach.
d9b35dd Sort duplicates by modification date. Show duplicates as inline-block. Add merge button.
972c9cd Have a fixed name format, only with the name parts we actually use for duplicate matching.
833c0c5 phpdoc
a85e65c Implement contact merging.
5a021f9 Show success notification.

-----------------------------------------------------------------------

commit 79dc94f3ae2fc21dae0c612a373ec3a744f041fa
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jun 9 19:31:09 2010 +0200

    Move search templates to separate directory.

 turba/search.php                           |   12 ++--
 turba/templates/browse/search.inc          |  131 ----------------------------
 turba/templates/browse/search_criteria.inc |   13 ---
 turba/templates/browse/search_vbook.inc    |   17 ----
 turba/templates/search/advanced.inc        |   31 +++++++
 turba/templates/search/basic.inc           |   53 +++++++++++
 turba/templates/search/header.inc          |   54 ++++++++++++
 turba/templates/search/vbook.inc           |   17 ++++
 8 files changed, 161 insertions(+), 167 deletions(-)
 delete mode 100644 turba/templates/browse/search.inc
 delete mode 100644 turba/templates/browse/search_criteria.inc
 delete mode 100644 turba/templates/browse/search_vbook.inc
 create mode 100644 turba/templates/search/advanced.inc
 create mode 100644 turba/templates/search/basic.inc
 create mode 100644 turba/templates/search/header.inc
 create mode 100644 turba/templates/search/vbook.inc

http://git.horde.org/diff.php/turba/search.php?rt=horde-git&r1=76c1c091e8c027ce77dea8d76ceb2fef5d4cecb4&r2=79dc94f3ae2fc21dae0c612a373ec3a744f041fa
http://git.horde.org/diff.php/turba/templates/browse/search.inc?rt=horde-git&r1=f778227e6aa6b4b7f5031c86c655304f4a18b635&r2=79dc94f3ae2fc21dae0c612a373ec3a744f041fa
http://git.horde.org/diff.php/turba/templates/browse/search_criteria.inc?rt=horde-git&r1=99d3ec3de78ee8fb862d211e2b330747a31aac23&r2=79dc94f3ae2fc21dae0c612a373ec3a744f041fa
http://git.horde.org/diff.php/turba/templates/browse/search_vbook.inc?rt=horde-git&r1=99d3ec3de78ee8fb862d211e2b330747a31aac23&r2=79dc94f3ae2fc21dae0c612a373ec3a744f041fa
http://git.horde.org/co.php/turba/templates/search/advanced.inc?rt=horde-git&r=79dc94f3ae2fc21dae0c612a373ec3a744f041fa
http://git.horde.org/co.php/turba/templates/search/basic.inc?rt=horde-git&r=79dc94f3ae2fc21dae0c612a373ec3a744f041fa
http://git.horde.org/co.php/turba/templates/search/header.inc?rt=horde-git&r=79dc94f3ae2fc21dae0c612a373ec3a744f041fa
http://git.horde.org/co.php/turba/templates/search/vbook.inc?rt=horde-git&r=79dc94f3ae2fc21dae0c612a373ec3a744f041fa

-----------------------------------------------------------------------

commit 1deecf3d614527f672bcdb27c299498289201a31
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jun 9 23:44:17 2010 +0200

    Modernize javascript.

 turba/js/search.js                       |   40 +++++++++++++++++++++++++++++
 turba/search.php                         |    1 +
 turba/templates/search/advanced.html.php |   31 ++++++++++++++++++++++
 turba/templates/search/advanced.inc      |   31 ----------------------
 turba/templates/search/basic.inc         |   41 +++---------------------------
 turba/templates/search/header.inc        |   14 +++------
 6 files changed, 81 insertions(+), 77 deletions(-)
 create mode 100644 turba/js/search.js
 create mode 100644 turba/templates/search/advanced.html.php
 delete mode 100644 turba/templates/search/advanced.inc

http://git.horde.org/co.php/turba/js/search.js?rt=horde-git&r=1deecf3d614527f672bcdb27c299498289201a31
http://git.horde.org/diff.php/turba/search.php?rt=horde-git&r1=79dc94f3ae2fc21dae0c612a373ec3a744f041fa&r2=1deecf3d614527f672bcdb27c299498289201a31
http://git.horde.org/co.php/turba/templates/search/advanced.html.php?rt=horde-git&r=1deecf3d614527f672bcdb27c299498289201a31
http://git.horde.org/diff.php/turba/templates/search/advanced.inc?rt=horde-git&r1=79dc94f3ae2fc21dae0c612a373ec3a744f041fa&r2=1deecf3d614527f672bcdb27c299498289201a31
http://git.horde.org/diff.php/turba/templates/search/basic.inc?rt=horde-git&r1=79dc94f3ae2fc21dae0c612a373ec3a744f041fa&r2=1deecf3d614527f672bcdb27c299498289201a31
http://git.horde.org/diff.php/turba/templates/search/header.inc?rt=horde-git&r1=79dc94f3ae2fc21dae0c612a373ec3a744f041fa&r2=1deecf3d614527f672bcdb27c299498289201a31

-----------------------------------------------------------------------

commit c99a10307d4be1f21e51ad56c80c1455b192ef8b
Author: Jan Schneider <jan at horde.org>
Date:   Thu Jun 10 00:48:17 2010 +0200

    Convert search templates to Horde_View.

 turba/search.php                         |   66 +++++++++++++++++++++++++----
 turba/templates/search/advanced.html.php |   30 ++++++-------
 turba/templates/search/basic.html.php    |   25 +++++++++++
 turba/templates/search/basic.inc         |   20 ---------
 turba/templates/search/header.html.php   |    6 +++
 turba/templates/search/header.inc        |   50 ----------------------
 turba/templates/search/vbook.html.php    |   17 ++++++++
 turba/templates/search/vbook.inc         |   17 --------
 8 files changed, 119 insertions(+), 112 deletions(-)
 create mode 100644 turba/templates/search/basic.html.php
 delete mode 100644 turba/templates/search/basic.inc
 create mode 100644 turba/templates/search/header.html.php
 delete mode 100644 turba/templates/search/header.inc
 create mode 100644 turba/templates/search/vbook.html.php
 delete mode 100644 turba/templates/search/vbook.inc

http://git.horde.org/diff.php/turba/search.php?rt=horde-git&r1=1deecf3d614527f672bcdb27c299498289201a31&r2=c99a10307d4be1f21e51ad56c80c1455b192ef8b
http://git.horde.org/diff.php/turba/templates/search/advanced.html.php?rt=horde-git&r1=1deecf3d614527f672bcdb27c299498289201a31&r2=c99a10307d4be1f21e51ad56c80c1455b192ef8b
http://git.horde.org/co.php/turba/templates/search/basic.html.php?rt=horde-git&r=c99a10307d4be1f21e51ad56c80c1455b192ef8b
http://git.horde.org/diff.php/turba/templates/search/basic.inc?rt=horde-git&r1=1deecf3d614527f672bcdb27c299498289201a31&r2=c99a10307d4be1f21e51ad56c80c1455b192ef8b
http://git.horde.org/co.php/turba/templates/search/header.html.php?rt=horde-git&r=c99a10307d4be1f21e51ad56c80c1455b192ef8b
http://git.horde.org/diff.php/turba/templates/search/header.inc?rt=horde-git&r1=1deecf3d614527f672bcdb27c299498289201a31&r2=c99a10307d4be1f21e51ad56c80c1455b192ef8b
http://git.horde.org/co.php/turba/templates/search/vbook.html.php?rt=horde-git&r=c99a10307d4be1f21e51ad56c80c1455b192ef8b
http://git.horde.org/diff.php/turba/templates/search/vbook.inc?rt=horde-git&r1=79dc94f3ae2fc21dae0c612a373ec3a744f041fa&r2=c99a10307d4be1f21e51ad56c80c1455b192ef8b

-----------------------------------------------------------------------

commit 6496bd32f49e7be1b0c21e13f2d3981393414dec
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jul 2 13:16:17 2010 +0200

    Turba_ListView -> Turba_View_List

 turba/lib/Forms/EditContact.php  |    4 +-
 turba/lib/ListView.php           |  500 --------------------------------------
 turba/lib/View/Browse.php        |    4 +-
 turba/lib/View/List.php          |  500 ++++++++++++++++++++++++++++++++++++++
 turba/lib/tests/ListViewTest.php |   14 +-
 turba/lib/tests/ViewListTest.php |   87 +++++++
 turba/search.php                 |    2 +-
 7 files changed, 598 insertions(+), 513 deletions(-)
 delete mode 100644 turba/lib/ListView.php
 create mode 100644 turba/lib/View/List.php
 create mode 100644 turba/lib/tests/ViewListTest.php

http://git.horde.org/diff.php/turba/lib/Forms/EditContact.php?rt=horde-git&r1=240ff73e2a3bcfe5e5649e5d9153d87b25471d36&r2=6496bd32f49e7be1b0c21e13f2d3981393414dec
http://git.horde.org/diff.php/turba/lib/ListView.php?rt=horde-git&r1=97fd203dcaaf5ddf7c9c2252eb44ac76e8d84846&r2=6496bd32f49e7be1b0c21e13f2d3981393414dec
http://git.horde.org/diff.php/turba/lib/View/Browse.php?rt=horde-git&r1=76c1c091e8c027ce77dea8d76ceb2fef5d4cecb4&r2=6496bd32f49e7be1b0c21e13f2d3981393414dec
http://git.horde.org/co.php/turba/lib/View/List.php?rt=horde-git&r=6496bd32f49e7be1b0c21e13f2d3981393414dec
http://git.horde.org/diff.php/turba/lib/tests/ListViewTest.php?rt=horde-git&r1=99d3ec3de78ee8fb862d211e2b330747a31aac23&r2=6496bd32f49e7be1b0c21e13f2d3981393414dec
http://git.horde.org/co.php/turba/lib/tests/ViewListTest.php?rt=horde-git&r=6496bd32f49e7be1b0c21e13f2d3981393414dec
http://git.horde.org/diff.php/turba/search.php?rt=horde-git&r1=c99a10307d4be1f21e51ad56c80c1455b192ef8b&r2=6496bd32f49e7be1b0c21e13f2d3981393414dec

-----------------------------------------------------------------------

commit 3c60eac4dad06d6d64c466a8816c9b1975a39356
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jul 2 15:56:17 2010 +0200

    Implement duplicate searching, for now just in the SQL driver.

 turba/lib/Driver.php       |   25 +++++++-
 turba/lib/Driver/Share.php |   17 +++++
 turba/lib/Driver/Sql.php   |  145 +++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 183 insertions(+), 4 deletions(-)

http://git.horde.org/diff.php/turba/lib/Driver.php?rt=horde-git&r1=335be6897f6175e840cc3460eadcc849a7127918&r2=3c60eac4dad06d6d64c466a8816c9b1975a39356
http://git.horde.org/diff.php/turba/lib/Driver/Share.php?rt=horde-git&r1=4343b7a9079e436ff77770deb9adb6b1f38cc29c&r2=3c60eac4dad06d6d64c466a8816c9b1975a39356
http://git.horde.org/diff.php/turba/lib/Driver/Sql.php?rt=horde-git&r1=4343b7a9079e436ff77770deb9adb6b1f38cc29c&r2=3c60eac4dad06d6d64c466a8816c9b1975a39356

-----------------------------------------------------------------------

commit 7857f589b7a93fbd3a78a5a7d2aa70f54ceacdd9
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jul 2 15:57:40 2010 +0200

    phpdoc

 turba/lib/List.php      |    8 ++++----
 turba/lib/View/List.php |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

http://git.horde.org/diff.php/turba/lib/List.php?rt=horde-git&r1=99d3ec3de78ee8fb862d211e2b330747a31aac23&r2=7857f589b7a93fbd3a78a5a7d2aa70f54ceacdd9
http://git.horde.org/diff.php/turba/lib/View/List.php?rt=horde-git&r1=6496bd32f49e7be1b0c21e13f2d3981393414dec&r2=7857f589b7a93fbd3a78a5a7d2aa70f54ceacdd9

-----------------------------------------------------------------------

commit daf7ac7c9af83e278d5110a4a07c3572dc69f3f4
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jul 2 16:01:50 2010 +0200

    Improve horde-table layout.
    Add .horde-block-links.

 horde/themes/screen.css |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/horde/themes/screen.css?rt=horde-git&r1=45d58456f24b121efb9d4082306dbe93076b7172&r2=daf7ac7c9af83e278d5110a4a07c3572dc69f3f4

-----------------------------------------------------------------------

commit 5ce60768185fb85f1d89ac453670c05b4fbf4c2a
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jul 2 16:03:17 2010 +0200

    Add duplicate searching interface. Just list the duplicate counts for now.

 turba/lib/View/Duplicates.php                  |   56 ++++++++++++++++++++++++
 turba/search.php                               |   51 +++++++++++++++------
 turba/templates/search/duplicate.html.php      |   11 +++++
 turba/templates/search/duplicate_list.html.php |   20 ++++++++
 4 files changed, 123 insertions(+), 15 deletions(-)
 create mode 100644 turba/lib/View/Duplicates.php
 create mode 100644 turba/templates/search/duplicate.html.php
 create mode 100644 turba/templates/search/duplicate_list.html.php

http://git.horde.org/co.php/turba/lib/View/Duplicates.php?rt=horde-git&r=5ce60768185fb85f1d89ac453670c05b4fbf4c2a
http://git.horde.org/diff.php/turba/search.php?rt=horde-git&r1=6496bd32f49e7be1b0c21e13f2d3981393414dec&r2=5ce60768185fb85f1d89ac453670c05b4fbf4c2a
http://git.horde.org/co.php/turba/templates/search/duplicate.html.php?rt=horde-git&r=5ce60768185fb85f1d89ac453670c05b4fbf4c2a
http://git.horde.org/co.php/turba/templates/search/duplicate_list.html.php?rt=horde-git&r=5ce60768185fb85f1d89ac453670c05b4fbf4c2a

-----------------------------------------------------------------------

commit 2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jul 2 17:42:39 2010 +0200

    Reorganize forms.

 turba/add.php                         |    4 +-
 turba/addressbooks/create.php         |    4 +-
 turba/addressbooks/delete.php         |    4 +-
 turba/addressbooks/edit.php           |    4 +-
 turba/edit.php                        |    6 +-
 turba/lib/Form/AddContact.php         |   94 ++++++++++++++++
 turba/lib/Form/Contact.php            |  106 ++++++++++++++++++
 turba/lib/Form/CreateAddressBook.php  |   48 ++++++++
 turba/lib/Form/DeleteAddressBook.php  |   84 ++++++++++++++
 turba/lib/Form/EditAddressBook.php    |   48 ++++++++
 turba/lib/Form/EditContact.php        |   89 +++++++++++++++
 turba/lib/Form/EditContactGroup.php   |   95 ++++++++++++++++
 turba/lib/Forms/AddContact.php        |  101 -----------------
 turba/lib/Forms/Contact.php           |  113 -------------------
 turba/lib/Forms/CreateAddressBook.php |   51 ---------
 turba/lib/Forms/DeleteAddressBook.php |   87 ---------------
 turba/lib/Forms/EditAddressBook.php   |   51 ---------
 turba/lib/Forms/EditContact.php       |  191 ---------------------------------
 turba/lib/View/Contact.php            |    5 +-
 turba/lib/View/EditContact.php        |    5 +-
 20 files changed, 572 insertions(+), 618 deletions(-)
 create mode 100644 turba/lib/Form/AddContact.php
 create mode 100644 turba/lib/Form/Contact.php
 create mode 100644 turba/lib/Form/CreateAddressBook.php
 create mode 100644 turba/lib/Form/DeleteAddressBook.php
 create mode 100644 turba/lib/Form/EditAddressBook.php
 create mode 100644 turba/lib/Form/EditContact.php
 create mode 100644 turba/lib/Form/EditContactGroup.php
 delete mode 100644 turba/lib/Forms/AddContact.php
 delete mode 100644 turba/lib/Forms/Contact.php
 delete mode 100644 turba/lib/Forms/CreateAddressBook.php
 delete mode 100644 turba/lib/Forms/DeleteAddressBook.php
 delete mode 100644 turba/lib/Forms/EditAddressBook.php
 delete mode 100644 turba/lib/Forms/EditContact.php

http://git.horde.org/diff.php/turba/add.php?rt=horde-git&r1=b23cc31ca5d964fd8f9be807871eb0595aee63d9&r2=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/diff.php/turba/addressbooks/create.php?rt=horde-git&r1=4343b7a9079e436ff77770deb9adb6b1f38cc29c&r2=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/diff.php/turba/addressbooks/delete.php?rt=horde-git&r1=4343b7a9079e436ff77770deb9adb6b1f38cc29c&r2=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/diff.php/turba/addressbooks/edit.php?rt=horde-git&r1=4343b7a9079e436ff77770deb9adb6b1f38cc29c&r2=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/diff.php/turba/edit.php?rt=horde-git&r1=b23cc31ca5d964fd8f9be807871eb0595aee63d9&r2=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/co.php/turba/lib/Form/AddContact.php?rt=horde-git&r=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/co.php/turba/lib/Form/Contact.php?rt=horde-git&r=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/co.php/turba/lib/Form/CreateAddressBook.php?rt=horde-git&r=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/co.php/turba/lib/Form/DeleteAddressBook.php?rt=horde-git&r=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/co.php/turba/lib/Form/EditAddressBook.php?rt=horde-git&r=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/co.php/turba/lib/Form/EditContact.php?rt=horde-git&r=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/co.php/turba/lib/Form/EditContactGroup.php?rt=horde-git&r=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/diff.php/turba/lib/Forms/AddContact.php?rt=horde-git&r1=240ff73e2a3bcfe5e5649e5d9153d87b25471d36&r2=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/diff.php/turba/lib/Forms/Contact.php?rt=horde-git&r1=faf51e191e49f34292e1ce5a5cc8f499421f3038&r2=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/diff.php/turba/lib/Forms/CreateAddressBook.php?rt=horde-git&r1=283b143b7ab4b1ea4097530b7889e526eafe394e&r2=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/diff.php/turba/lib/Forms/DeleteAddressBook.php?rt=horde-git&r1=4343b7a9079e436ff77770deb9adb6b1f38cc29c&r2=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/diff.php/turba/lib/Forms/EditAddressBook.php?rt=horde-git&r1=99d3ec3de78ee8fb862d211e2b330747a31aac23&r2=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/diff.php/turba/lib/Forms/EditContact.php?rt=horde-git&r1=6496bd32f49e7be1b0c21e13f2d3981393414dec&r2=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/diff.php/turba/lib/View/Contact.php?rt=horde-git&r1=4343b7a9079e436ff77770deb9adb6b1f38cc29c&r2=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26
http://git.horde.org/diff.php/turba/lib/View/EditContact.php?rt=horde-git&r1=afeaee6e47588633ee5aa9f04592033d6e46ba85&r2=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26

-----------------------------------------------------------------------

commit 2823d84224434bad25cb14b8bd3fadcde117208f
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jul 2 18:11:00 2010 +0200

    Move history retrieval to Turba_Object.

 turba/lib/Object.php       |   53 ++++++++++++++++++++++++++++++++++++++++++++
 turba/lib/View/Contact.php |   37 +++++------------------------
 2 files changed, 60 insertions(+), 30 deletions(-)

http://git.horde.org/diff.php/turba/lib/Object.php?rt=horde-git&r1=f5399cbe5655d87958e9c0a10c42938573bdec28&r2=2823d84224434bad25cb14b8bd3fadcde117208f
http://git.horde.org/diff.php/turba/lib/View/Contact.php?rt=horde-git&r1=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26&r2=2823d84224434bad25cb14b8bd3fadcde117208f

-----------------------------------------------------------------------

commit 4d97125e7a28f2bf0b9e20f80f07e06caf23f113
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jul 2 19:33:09 2010 +0200

    Style

 turba/lib/Object.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

http://git.horde.org/diff.php/turba/lib/Object.php?rt=horde-git&r1=2823d84224434bad25cb14b8bd3fadcde117208f&r2=4d97125e7a28f2bf0b9e20f80f07e06caf23f113

-----------------------------------------------------------------------

commit 68a127186657602118e00f1c10a05e042d4585c9
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jul 2 21:59:20 2010 +0200

    Remove unnecessary source name prefix.

 turba/lib/Driver/Share.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/turba/lib/Driver/Share.php?rt=horde-git&r1=3c60eac4dad06d6d64c466a8816c9b1975a39356&r2=68a127186657602118e00f1c10a05e042d4585c9

-----------------------------------------------------------------------

commit 5bfe6334b67c110636716c4b6225cea8e4fe2b80
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jul 2 22:02:25 2010 +0200

    Simplify

 turba/lib/Object.php |   26 +++++---------------------
 1 files changed, 5 insertions(+), 21 deletions(-)

http://git.horde.org/diff.php/turba/lib/Object.php?rt=horde-git&r1=4d97125e7a28f2bf0b9e20f80f07e06caf23f113&r2=5bfe6334b67c110636716c4b6225cea8e4fe2b80

-----------------------------------------------------------------------

commit 6344d0491c2ab391b4c006811a5d2e3e8204a7b7
Author: Jan Schneider <jan at horde.org>
Date:   Sat Jul 3 00:16:42 2010 +0200

    Tweak .horde-table.

 horde/themes/silver/screen.css |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/horde/themes/silver/screen.css?rt=horde-git&r1=2d8c1cd19029f1b0a97b12974cd1d8b635eaedc3&r2=6344d0491c2ab391b4c006811a5d2e3e8204a7b7

-----------------------------------------------------------------------

commit 7ab2b244936de50db86beeeb9ec729d2b0d6a760
Author: Jan Schneider <jan at horde.org>
Date:   Sat Jul 3 00:18:29 2010 +0200

    Display selected set of duplicates and allow to delete them.

 turba/lib/Form/Contact.php                               |   12 ++-
 turba/lib/View/DeleteContact.php                         |    1 +
 turba/lib/View/Duplicates.php                            |   66 +++++++++++++-
 turba/search.php                                         |   16 +++-
 turba/templates/search/duplicate/contact_footer.html.php |    1 +
 turba/templates/search/duplicate/contact_header.html.php |   13 +++
 turba/templates/search/duplicate/footer.html.php         |    1 +
 turba/templates/search/duplicate/header.html.php         |    3 +
 turba/templates/search/duplicate/list.html.php           |   23 +++++
 turba/templates/search/duplicate_list.html.php           |   20 ----
 turba/themes/screen.css                                  |   14 +++
 11 files changed, 137 insertions(+), 33 deletions(-)
 create mode 100644 turba/templates/search/duplicate/contact_footer.html.php
 create mode 100644 turba/templates/search/duplicate/contact_header.html.php
 create mode 100644 turba/templates/search/duplicate/footer.html.php
 create mode 100644 turba/templates/search/duplicate/header.html.php
 create mode 100644 turba/templates/search/duplicate/list.html.php
 delete mode 100644 turba/templates/search/duplicate_list.html.php

http://git.horde.org/diff.php/turba/lib/Form/Contact.php?rt=horde-git&r1=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26&r2=7ab2b244936de50db86beeeb9ec729d2b0d6a760
http://git.horde.org/diff.php/turba/lib/View/DeleteContact.php?rt=horde-git&r1=afeaee6e47588633ee5aa9f04592033d6e46ba85&r2=7ab2b244936de50db86beeeb9ec729d2b0d6a760
http://git.horde.org/diff.php/turba/lib/View/Duplicates.php?rt=horde-git&r1=5ce60768185fb85f1d89ac453670c05b4fbf4c2a&r2=7ab2b244936de50db86beeeb9ec729d2b0d6a760
http://git.horde.org/diff.php/turba/search.php?rt=horde-git&r1=5ce60768185fb85f1d89ac453670c05b4fbf4c2a&r2=7ab2b244936de50db86beeeb9ec729d2b0d6a760
http://git.horde.org/co.php/turba/templates/search/duplicate/contact_footer.html.php?rt=horde-git&r=7ab2b244936de50db86beeeb9ec729d2b0d6a760
http://git.horde.org/co.php/turba/templates/search/duplicate/contact_header.html.php?rt=horde-git&r=7ab2b244936de50db86beeeb9ec729d2b0d6a760
http://git.horde.org/co.php/turba/templates/search/duplicate/footer.html.php?rt=horde-git&r=7ab2b244936de50db86beeeb9ec729d2b0d6a760
http://git.horde.org/co.php/turba/templates/search/duplicate/header.html.php?rt=horde-git&r=7ab2b244936de50db86beeeb9ec729d2b0d6a760
http://git.horde.org/co.php/turba/templates/search/duplicate/list.html.php?rt=horde-git&r=7ab2b244936de50db86beeeb9ec729d2b0d6a760
http://git.horde.org/diff.php/turba/templates/search/duplicate_list.html.php?rt=horde-git&r1=5ce60768185fb85f1d89ac453670c05b4fbf4c2a&r2=7ab2b244936de50db86beeeb9ec729d2b0d6a760
http://git.horde.org/diff.php/turba/themes/screen.css?rt=horde-git&r1=a349de9ba92bc4e879b46b6e955f59f134ec4c07&r2=7ab2b244936de50db86beeeb9ec729d2b0d6a760

-----------------------------------------------------------------------

commit f1d2a97bbb70ac91952a6a8904a6cb007cd90f15
Author: Jan Schneider <jan at horde.org>
Date:   Sat Jul 3 00:20:36 2010 +0200

    One more border color.

 horde/themes/silver/screen.css |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/horde/themes/silver/screen.css?rt=horde-git&r1=6344d0491c2ab391b4c006811a5d2e3e8204a7b7&r2=f1d2a97bbb70ac91952a6a8904a6cb007cd90f15

-----------------------------------------------------------------------

commit ee158f8e2df3074c3c129d3862d356e829426edf
Author: Jan Schneider <jan at horde.org>
Date:   Sun Jul 4 17:18:11 2010 +0200

    Load attributes, use PHP 5 foreach.

 turba/lib/List.php |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

http://git.horde.org/diff.php/turba/lib/List.php?rt=horde-git&r1=7857f589b7a93fbd3a78a5a7d2aa70f54ceacdd9&r2=ee158f8e2df3074c3c129d3862d356e829426edf

-----------------------------------------------------------------------

commit d9b35dddc50bbb413e3975068a8285ecb22ca995
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jul 5 11:52:57 2010 +0200

    Sort duplicates by modification date.
    Show duplicates as inline-block.
    Add merge button.

 turba/lib/Object.php                                     |   36 ++++++++++++
 turba/lib/View/Duplicates.php                            |    7 +++
 turba/templates/search/duplicate/contact_header.html.php |   39 ++++++++++----
 turba/themes/ie6_or_less.css                             |    9 +++
 turba/themes/ie7.css                                     |    9 +++
 turba/themes/screen.css                                  |   12 ++++-
 6 files changed, 100 insertions(+), 12 deletions(-)
 create mode 100644 turba/themes/ie6_or_less.css
 create mode 100644 turba/themes/ie7.css

http://git.horde.org/diff.php/turba/lib/Object.php?rt=horde-git&r1=5bfe6334b67c110636716c4b6225cea8e4fe2b80&r2=d9b35dddc50bbb413e3975068a8285ecb22ca995
http://git.horde.org/diff.php/turba/lib/View/Duplicates.php?rt=horde-git&r1=7ab2b244936de50db86beeeb9ec729d2b0d6a760&r2=d9b35dddc50bbb413e3975068a8285ecb22ca995
http://git.horde.org/diff.php/turba/templates/search/duplicate/contact_header.html.php?rt=horde-git&r1=7ab2b244936de50db86beeeb9ec729d2b0d6a760&r2=d9b35dddc50bbb413e3975068a8285ecb22ca995
http://git.horde.org/co.php/turba/themes/ie6_or_less.css?rt=horde-git&r=d9b35dddc50bbb413e3975068a8285ecb22ca995
http://git.horde.org/co.php/turba/themes/ie7.css?rt=horde-git&r=d9b35dddc50bbb413e3975068a8285ecb22ca995
http://git.horde.org/diff.php/turba/themes/screen.css?rt=horde-git&r1=7ab2b244936de50db86beeeb9ec729d2b0d6a760&r2=d9b35dddc50bbb413e3975068a8285ecb22ca995

-----------------------------------------------------------------------

commit 972c9cde16a2aed699ecaf71fa2da946fe49f475
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jul 5 12:20:20 2010 +0200

    Have a fixed name format, only with the name parts we actually use for
    duplicate matching.

 turba/lib/Driver/Sql.php |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/turba/lib/Driver/Sql.php?rt=horde-git&r1=3c60eac4dad06d6d64c466a8816c9b1975a39356&r2=972c9cde16a2aed699ecaf71fa2da946fe49f475

-----------------------------------------------------------------------

commit 833c0c52de8324e1d0e6dce3b2f1e467de14ff91
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jul 5 12:22:07 2010 +0200

    phpdoc

 turba/lib/Turba.php |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/turba/lib/Turba.php?rt=horde-git&r1=687b1004bfd0666758e3f5785f91ab867ffd2bb1&r2=833c0c52de8324e1d0e6dce3b2f1e467de14ff91

-----------------------------------------------------------------------

commit a85e65cacb497253afbf558a31e439fc8d265ae4
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jul 5 12:34:25 2010 +0200

    Implement contact merging.

 turba/docs/CHANGES                                       |    1 +
 turba/edit.php                                           |    7 ++-
 turba/lib/Object.php                                     |   15 ++++
 turba/lib/View/Duplicates.php                            |    7 ++-
 turba/merge.php                                          |   50 ++++++++++++++
 turba/templates/search/duplicate/contact_header.html.php |    5 +-
 6 files changed, 79 insertions(+), 6 deletions(-)
 create mode 100644 turba/merge.php

http://git.horde.org/diff.php/turba/docs/CHANGES?rt=horde-git&r1=d4491e6b4e0f9ddfd81193f5bed0d914b41a994b&r2=a85e65cacb497253afbf558a31e439fc8d265ae4
http://git.horde.org/diff.php/turba/edit.php?rt=horde-git&r1=2bb7416f9fa0ba83dd402aa19bd3286e0fc96c26&r2=a85e65cacb497253afbf558a31e439fc8d265ae4
http://git.horde.org/diff.php/turba/lib/Object.php?rt=horde-git&r1=d9b35dddc50bbb413e3975068a8285ecb22ca995&r2=a85e65cacb497253afbf558a31e439fc8d265ae4
http://git.horde.org/diff.php/turba/lib/View/Duplicates.php?rt=horde-git&r1=d9b35dddc50bbb413e3975068a8285ecb22ca995&r2=a85e65cacb497253afbf558a31e439fc8d265ae4
http://git.horde.org/co.php/turba/merge.php?rt=horde-git&r=a85e65cacb497253afbf558a31e439fc8d265ae4
http://git.horde.org/diff.php/turba/templates/search/duplicate/contact_header.html.php?rt=horde-git&r1=d9b35dddc50bbb413e3975068a8285ecb22ca995&r2=a85e65cacb497253afbf558a31e439fc8d265ae4

-----------------------------------------------------------------------

commit 5a021f983ec8c5ea5972293ba801e2b9eccbe8fb
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jul 5 12:37:06 2010 +0200

    Show success notification.

 turba/merge.php |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/turba/merge.php?rt=horde-git&r1=a85e65cacb497253afbf558a31e439fc8d265ae4&r2=5a021f983ec8c5ea5972293ba801e2b9eccbe8fb




More information about the commits mailing list