The branch master has been updated. The following is a summary of the commits. Further details on each commit can be found below.
from: 36b5a207085ad95aa4582e44d41c8e4435e9629b 485d1e6... Prepare friends UI for groups ----------------------------------------------------------------------- commit 485d1e68d21fb4b62bc5050300d854aba0281b0e Author: Duck (Jakob Munih) <[email protected]> Date: Wed Feb 18 16:44:31 2009 +0100 Prepare friends UI for groups folks/edit/approve.php | 55 ----------- folks/edit/blacklist.php | 65 ------------- folks/edit/friends.php | 106 --------------------- folks/edit/friends/approve.php | 54 +++++++++++ folks/edit/friends/blacklist.php | 81 ++++++++++++++++ folks/edit/friends/for.php | 46 +++++++++ folks/edit/friends/friends.php | 84 +++++++++++++++++ folks/edit/friends/from.php | 46 +++++++++ folks/edit/friends/groups.php | 130 ++++++++++++++++++++++++++ folks/edit/friends/index.php | 84 +++++++++++++++++ folks/edit/friends/invite.php | 61 ++++++++++++ folks/edit/friends/of.php | 46 +++++++++ folks/edit/friends/reject.php | 50 ++++++++++ folks/edit/groups.php | 128 -------------------------- folks/edit/reject.php | 51 ---------- folks/edit/tabs.php | 13 ++- folks/lib/Driver.php | 7 +- folks/lib/Folks.php | 15 +-- folks/lib/Friends.php | 49 +++++++---- folks/lib/Friends/application.php | 2 +- folks/lib/Friends/shared.php | 177 ++++-------------------------------- folks/lib/Friends/sql.php | 2 +- folks/lib/api.php | 14 ++-- folks/templates/edit/activity.php | 4 +- folks/templates/edit/blacklist.php | 28 ------ folks/templates/edit/friends.php | 85 +++++++---------- folks/templates/edit/groups.php | 28 ++++-- folks/templates/edit/invite.php | 3 + folks/templates/edit/tabs.php | 35 +++++++ 29 files changed, 853 insertions(+), 696 deletions(-) delete mode 100644 folks/edit/approve.php delete mode 100644 folks/edit/blacklist.php delete mode 100644 folks/edit/friends.php create mode 100644 folks/edit/friends/approve.php create mode 100644 folks/edit/friends/blacklist.php create mode 100644 folks/edit/friends/for.php create mode 100644 folks/edit/friends/friends.php create mode 100644 folks/edit/friends/from.php create mode 100644 folks/edit/friends/groups.php create mode 100644 folks/edit/friends/index.php create mode 100644 folks/edit/friends/invite.php create mode 100644 folks/edit/friends/of.php create mode 100644 folks/edit/friends/reject.php delete mode 100644 folks/edit/groups.php delete mode 100644 folks/edit/reject.php delete mode 100644 folks/templates/edit/blacklist.php create mode 100644 folks/templates/edit/invite.php create mode 100644 folks/templates/edit/tabs.php http://git.horde.org/diff.php/folks/edit/approve.php?rt=horde-hatchery&r1=037b01c9cf42b76e08c189c9472e064c20ef91a5&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/diff.php/folks/edit/blacklist.php?rt=horde-hatchery&r1=166979a07aa547655b9c8a5cc605bf026cf92234&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/diff.php/folks/edit/friends.php?rt=horde-hatchery&r1=037b01c9cf42b76e08c189c9472e064c20ef91a5&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/co.php/folks/edit/friends/approve.php?rt=horde-hatchery&r=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/co.php/folks/edit/friends/blacklist.php?rt=horde-hatchery&r=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/co.php/folks/edit/friends/for.php?rt=horde-hatchery&r=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/co.php/folks/edit/friends/friends.php?rt=horde-hatchery&r=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/co.php/folks/edit/friends/from.php?rt=horde-hatchery&r=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/co.php/folks/edit/friends/groups.php?rt=horde-hatchery&r=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/co.php/folks/edit/friends/index.php?rt=horde-hatchery&r=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/co.php/folks/edit/friends/invite.php?rt=horde-hatchery&r=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/co.php/folks/edit/friends/of.php?rt=horde-hatchery&r=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/co.php/folks/edit/friends/reject.php?rt=horde-hatchery&r=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/diff.php/folks/edit/groups.php?rt=horde-hatchery&r1=529cf9da884ce62b229c4c4ced522ff85a71d17c&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/diff.php/folks/edit/reject.php?rt=horde-hatchery&r1=037b01c9cf42b76e08c189c9472e064c20ef91a5&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/diff.php/folks/edit/tabs.php?rt=horde-hatchery&r1=037b01c9cf42b76e08c189c9472e064c20ef91a5&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/diff.php/folks/lib/Driver.php?rt=horde-hatchery&r1=166979a07aa547655b9c8a5cc605bf026cf92234&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/diff.php/folks/lib/Folks.php?rt=horde-hatchery&r1=166979a07aa547655b9c8a5cc605bf026cf92234&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/diff.php/folks/lib/Friends.php?rt=horde-hatchery&r1=2876dc6eb2f66642acdb07bfc49ad7a61ef647a7&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/diff.php/folks/lib/Friends/application.php?rt=horde-hatchery&r1=bb43ee6192710517186088d65d8ee9f1d556b909&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/diff.php/folks/lib/Friends/shared.php?rt=horde-hatchery&r1=2876dc6eb2f66642acdb07bfc49ad7a61ef647a7&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/diff.php/folks/lib/Friends/sql.php?rt=horde-hatchery&r1=2876dc6eb2f66642acdb07bfc49ad7a61ef647a7&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/diff.php/folks/lib/api.php?rt=horde-hatchery&r1=166979a07aa547655b9c8a5cc605bf026cf92234&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/diff.php/folks/templates/edit/activity.php?rt=horde-hatchery&r1=037b01c9cf42b76e08c189c9472e064c20ef91a5&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/diff.php/folks/templates/edit/blacklist.php?rt=horde-hatchery&r1=17a0514dd368edf644c835e2da0ae6c68a4b5f3f&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/diff.php/folks/templates/edit/friends.php?rt=horde-hatchery&r1=037b01c9cf42b76e08c189c9472e064c20ef91a5&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/diff.php/folks/templates/edit/groups.php?rt=horde-hatchery&r1=529cf9da884ce62b229c4c4ced522ff85a71d17c&r2=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/co.php/folks/templates/edit/invite.php?rt=horde-hatchery&r=485d1e68d21fb4b62bc5050300d854aba0281b0e http://git.horde.org/co.php/folks/templates/edit/tabs.php?rt=horde-hatchery&r=485d1e68d21fb4b62bc5050300d854aba0281b0e __ commits mailing list Frequently Asked Questions: http://horde.org/faq/ To unsubscribe, mail: [email protected]
