[commits] Horde branch master updated. 8269b0fb257f41b2ce4b4bd75de3df32f0739cc6
Jan Schneider
jan at horde.org
Thu Dec 9 15:02:00 UTC 2010
The branch "master" has been updated.
The following is a summary of the commits.
from: 27c5e0aa622307872ecc365ec7b8d2fb8e6aa97b
c2ac9b9 One common-header.inc to rule them (almost) all.
8269b0f Fix merge conflict.
-----------------------------------------------------------------------
commit c2ac9b9b759c3cde20ac00959f3b78ad9b596ffb
Author: Jan Schneider <jan at horde.org>
Date: Thu Dec 9 15:59:31 2010 +0100
One common-header.inc to rule them (almost) all.
agora/ban.php | 2 +-
agora/deleteforum.php | 2 +-
agora/editforum.php | 2 +-
agora/forums.php | 3 +-
agora/messages/abuse.php | 2 +-
agora/messages/delete.php | 2 +-
agora/messages/edit.php | 2 +-
agora/messages/index.php | 2 +-
agora/messages/lock.php | 2 +-
agora/messages/merge.php | 2 +-
agora/messages/move.php | 2 +-
agora/messages/split.php | 2 +-
agora/moderate.php | 2 +-
agora/moderators.php | 2 +-
agora/owner.php | 2 +-
agora/search.php | 2 +-
agora/templates/common-header.inc | 30 ------------------
agora/threads.php | 2 +-
ansel/browse.php | 2 +-
ansel/browse_edit.php | 2 +-
ansel/disclamer.php | 2 +-
ansel/faces/claim.php | 2 +-
ansel/faces/custom.php | 2 +-
ansel/faces/face.php | 2 +-
ansel/faces/gallery.php | 2 +-
ansel/faces/report.php | 2 +-
ansel/faces/search/all.php | 2 +-
ansel/faces/search/image.php | 2 +-
ansel/faces/search/image_define.php | 2 +-
ansel/faces/search/image_search.php | 2 +-
ansel/faces/search/name.php | 2 +-
ansel/faces/search/named.php | 2 +-
ansel/faces/search/owner.php | 2 +-
ansel/gallery.php | 2 +-
ansel/gallery/captions.php | 2 +-
ansel/gallery/sort.php | 2 +-
ansel/group.php | 2 +-
ansel/image.php | 12 ++++----
ansel/img/ecard.php | 2 +-
ansel/img/upload.php | 2 +-
ansel/lib/Ansel.php | 11 -------
ansel/lib/Application.php | 3 ++
ansel/lib/View/GalleryProperties.php | 2 +-
ansel/protect.php | 2 +-
ansel/report.php | 2 +-
ansel/templates/common-header.inc | 31 -------------------
ansel/view.php | 4 +-
ansel/xppublish.php | 2 +-
beatnik/editrec.php | 3 +-
beatnik/lib/Beatnik.php | 11 +++++++
beatnik/listzones.php | 3 +-
beatnik/templates/common-header.inc | 39 -----------------------
beatnik/viewzone.php | 3 +-
chora/annotate.php | 7 ++--
chora/browsedir.php | 2 +-
chora/browsefile.php | 2 +-
chora/co.php | 2 +-
chora/commit.php | 2 +-
chora/cvsgraph.php | 2 +-
chora/diff.php | 2 +-
chora/history.php | 2 +-
chora/lib/Chora.php | 2 +-
chora/patchsets.php | 2 +-
chora/stats.php | 2 +-
chora/templates/common-header.inc | 30 ------------------
folks/account/resetpassword.php | 2 +-
folks/account/signup.php | 2 +-
folks/account/username.php | 2 +-
folks/activity.php | 2 +-
folks/birthday.php | 2 +-
folks/edit/activity.php | 2 +-
folks/edit/comments.php | 2 +-
folks/edit/edit.php | 2 +-
folks/edit/facebook.php | 2 +-
folks/edit/friends/add.php | 2 +-
folks/edit/friends/blacklist.php | 2 +-
folks/edit/friends/for.php | 2 +-
folks/edit/friends/friends.php | 2 +-
folks/edit/friends/from.php | 2 +-
folks/edit/friends/groups.php | 2 +-
folks/edit/friends/index.php | 2 +-
folks/edit/friends/invite.php | 2 +-
folks/edit/friends/know.php | 2 +-
folks/edit/friends/of.php | 2 +-
folks/edit/password.php | 2 +-
folks/edit/privacy.php | 2 +-
folks/friends.php | 2 +-
folks/lib/Application.php | 21 +++++++++++++
folks/list.php | 2 +-
folks/login.php | 2 +-
folks/new.php | 2 +-
folks/online.php | 2 +-
folks/perms.php | 2 +-
folks/popularity.php | 2 +-
folks/report.php | 2 +-
folks/search.php | 2 +-
folks/services.php | 2 +-
folks/templates/common-header.inc | 33 --------------------
folks/user.php | 2 +-
gollem/clipboard.php | 3 +-
gollem/edit.php | 3 +-
gollem/manager.php | 3 +-
gollem/permissions.php | 3 +-
gollem/quota.php | 3 +-
gollem/selectlist.php | 3 +-
gollem/templates/common-header.inc | 33 --------------------
hermes/admin.php | 2 +-
hermes/deliverables.php | 2 +-
hermes/entry.php | 2 +-
hermes/invoicing.php | 2 +-
hermes/search.php | 2 +-
hermes/start.php | 2 +-
hermes/templates/common-header.inc | 29 -----------------
hermes/time.php | 2 +-
hylax/compose.php | 2 +-
hylax/folder.php | 2 +-
hylax/send.php | 2 +-
hylax/summary.php | 2 +-
hylax/templates/common-header.inc | 29 -----------------
hylax/view.php | 2 +-
ingo/blacklist.php | 2 +-
ingo/filters.php | 2 +-
ingo/forward.php | 2 +-
ingo/rule.php | 2 +-
ingo/script.php | 2 +-
ingo/spam.php | 2 +-
ingo/templates/common-header.inc | 24 --------------
ingo/vacation.php | 2 +-
ingo/whitelist.php | 2 +-
jonah/feed.php | 2 +-
jonah/lib/Application.php | 10 ++++++
jonah/lib/View/Base.php | 2 +-
jonah/lib/View/ChannelDelete.php | 2 +-
jonah/lib/View/ChannelEdit.php | 2 +-
jonah/lib/View/ChannelList.php | 2 +-
jonah/lib/View/DeliveryHtml.php | 2 +-
jonah/lib/View/StoryDelete.php | 2 +-
jonah/lib/View/StoryEdit.php | 2 +-
jonah/lib/View/StoryList.php | 2 +-
jonah/lib/View/StoryView.php | 4 +-
jonah/lib/View/TagSearchList.php | 2 +-
jonah/stories/share.php | 2 +-
jonah/stories/view.php | 2 +-
jonah/templates/common-header.inc | 33 --------------------
kronolith/attend.php | 3 +-
kronolith/attendees.php | 3 +-
kronolith/calendars/create.php | 3 +-
kronolith/calendars/delete.php | 3 +-
kronolith/calendars/edit.php | 3 +-
kronolith/calendars/index.php | 3 +-
kronolith/calendars/remote_edit.php | 3 +-
kronolith/calendars/remote_subscribe.php | 3 +-
kronolith/calendars/remote_unsubscribe.php | 3 +-
kronolith/contacts.php | 3 +-
kronolith/data.php | 3 +-
kronolith/day.php | 12 +++++--
kronolith/event.php | 10 ++++--
kronolith/lib/Application.php | 8 ++++-
kronolith/month.php | 12 +++++--
kronolith/new.php | 3 +-
kronolith/perms.php | 3 +-
kronolith/resources/create.php | 3 +-
kronolith/resources/delete.php | 3 +-
kronolith/resources/edit.php | 3 +-
kronolith/resources/groups/create.php | 3 +-
kronolith/resources/groups/delete.php | 3 +-
kronolith/resources/groups/edit.php | 3 +-
kronolith/resources/groups/index.php | 3 +-
kronolith/resources/index.php | 3 +-
kronolith/search.php | 3 +-
kronolith/templates/common-header.inc | 44 --------------------------
kronolith/week.php | 12 +++++--
kronolith/workweek.php | 12 +++++--
kronolith/year.php | 11 +++++--
luxor/search.php | 2 +-
luxor/source.php | 2 +-
luxor/symbol.php | 2 +-
luxor/templates/common-header.inc | 29 -----------------
mnemo/data.php | 2 +-
mnemo/lib/Application.php | 1 +
mnemo/list.php | 6 +++-
mnemo/memo.php | 2 +-
mnemo/notepads/create.php | 2 +-
mnemo/notepads/delete.php | 2 +-
mnemo/notepads/edit.php | 2 +-
mnemo/notepads/index.php | 2 +-
mnemo/notes/index.php | 6 +++-
mnemo/search.php | 6 +++-
mnemo/stickies.php | 6 +++-
mnemo/templates/common-header.inc | 35 ---------------------
mnemo/view.php | 2 +-
nag/data.php | 4 +-
nag/lib/Application.php | 2 +
nag/lib/Nag.php | 7 ++++
nag/list.php | 8 ++++-
nag/search.php | 7 +++-
nag/task.php | 4 +-
nag/tasklists/create.php | 4 +-
nag/tasklists/delete.php | 4 +-
nag/tasklists/edit.php | 4 +-
nag/tasklists/index.php | 4 +-
nag/tasks/index.php | 8 ++++-
nag/templates/common-header.inc | 46 ----------------------------
nag/templates/quick.inc | 11 +++++++
nag/view.php | 4 +-
operator/export.php | 2 +-
operator/search.php | 2 +-
operator/templates/common-header.inc | 29 -----------------
operator/viewgraph.php | 2 +-
passwd/main.php | 2 +-
passwd/templates/common-header.inc | 30 ------------------
pastie/paste.php | 2 +-
pastie/templates/common-header.inc | 26 ----------------
pastie/view.php | 2 +-
shout/admin.php | 2 +-
shout/admin/accounts.php | 2 +-
shout/admin/numbers.php | 2 +-
shout/conferences.php | 2 +-
shout/devices.php | 2 +-
shout/dialplan.php | 2 +-
shout/extensions.php | 2 +-
shout/recordings.php | 2 +-
shout/templates/common-header.inc | 29 -----------------
shout/wizard.php | 2 +-
skeleton/list.php | 2 +-
skeleton/templates/common-header.inc | 26 ----------------
trean/add.php | 4 +-
trean/browse.php | 2 +-
trean/data.php | 2 +-
trean/edit.php | 4 +-
trean/lib/Application.php | 16 ++++++++-
trean/reports.php | 2 +-
trean/search.php | 2 +-
trean/templates/common-header.inc | 45 ---------------------------
turba/add.php | 2 +-
turba/addressbooks/create.php | 2 +-
turba/addressbooks/delete.php | 2 +-
turba/addressbooks/edit.php | 2 +-
turba/addressbooks/index.php | 2 +-
turba/contact.php | 2 +-
turba/data.php | 4 +-
turba/delete.php | 2 +-
turba/edit.php | 2 +-
turba/lib/View/Browse.php | 2 +-
turba/minisearch.php | 2 +-
turba/search.php | 4 +-
turba/templates/common-header.inc | 30 ------------------
vilma/domains/delete.php | 2 +-
vilma/domains/edit.php | 2 +-
vilma/domains/index.php | 2 +-
vilma/templates/common-header.inc | 30 ------------------
vilma/users/delete.php | 2 +-
vilma/users/edit.php | 2 +-
vilma/users/editAlias.php | 2 +-
vilma/users/editForward.php | 2 +-
vilma/users/index.php | 2 +-
vilma/virtuals/delete.php | 2 +-
vilma/virtuals/edit.php | 2 +-
vilma/virtuals/index.php | 2 +-
whups/admin/index.php | 2 +-
whups/lib/Application.php | 5 ++-
whups/lib/Query.php | 10 ++++++
whups/lib/Ticket.php | 10 ++++++
whups/mybugs.php | 2 +-
whups/mybugs_edit.php | 2 +-
whups/query/index.php | 5 ++-
whups/query/run.php | 5 ++-
whups/queue/index.php | 2 +-
whups/reports.php | 2 +-
whups/search.php | 2 +-
whups/templates/common-header.inc | 37 ----------------------
whups/ticket/comment.php | 4 ++-
whups/ticket/create.php | 2 +-
whups/ticket/delete.php | 3 +-
whups/ticket/index.php | 3 +-
whups/ticket/queue.php | 3 +-
whups/ticket/type.php | 3 +-
whups/ticket/update.php | 3 +-
whups/ticket/watch.php | 3 +-
wicked/diff.php | 2 +-
wicked/display.php | 2 +-
wicked/history.php | 2 +-
wicked/lib/Application.php | 4 ++-
wicked/preview.php | 2 +-
wicked/templates/common-header.inc | 30 ------------------
285 files changed, 497 insertions(+), 1079 deletions(-)
delete mode 100644 agora/templates/common-header.inc
delete mode 100644 ansel/templates/common-header.inc
delete mode 100644 beatnik/templates/common-header.inc
delete mode 100644 chora/templates/common-header.inc
delete mode 100644 folks/templates/common-header.inc
delete mode 100644 gollem/templates/common-header.inc
delete mode 100644 hermes/templates/common-header.inc
delete mode 100644 hylax/templates/common-header.inc
delete mode 100644 ingo/templates/common-header.inc
delete mode 100644 jonah/templates/common-header.inc
delete mode 100644 kronolith/templates/common-header.inc
delete mode 100644 luxor/templates/common-header.inc
delete mode 100644 mnemo/templates/common-header.inc
delete mode 100644 nag/templates/common-header.inc
create mode 100644 nag/templates/quick.inc
delete mode 100644 operator/templates/common-header.inc
delete mode 100644 passwd/templates/common-header.inc
delete mode 100644 pastie/templates/common-header.inc
delete mode 100644 shout/templates/common-header.inc
delete mode 100644 skeleton/templates/common-header.inc
delete mode 100644 trean/templates/common-header.inc
delete mode 100644 turba/templates/common-header.inc
delete mode 100644 vilma/templates/common-header.inc
delete mode 100644 whups/templates/common-header.inc
delete mode 100644 wicked/templates/common-header.inc
http://git.horde.org/horde-git/-/commit/c2ac9b9b759c3cde20ac00959f3b78ad9b596ffb
-----------------------------------------------------------------------
commit 8269b0fb257f41b2ce4b4bd75de3df32f0739cc6
Author: Jan Schneider <jan at horde.org>
Date: Thu Dec 9 16:01:41 2010 +0100
Fix merge conflict.
jonah/stories/share.php | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/8269b0fb257f41b2ce4b4bd75de3df32f0739cc6
More information about the commits
mailing list