[commits] Horde branch trean_tags updated. d3344f1e96458a2f1051c2a71cda0d67b76de53e

[Chuck Hagenbuch]

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

from: b70b9262c5e0cbed8f25d809b4a23a5e92bbc996

6567701 Start reworking trean migrations to support migrating from Trean 1.x data.
d3344f1 Centralize the bookmarklet and include it on the "no bookmarks yet" screen explicitly.

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

commit 656770184104fcd1e49708a3915e6084adb5894c
Author: Chuck Hagenbuch <chuck at horde.org>
Date:   Sun Nov 13 14:23:50 2011 -0500

    Start reworking trean migrations to support migrating from Trean 1.x data.
    
    This works, except the folders-to-tags transition is skipped entirely.

 trean/migration/1_trean_base_tables.php                  |   20 ++---
 trean/migration/2_add_bookmark_dt.php                    |   33 --------
 trean/migration/2_trean_upgrade_folders_to_tags_pre.php  |   57 ++++++++++++++
 trean/migration/3_add_user_id.php                        |   33 --------
 trean/migration/3_trean_upgrade_folders_to_tags.php      |   30 +++++++
 trean/migration/4_trean_upgrade_folders_to_tags_post.php |   36 +++++++++
 6 files changed, 130 insertions(+), 79 deletions(-)
 delete mode 100644 trean/migration/2_add_bookmark_dt.php
 create mode 100644 trean/migration/2_trean_upgrade_folders_to_tags_pre.php
 delete mode 100644 trean/migration/3_add_user_id.php
 create mode 100644 trean/migration/3_trean_upgrade_folders_to_tags.php
 create mode 100644 trean/migration/4_trean_upgrade_folders_to_tags_post.php

http://git.horde.org/horde-git/-/commit/656770184104fcd1e49708a3915e6084adb5894c

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

commit d3344f1e96458a2f1051c2a71cda0d67b76de53e
Author: Chuck Hagenbuch <chuck at horde.org>
Date:   Sun Nov 13 14:44:37 2011 -0500

    Centralize the bookmarklet and include it on the "no bookmarks yet" screen explicitly.

 trean/templates/add.html.php    |    9 ++++-----
 trean/templates/bookmarklet.php |    4 ++++
 trean/templates/browse.php      |    3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 trean/templates/bookmarklet.php

http://git.horde.org/horde-git/-/commit/d3344f1e96458a2f1051c2a71cda0d67b76de53e