The branch "imp_6_1" has been updated. The following is a summary of the commits.
from: 901a6a1ae698fd44db419d41a975841a60d66780 4c184a3 [mms] Use more efficient date sorting algorithm as the default choice. 116e002 [mms] Fix ability to switch to non-default date sorting algorithm in dynamic view (Bug #12139). 3afec36 Merge branch 'master' into imp_6_1 ----------------------------------------------------------------------- commit 4c184a38944a62e3cbd892fe384eb3b80e0b3a42 Author: Michael M Slusarz <[email protected]> Date: Mon Mar 25 17:30:15 2013 -0600 [mms] Use more efficient date sorting algorithm as the default choice. imp/config/prefs.php | 4 ++-- imp/docs/CHANGES | 1 + imp/lib/LoginTasks/SystemTask/Upgrade.php | 19 ++++++++++++++++++- imp/lib/Prefs/Sort/Sortpref.php | 2 +- imp/package.xml | 2 ++ imp/rss.php | 2 +- 6 files changed, 25 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/4c184a38944a62e3cbd892fe384eb3b80e0b3a42 ----------------------------------------------------------------------- commit 116e002681a7d298f1774a4495deb52efafca2f6 Author: Michael M Slusarz <[email protected]> Date: Mon Mar 25 17:31:47 2013 -0600 [mms] Fix ability to switch to non-default date sorting algorithm in dynamic view (Bug #12139). imp/docs/CHANGES | 2 ++ imp/js/dimpbase.js | 9 ++++----- imp/lib/Ajax/Application/ListMessages.php | 2 +- imp/lib/Dynamic/Mailbox.php | 6 +++++- imp/package.xml | 2 ++ 5 files changed, 14 insertions(+), 7 deletions(-) http://git.horde.org/horde-git/-/commit/116e002681a7d298f1774a4495deb52efafca2f6 ----------------------------------------------------------------------- commit 3afec365b207362ab425d6fbaa41cf2075eeba45 Merge: 901a6a1 116e002 Author: Michael M Slusarz <[email protected]> Date: Mon Mar 25 18:03:39 2013 -0600 Merge branch 'master' into imp_6_1 Conflicts: imp/docs/CHANGES imp/lib/LoginTasks/SystemTask/Upgrade.php imp/package.xml imp/config/prefs.php | 4 ++-- imp/docs/CHANGES | 7 +++++++ imp/js/dimpbase.js | 9 ++++----- imp/lib/Ajax/Application/ListMessages.php | 2 +- imp/lib/Dynamic/Mailbox.php | 6 +++++- imp/lib/LoginTasks/SystemTask/Upgrade.php | 17 +++++++++++++++++ imp/lib/Prefs/Sort/Sortpref.php | 2 +- imp/package.xml | 2 ++ imp/rss.php | 2 +- 9 files changed, 40 insertions(+), 11 deletions(-) http://git.horde.org/horde-git/-/commit/3afec365b207362ab425d6fbaa41cf2075eeba45 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
