The branch master has been updated. The following is a summary of the commits. Further details on each commit can be found below.
from: 485d1e68d21fb4b62bc5050300d854aba0281b0e 3c6de77... Fix friends managment. Make invite mail body configurable. ----------------------------------------------------------------------- commit 3c6de7711859c7868d3e9a7aa538ee279c3bca49 Author: Duck (Jakob Munih) <[email protected]> Date: Wed Feb 18 19:54:11 2009 +0100 Fix friends managment. Make invite mail body configurable. folks/config/invite.php.dist | 27 + folks/edit/friends/add.php | 72 ++ folks/edit/friends/blacklist.php | 4 +- folks/edit/friends/for.php | 1 - folks/edit/friends/from.php | 1 - folks/edit/friends/groups.php | 135 ++-- folks/edit/friends/index.php | 38 - folks/edit/friends/invite.php | 28 +- folks/edit/friends/of.php | 1 - folks/edit/tabs.php | 2 +- folks/lib/Folks.php | 6 +- folks/lib/Forms/AddFriend.php | 7 +- folks/locale/sl_SI/LC_MESSAGES/folks.mo | Bin 25182 -> 27453 bytes folks/po/folks.pot | 1359 +++++++++++++++++++------------ folks/po/sl_SI.po | 416 +++++++---- folks/templates/edit/tabs.php | 3 +- folks/templates/user/user.php | 4 +- 17 files changed, 1300 insertions(+), 804 deletions(-) create mode 100644 folks/config/invite.php.dist create mode 100644 folks/edit/friends/add.php http://git.horde.org/co.php/folks/config/invite.php.dist?rt=horde-hatchery&r=3c6de7711859c7868d3e9a7aa538ee279c3bca49 http://git.horde.org/co.php/folks/edit/friends/add.php?rt=horde-hatchery&r=3c6de7711859c7868d3e9a7aa538ee279c3bca49 http://git.horde.org/diff.php/folks/edit/friends/blacklist.php?rt=horde-hatchery&r1=485d1e68d21fb4b62bc5050300d854aba0281b0e&r2=3c6de7711859c7868d3e9a7aa538ee279c3bca49 http://git.horde.org/diff.php/folks/edit/friends/for.php?rt=horde-hatchery&r1=485d1e68d21fb4b62bc5050300d854aba0281b0e&r2=3c6de7711859c7868d3e9a7aa538ee279c3bca49 http://git.horde.org/diff.php/folks/edit/friends/from.php?rt=horde-hatchery&r1=485d1e68d21fb4b62bc5050300d854aba0281b0e&r2=3c6de7711859c7868d3e9a7aa538ee279c3bca49 http://git.horde.org/diff.php/folks/edit/friends/groups.php?rt=horde-hatchery&r1=485d1e68d21fb4b62bc5050300d854aba0281b0e&r2=3c6de7711859c7868d3e9a7aa538ee279c3bca49 http://git.horde.org/diff.php/folks/edit/friends/index.php?rt=horde-hatchery&r1=485d1e68d21fb4b62bc5050300d854aba0281b0e&r2=3c6de7711859c7868d3e9a7aa538ee279c3bca49 http://git.horde.org/diff.php/folks/edit/friends/invite.php?rt=horde-hatchery&r1=485d1e68d21fb4b62bc5050300d854aba0281b0e&r2=3c6de7711859c7868d3e9a7aa538ee279c3bca49 http://git.horde.org/diff.php/folks/edit/friends/of.php?rt=horde-hatchery&r1=485d1e68d21fb4b62bc5050300d854aba0281b0e&r2=3c6de7711859c7868d3e9a7aa538ee279c3bca49 http://git.horde.org/diff.php/folks/edit/tabs.php?rt=horde-hatchery&r1=485d1e68d21fb4b62bc5050300d854aba0281b0e&r2=3c6de7711859c7868d3e9a7aa538ee279c3bca49 http://git.horde.org/diff.php/folks/lib/Folks.php?rt=horde-hatchery&r1=485d1e68d21fb4b62bc5050300d854aba0281b0e&r2=3c6de7711859c7868d3e9a7aa538ee279c3bca49 http://git.horde.org/diff.php/folks/lib/Forms/AddFriend.php?rt=horde-hatchery&r1=166979a07aa547655b9c8a5cc605bf026cf92234&r2=3c6de7711859c7868d3e9a7aa538ee279c3bca49 http://git.horde.org/diff.php/folks/locale/sl_SI/LC_MESSAGES/folks.mo?rt=horde-hatchery&r1=17a0514dd368edf644c835e2da0ae6c68a4b5f3f&r2=3c6de7711859c7868d3e9a7aa538ee279c3bca49 http://git.horde.org/diff.php/folks/po/folks.pot?rt=horde-hatchery&r1=166979a07aa547655b9c8a5cc605bf026cf92234&r2=3c6de7711859c7868d3e9a7aa538ee279c3bca49 http://git.horde.org/diff.php/folks/po/sl_SI.po?rt=horde-hatchery&r1=166979a07aa547655b9c8a5cc605bf026cf92234&r2=3c6de7711859c7868d3e9a7aa538ee279c3bca49 http://git.horde.org/diff.php/folks/templates/edit/tabs.php?rt=horde-hatchery&r1=485d1e68d21fb4b62bc5050300d854aba0281b0e&r2=3c6de7711859c7868d3e9a7aa538ee279c3bca49 http://git.horde.org/diff.php/folks/templates/user/user.php?rt=horde-hatchery&r1=17a0514dd368edf644c835e2da0ae6c68a4b5f3f&r2=3c6de7711859c7868d3e9a7aa538ee279c3bca49 __ commits mailing list Frequently Asked Questions: http://horde.org/faq/ To unsubscribe, mail: [email protected]
