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 10193d4d027692772cb512879d95637302fa0936 (commit)
via 75dbc48d80d7c70131251649246886d55418816f (commit)
via 47a50db2a644504931579ef84ecea2ee94d0bbf4 (commit)
via 3ef943dd7d563300cce5b80f17c2e49dd4c9d940 (commit)
via 8d1061af3112abf1033fa46d303839ed8ec6f0ee (commit)
via 2d1b89a36b14d729307a482e257704fb9479a462 (commit)
via 4925b71aaec9d206f590fd8c31815906c8b8e279 (commit)
via 0cf05874e0f0842e631921f7a545abbd52c72a3a (commit)
via a4ae68ce566d5494ec0ceddbf82a5acd059c10ea (commit)
via 2fab87dffece48ead5282bd9b97ea82377203737 (commit)
via e5220d7df7bef0c275abaa6f46c05a3fd0922f9b (commit)
from 6ea4ce8b51ae71aff8ce0306488bc9e925a0e17a (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=10193d4d027692772cb512879d95637302fa0936
commit 10193d4d027692772cb512879d95637302fa0936
Merge: 6ea4ce8 75dbc48
Author: Roland Mas <[email protected]>
Date: Tue May 3 16:51:50 2016 +0200
Merge branch 'master' into feature/twig-template-engine
diff --cc src/debian/control.in
index 3e9390b,061d954..0cf4a4d
--- 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, 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}
-Depends: fusionforge-common (=${source:Version}), fusionforge-db-local |
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-local |
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/widget/Widget.class.php | 6 +-
...meDetailActivityMostActiveProjectWeek.class.php | 253 +++++++++++++++++++++
.../Widget_ProjectDocumentsActivity.class.php | 11 +-
src/cronjobs/db/calculate_user_metric.php | 2 -
src/cronjobs/db/daily_task_email.php | 1 -
src/cronjobs/db/db_project_sums.php | 2 -
src/cronjobs/db/db_stats_agg.php | 2 -
src/cronjobs/db/project_cleanup.php | 26 +--
src/cronjobs/db/project_weekly_metric.php | 2 -
src/cronjobs/db/rating_stats.php | 2 -
src/cronjobs/db/reporting_cron.php | 2 -
src/cronjobs/db/rotate_activity.php | 2 -
src/cronjobs/db/site_stats.php | 2 -
src/cronjobs/db/stats_projects-backfill.php | 4 +-
src/cronjobs/db/vacuum.php | 2 -
src/cronjobs/ftp/ftp_create_group_access.php | 1 -
src/cronjobs/lists/mailing_lists_create.php | 2 -
src/cronjobs/misc/auth_unix.php | 2 -
src/cronjobs/misc/forum_gateway.php | 2 -
src/cronjobs/misc/tracker_gateway.php | 2 -
src/cronjobs/misc/weekly.php | 2 -
src/cronjobs/scm/generate_scm_snapshots.php | 2 -
src/debian/changelog | 4 +-
src/debian/control.in | 2 +-
src/plugins/authldap/www/post-login.php | 16 +-
src/www/activity/index.php | 8 +-
26 files changed, 293 insertions(+), 69 deletions(-)
create mode 100644
src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
