This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, feature/twig-template-engine has been updated
via f38afe593e1373565ed829ba6cd7ce69637d6c01 (commit)
via c2c575b09d2137f68012c8c090995b3fbdd7e345 (commit)
via 350e45a30b6250b6149e8b6d9aeaf91dcaa735eb (commit)
via 00c9488ec63f297f8d1c6784910b5842489382a2 (commit)
via 9a1f9be92be3d37f2e652b4cdd012837626b0aeb (commit)
via 367820c954745615ac8a3dc633253d200049328e (commit)
via 17f2343e46dad53f992da35eda714726ab4aa34d (commit)
via cad06ef0f86e4d52a81adbbad547c6b45f4feff2 (commit)
via 3055890e1c12eca8fd6dcf176a8838bf0b0e349f (commit)
from e0dbdd718aaf8ab398be62b875e4d94ba021ec3f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f38afe593e1373565ed829ba6cd7ce69637d6c01
commit f38afe593e1373565ed829ba6cd7ce69637d6c01
Merge: e0dbdd7 c2c575b
Author: Roland Mas <[email protected]>
Date: Tue Apr 19 14:13:49 2016 +0200
Merge branch 'master' into feature/twig-template-engine
diff --cc src/debian/control.in
index 555bac1,cd0768e..3e9390b
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@@ -79,7 -79,7 +79,7 @@@ Description: collaborative development
Package: fusionforge-web
Architecture: all
- Depends: fusionforge-common (=${source:Version}), fusionforge-db,
libapache2-mpm-itk | apache2-mpm-itk, php5-cli, libapache2-mod-php5,
libphp-simplepie, php-http, php-http-webdav-server, libjs-jquery-livequery,
python, poppler-utils, openssl, php-twig, ${misc:Depends}
-Depends: fusionforge-common (=${source:Version}), fusionforge-db,
libapache2-mpm-itk | apache2-mpm-itk, php-cli | php5-cli, libapache2-mod-php |
libapache2-mod-php5, libphp-simplepie, php-http, php-http-webdav-server,
libjs-jquery-livequery, python, poppler-utils, openssl, ${misc:Depends}
++Depends: fusionforge-common (=${source:Version}), fusionforge-db,
libapache2-mpm-itk | apache2-mpm-itk, php-cli | php5-cli, libapache2-mod-php |
libapache2-mod-php5, libphp-simplepie, php-http, php-http-webdav-server,
libjs-jquery-livequery, python, poppler-utils, openssl, php-twig,
${misc:Depends}
Recommends: locales-all, unoconv
Description: collaborative development tool - web part (using Apache)
FusionForge provides many tools to aid collaboration in a
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/Document.class.php | 6 +++---
src/common/docman/DocumentFactory.class.php | 6 +++---
src/common/docman/DocumentGroup.class.php | 6 +++---
src/common/docman/DocumentGroupFactory.class.php | 10 +++++++---
src/common/docman/DocumentManager.class.php | 6 +++---
src/common/forum/AttachManager.class.php | 2 +-
src/common/forum/Forum.class.php | 6 +++---
src/common/forum/ForumAdmin.class.php | 4 ++--
src/common/forum/ForumFactory.class.php | 6 +++---
src/common/forum/ForumHTML.class.php | 4 ++--
src/common/forum/ForumMessage.class.php | 6 +++---
src/common/forum/ForumMessageFactory.class.php | 6 +++---
src/common/frs/FRSFile.class.php | 6 +++---
src/common/frs/FRSFileProcessorType.class.php | 6 +++---
src/common/frs/FRSFileType.class.php | 6 +++---
src/common/frs/FRSPackage.class.php | 6 +++---
src/common/frs/FRSPackageFactory.class.php | 6 +++---
src/common/frs/FRSRelease.class.php | 6 +++---
src/common/frs/FRSReleaseFactory.class.php | 6 +++---
src/common/include/DatabaseInstaller.class.php | 2 +-
.../include/{Error.class.php => FFError.class.php} | 4 ++--
src/common/include/FusionForge.class.php | 6 +++---
src/common/include/Group.class.php | 4 ++--
src/common/include/GroupJoinRequest.class.php | 6 +++---
src/common/include/MailParser.class.php | 6 +++---
src/common/include/MonitorElement.class.php | 2 +-
src/common/include/Navigation.class.php | 4 ++--
src/common/include/Permission.class.php | 4 ++--
src/common/include/Plugin.class.php | 4 ++--
src/common/include/PluginManager.class.php | 4 ++--
src/common/include/PluginPersistence.class.php | 2 +-
src/common/include/RBAC.php | 2 +-
src/common/include/RBACEngine.class.php | 2 +-
src/common/include/Stats.class.php | 4 ++--
src/common/include/Storage.class.php | 2 +-
src/common/include/SysTasksQ.class.php | 2 +-
src/common/include/System.class.php | 6 +++---
src/common/include/TextSanitizer.class.php | 2 +-
src/common/include/TroveCat.class.php | 2 +-
src/common/include/User.class.php | 4 ++--
src/common/include/pre.php | 2 +-
src/common/mail/MailingList.class.php | 6 +++---
src/common/mail/MailingListFactory.class.php | 6 +++---
src/common/pm/ProjectCategory.class.php | 6 +++---
src/common/pm/ProjectGroup.class.php | 6 +++---
src/common/pm/ProjectGroupFactory.class.php | 6 +++---
src/common/pm/ProjectTask.class.php | 6 +++---
src/common/pm/ProjectTaskFactory.class.php | 6 +++---
src/common/pm/ProjectTasksForUser.class.php | 4 ++--
src/common/reporting/Report.class.php | 4 ++--
src/common/reporting/TimeEntry.class.php | 4 ++--
src/common/scm/SCMFactory.class.php | 6 +++---
src/common/search/SearchQuery.class.php | 2 +-
src/common/survey/Survey.class.php | 6 +++---
src/common/survey/SurveyFactory.class.php | 6 +++---
src/common/survey/SurveyQuestion.class.php | 6 +++---
src/common/survey/SurveyQuestionFactory.class.php | 6 +++---
src/common/survey/SurveyResponse.class.php | 6 +++---
src/common/survey/SurveyResponseFactory.class.php | 6 +++---
src/common/tracker/Artifact.class.php | 6 +++---
src/common/tracker/ArtifactCanned.class.php | 6 +++---
src/common/tracker/ArtifactExtraField.class.php | 6 +++---
src/common/tracker/ArtifactExtraFieldElement.class.php | 6 +++---
src/common/tracker/ArtifactFactory.class.php | 6 +++---
src/common/tracker/ArtifactFile.class.php | 6 +++---
src/common/tracker/ArtifactFromID.class.php | 4 ++--
src/common/tracker/ArtifactHistory.class.php | 6 +++---
src/common/tracker/ArtifactMessage.class.php | 6 +++---
src/common/tracker/ArtifactQuery.class.php | 6 +++---
src/common/tracker/ArtifactQueryFactory.class.php | 6 +++---
src/common/tracker/ArtifactType.class.php | 6 +++---
src/common/tracker/ArtifactTypeFactory.class.php | 6 +++---
src/common/tracker/ArtifactTypes.class.php | 6 +++---
src/common/tracker/ArtifactWorkflow.class.php | 4 ++--
src/common/tracker/Artifacts.class.php | 6 +++---
src/common/tracker/ArtifactsForUser.class.php | 4 ++--
src/common/tracker/Roadmap.class.php | 6 +++---
src/common/tracker/RoadmapFactory.class.php | 6 +++---
src/cronjobs/misc/forum_gateway.php | 4 ++--
src/cronjobs/misc/tracker_gateway.php | 4 ++--
src/debian/changelog | 6 ++++++
src/debian/control.in | 14 +++++++-------
src/locale/bg.po | 16 ++++++++--------
src/locale/ca.po | 16 ++++++++--------
src/locale/de.po | 16 ++++++++--------
src/locale/es.po | 16 ++++++++--------
src/locale/eu.po | 16 ++++++++--------
src/locale/fr.po | 16 ++++++++--------
src/locale/fusionforge.pot | 16 ++++++++--------
src/locale/gl.po | 16 ++++++++--------
src/locale/it.po | 16 ++++++++--------
src/locale/ja.po | 16 ++++++++--------
src/locale/ko.po | 16 ++++++++--------
src/locale/nl.po | 16 ++++++++--------
src/locale/pl.po | 16 ++++++++--------
src/locale/pt.po | 16 ++++++++--------
src/locale/ru.po | 16 ++++++++--------
src/locale/sv.po | 16 ++++++++--------
src/locale/th.po | 16 ++++++++--------
src/locale/zh_CN.po | 16 ++++++++--------
src/locale/zh_TW.po | 16 ++++++++--------
.../contribtracker/common/ContribTrackerPlugin.class.php | 12 ++++++------
src/plugins/mailman/include/MailmanList.class.php | 4 ++--
src/plugins/mailman/include/MailmanListFactory.class.php | 4 ++--
src/plugins/mailman/include/MailsForUser.class.php | 2 +-
src/plugins/projectimport/common/UploadedFiles.class.php | 2 +-
src/plugins/taskboard/common/TaskBoard.class.php | 6 +++---
src/plugins/taskboard/common/TaskBoardColumn.class.php | 6 +++---
.../taskboard/common/TaskBoardColumnSource.class.php | 4 ++--
src/plugins/taskboard/common/TaskBoardRelease.class.php | 6 +++---
src/plugins/wiki/common/wikiconfig.class.php | 2 +-
src/www/export/rssAboTask.php | 2 +-
src/www/include/Layout.class.php | 4 ++--
src/www/pm/include/ProjectTaskHTML.class.php | 2 +-
src/www/reporting/timeentry.php | 2 +-
.../search/include/renderers/SearchRenderer.class.php | 2 +-
src/www/soap/common/group.php | 2 +-
src/www/soap/common/user.php | 2 +-
src/www/soap/docman/docman.php | 2 +-
src/www/soap/frs/frs.php | 2 +-
src/www/soap/pm/pm.php | 2 +-
src/www/soap/reporting/timeentry.php | 2 +-
src/www/soap/tracker/query.php | 2 +-
src/www/soap/tracker/tracker.php | 2 +-
src/www/survey/include/SurveyHTML.class.php | 2 +-
src/www/trove/TroveCategory.class.php | 2 +-
src/www/trove/TroveCategoryLabel.class.php | 4 ++--
tests/unit/utils/TextSanitizerTest.php | 2 +-
tools/create_class.php | 6 +++---
129 files changed, 413 insertions(+), 403 deletions(-)
rename src/common/include/{Error.class.php => FFError.class.php} (99%)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
