The branch "master" has been updated. The following is a summary of the commits.
from: 87af97050871689bc86c162bc8886f92e8422172 d152b87 Print the migration direction only once. 3e11c14 Add ActiveSync migrations. ad624fb Add bingbot. 1e6fa3d Remove horde_alarms and upgrade scripts. d111a10 Add migrations. c7d79b9 Convert horde_cache to migrations. 96fea2c Convert Horde_Group to migrations. c0c18d9 Convert Horde_History to migrations. 83f40d1 Merge branch 'master' of dev.horde.org:/horde/git/horde 107f4b2 Remove after resolving conflict. ----------------------------------------------------------------------- commit d152b872482e9181ebf56215557146438c92217b Author: Jan Schneider <[email protected]> Date: Wed Jan 26 19:20:19 2011 +0100 Print the migration direction only once. horde/bin/db_migrate | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/d152b872482e9181ebf56215557146438c92217b ----------------------------------------------------------------------- commit 3e11c1467c4d003220b5e1e0f38bd1207fc7ed81 Author: Jan Schneider <[email protected]> Date: Wed Jan 26 21:10:13 2011 +0100 Add ActiveSync migrations. .../migration/Horde/ActiveSync/1_horde_activesync_base_tables.php | 63 +++++ horde/scripts/sql/horde_activesync.mssql.sql | 54 ---- horde/scripts/sql/horde_activesync.mysql.sql | 48 ---- horde/scripts/sql/horde_activesync.oci8.sql | 49 ---- horde/scripts/sql/horde_activesync.pgsql.sql | 50 ---- horde/scripts/sql/horde_activesync.sql | 49 ---- 6 files changed, 63 insertions(+), 250 deletions(-) create mode 100644 framework/ActiveSync/migration/Horde/ActiveSync/1_horde_activesync_base_tables.php delete mode 100644 horde/scripts/sql/horde_activesync.mssql.sql delete mode 100644 horde/scripts/sql/horde_activesync.mysql.sql delete mode 100644 horde/scripts/sql/horde_activesync.oci8.sql delete mode 100644 horde/scripts/sql/horde_activesync.pgsql.sql delete mode 100644 horde/scripts/sql/horde_activesync.sql http://git.horde.org/horde-git/-/commit/3e11c1467c4d003220b5e1e0f38bd1207fc7ed81 ----------------------------------------------------------------------- commit ad624fbecd376437007bdd01328f72466bcccd6b Author: Jan Schneider <[email protected]> Date: Wed Jan 26 21:16:29 2011 +0100 Add bingbot. framework/Browser/lib/Horde/Browser.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/ad624fbecd376437007bdd01328f72466bcccd6b ----------------------------------------------------------------------- commit 1e6fa3def74eb25b9f8c90a795c2508b1965fca8 Author: Jan Schneider <[email protected]> Date: Wed Jan 26 21:20:44 2011 +0100 Remove horde_alarms and upgrade scripts. horde/scripts/sql/horde_alarms.mssql.sql | 24 ----- horde/scripts/sql/horde_alarms.oci8.sql | 23 ---- horde/scripts/sql/horde_alarms.pgsql.sql | 23 ---- horde/scripts/sql/horde_alarms.sql | 24 ----- horde/scripts/upgrades/2007-02-21_horde_alarms_primary.sql | 2 - horde/scripts/upgrades/2007-04-25_horde_alarms_drop_primary.sql | 2 - horde/scripts/upgrades/2007-05-24_horde_alarms_add_dismissed.sql | 2 - horde/scripts/upgrades/2010-05-11_horde_activesync_adduserkey.sql | 18 --- .../upgrades/2010-06-22_activesync_fix_syncdata_type.mysql.sql | 2 - 9 files changed, 0 insertions(+), 120 deletions(-) delete mode 100644 horde/scripts/sql/horde_alarms.mssql.sql delete mode 100644 horde/scripts/sql/horde_alarms.oci8.sql delete mode 100644 horde/scripts/sql/horde_alarms.pgsql.sql delete mode 100644 horde/scripts/sql/horde_alarms.sql delete mode 100644 horde/scripts/upgrades/2007-02-21_horde_alarms_primary.sql delete mode 100644 horde/scripts/upgrades/2007-04-25_horde_alarms_drop_primary.sql delete mode 100644 horde/scripts/upgrades/2007-05-24_horde_alarms_add_dismissed.sql delete mode 100644 horde/scripts/upgrades/2010-05-11_horde_activesync_adduserkey.sql delete mode 100644 horde/scripts/upgrades/2010-06-22_activesync_fix_syncdata_type.mysql.sql http://git.horde.org/horde-git/-/commit/1e6fa3def74eb25b9f8c90a795c2508b1965fca8 ----------------------------------------------------------------------- commit d111a105e4e2fd017f96d9eff43939d012ca4c55 Author: Jan Schneider <[email protected]> Date: Wed Jan 26 21:25:00 2011 +0100 Add migrations. framework/ActiveSync/package.xml | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/d111a105e4e2fd017f96d9eff43939d012ca4c55 ----------------------------------------------------------------------- commit c7d79b9af570e160b908c93c767794a606a299b0 Author: Jan Schneider <[email protected]> Date: Wed Jan 26 21:39:03 2011 +0100 Convert horde_cache to migrations. .../Cache/migration/Horde_Cache/1_horde_cache_base_tables.php | 20 +++++ framework/Cache/package.xml | 12 ++- horde/scripts/sql/horde_cache.pgsql.sql | 8 -- horde/scripts/sql/horde_cache.sql | 12 --- 4 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 framework/Cache/migration/Horde_Cache/1_horde_cache_base_tables.php delete mode 100644 horde/scripts/sql/horde_cache.pgsql.sql delete mode 100644 horde/scripts/sql/horde_cache.sql http://git.horde.org/horde-git/-/commit/c7d79b9af570e160b908c93c767794a606a299b0 ----------------------------------------------------------------------- commit 96fea2ca36ce84b32ba7c6c3bfed3790dc2f76cd Author: Jan Schneider <[email protected]> Date: Wed Jan 26 21:56:01 2011 +0100 Convert Horde_Group to migrations. .../Group/migration/Horde_Group/1_horde_group_base_tables.php | 29 +++++ .../migration/Horde_Group/2_horde_group_upgrade_autoincrement.php | 20 +++ framework/Group/package.xml | 20 ++- horde/scripts/sql/horde_groups.mysql.sql | 16 --- horde/scripts/sql/horde_groups.oci8.sql | 23 ---- horde/scripts/sql/horde_groups.pgsql.sql | 15 --- horde/scripts/sql/horde_groups.sql | 14 -- .../upgrades/2010-06-01_horde_groups_autoincrement.mysql.sql | 1 - .../upgrades/2010-06-01_horde_groups_autoincrement.oci8.sql | 7 - .../upgrades/2010-06-01_horde_groups_autoincrement.pgsql.sql | 2 - 10 files changed, 63 insertions(+), 84 deletions(-) create mode 100644 framework/Group/migration/Horde_Group/1_horde_group_base_tables.php create mode 100644 framework/Group/migration/Horde_Group/2_horde_group_upgrade_autoincrement.php delete mode 100644 horde/scripts/sql/horde_groups.mysql.sql delete mode 100644 horde/scripts/sql/horde_groups.oci8.sql delete mode 100644 horde/scripts/sql/horde_groups.pgsql.sql delete mode 100644 horde/scripts/sql/horde_groups.sql delete mode 100644 horde/scripts/upgrades/2010-06-01_horde_groups_autoincrement.mysql.sql delete mode 100644 horde/scripts/upgrades/2010-06-01_horde_groups_autoincrement.oci8.sql delete mode 100644 horde/scripts/upgrades/2010-06-01_horde_groups_autoincrement.pgsql.sql http://git.horde.org/horde-git/-/commit/96fea2ca36ce84b32ba7c6c3bfed3790dc2f76cd ----------------------------------------------------------------------- commit c0c18d9da665ed80cbfe207e7b5797b46e4f1afd Author: Jan Schneider <[email protected]> Date: Wed Jan 26 22:04:58 2011 +0100 Convert Horde_History to migrations. .../migration/Horde_History/1_horde_history_base_tables.php | 26 +++++ framework/History/package.xml | 14 ++- horde/scripts/sql/horde_histories.mssql.sql | 15 --- horde/scripts/sql/horde_histories.sql | 15 --- 4 files changed, 36 insertions(+), 34 deletions(-) create mode 100644 framework/History/migration/Horde_History/1_horde_history_base_tables.php delete mode 100644 horde/scripts/sql/horde_histories.mssql.sql delete mode 100644 horde/scripts/sql/horde_histories.sql http://git.horde.org/horde-git/-/commit/c0c18d9da665ed80cbfe207e7b5797b46e4f1afd ----------------------------------------------------------------------- commit 83f40d119ef7dd8b03ed40eb331ffe66b64b33fd Merge: c0c18d9 87af970 Author: Jan Schneider <[email protected]> Date: Wed Jan 26 22:13:41 2011 +0100 Merge branch 'master' of dev.horde.org:/horde/git/horde Conflicts: horde/scripts/sql/horde_histories.mssql.sql horde/scripts/sql/horde_histories.pgsql.sql ansel/lib/Test.php | 16 +-- framework/Core/lib/Horde/Core/Factory/History.php | 6 +- framework/Db/lib/Horde/Db/Adapter/Base.php | 4 +- framework/History/lib/Horde/History.php | 44 +--- framework/History/lib/Horde/History/Factory.php | 160 ------------- framework/History/lib/Horde/History/Sql.php | 119 +++------- framework/History/package.xml | 2 - framework/History/test/Horde/History/InterfaceTest.php | 196 +++------------- horde/lib/Test.php | 4 +- horde/scripts/sql/horde_histories.mysql.sql | 13 + kronolith/lib/Day.php | 40 ++-- kronolith/lib/Driver.php | 5 +- kronolith/lib/FreeBusy/View.php | 105 +++++---- kronolith/lib/FreeBusy/View/Day.php | 12 +- kronolith/lib/FreeBusy/View/Month.php | 24 ++- kronolith/lib/FreeBusy/View/Week.php | 23 ++- kronolith/lib/FreeBusy/View/Workweek.php | 15 +- kronolith/lib/Storage/Kolab.php | 2 +- kronolith/lib/Storage/Sql.php | 5 +- kronolith/lib/Test.php | 9 +- kronolith/lib/View/Day.php | 144 ++++++------ kronolith/lib/View/DeleteEvent.php | 57 +++-- kronolith/lib/View/EditEvent.php | 80 ++++--- kronolith/lib/View/Event.php | 78 ++++--- kronolith/lib/View/ExportEvent.php | 6 +- kronolith/lib/View/Month.php | 37 ++-- kronolith/lib/View/Week.php | 110 +++++----- kronolith/lib/View/WorkWeek.php | 12 +- kronolith/lib/View/Year.php | 24 ++- kronolith/scripts/upgrades/convert_to_utc.php | 23 ++- kronolith/templates/day/all_day.inc | 2 +- kronolith/templates/day/head_side_by_side.inc | 2 +- kronolith/templates/week/head.inc | 2 +- kronolith/templates/week/head_side_by_side.inc | 2 +- turba/lib/Test.php | 9 +- 35 files changed, 569 insertions(+), 823 deletions(-) http://git.horde.org/horde-git/-/commit/83f40d119ef7dd8b03ed40eb331ffe66b64b33fd ----------------------------------------------------------------------- commit 107f4b2db1de65bac711b0bd6b86a7ebea38a1e4 Author: Jan Schneider <[email protected]> Date: Wed Jan 26 22:14:23 2011 +0100 Remove after resolving conflict. horde/scripts/sql/horde_histories.mysql.sql | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) delete mode 100644 horde/scripts/sql/horde_histories.mysql.sql http://git.horde.org/horde-git/-/commit/107f4b2db1de65bac711b0bd6b86a7ebea38a1e4 __ commits mailing list Frequently Asked Questions: http://horde.org/faq/ To unsubscribe, mail: [email protected]
