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, master has been updated
via 339bb8031e7f98ca2a6f403452e5af21176dc685 (commit)
via ebc5302cfcd6d7433988d86164b681ec84d116d2 (commit)
via cd101e8b20b8b0e1e95007b0494843d1ecfaa826 (commit)
via e138798db944e8de516beda128e7ef717dce5ade (commit)
via 59b860f81b505604d08d3835275fa1775dd2ad4d (commit)
via 83adb40d33b68a4c9e5297f75f53b2f353cbcc35 (commit)
via d441686804ef57bbddd647c98f61f9cfa89d6b54 (commit)
via 9d8ea8b3fd6c923eb503d4dbee3d9380d3090be5 (commit)
via fec7bc9a52832eea0d1b60d8aecf0ce8458b42d0 (commit)
via 25b385fbf28132d7228f3bf834abd7951553ef8f (commit)
via 61a181711ead4a2ad7bbdacda2e5719847aba0cd (commit)
via 786992d11a9ab8458dea646b7cf875de2e28fe4a (commit)
via e9f2528d1f296a8b949eb353484688de0b04434d (commit)
via 0a304be43a2769febbca03e1799bfe60bbbcbdac (commit)
via ca9ecfd10a0cdd1b4023d5f8d3605db95b150c26 (commit)
via cd2b771f2f0ebfbe12a485cbecddb3010bb8834f (commit)
via e17fa76ae15010cfdd5033e265efc3c062508fb9 (commit)
via 3b7700abfdbbd90ea23b2639e3902c1783fafb00 (commit)
via 347e789488241b9b32edfa5b8682f272a80d9680 (commit)
from f950f6aa695ea69b08c8a8bc9ebbb6d0eb6793f4 (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=339bb8031e7f98ca2a6f403452e5af21176dc685
commit 339bb8031e7f98ca2a6f403452e5af21176dc685
Merge: f950f6a ebc5302
Author: Franck Villaume <[email protected]>
Date: Wed Oct 4 09:44:45 2017 +0000
Merge 6.1 branch
diff --cc docker/Dockerfile
index e1cdb24,16deb74..e257b4f
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@@ -11,6 -11,7 +11,7 @@@ RUN yum -y install git openssh-server &
WORKDIR /opt/sources
RUN git clone
https://scm.fusionforge.org/anonscm/git/fusionforge/fusionforge.git
WORKDIR /opt/sources/fusionforge
-RUN git checkout 6.1
++RUN git checkout master
RUN source ./autoinstall/common-backports && \
yum install -y make tar && \
backports_rpm && \
diff --cc src/CHANGES
index ae03775,894878d..8e04164
--- a/src/CHANGES
+++ b/src/CHANGES
@@@ -1,6 -1,4 +1,6 @@@
- FusionForge 6.2.x:
++FusionForge X.y:
+
- FusionForge 6.1.0:
+ FusionForge 6.1:
* Accounts: minimum password length is now 8 (Sylvain Beucler)
* Accounts: add minimal constraints to password (upper-case, lower-case,
non-alphanumeric check) [#826] (Inria)
* Core System: support object association n-n, bidirectional (Artifact,
Document, FRSRelease) (TrivialDev)
diff --cc src/debian/changelog
index 53a367e,cd2fc62..a983d51
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@@ -1,3 -1,9 +1,15 @@@
++fusionforge (6.1.50-0) UNRELEASED; urgency=medium
++
++ * New snapshot from master branch.
++
++ -- Franck Villaume <[email protected]> Wed, 04 Oct 2017
09:40:00 +0200
++
+ fusionforge (6.1~alpha0) UNRELEASED; urgency=medium
+
+ * New snapshot from 6.1 stabilization branch
+
- -- Franck Villaume <franck.villaume@trivialdev> Sun, 01 Oct 2017 15:00:00
+0200
++ -- Franck Villaume <[email protected]> Sun, 01 Oct 2017
15:00:00 +0200
+
fusionforge (6.0.50-0) UNRELEASED; urgency=medium
* New snapshot from master branch.
-----------------------------------------------------------------------
Summary of changes:
docker/Dockerfile | 1 +
src/CHANGES | 6 +-
src/common/include/user_profile.php | 24 +-
src/common/include/utils.php | 22 +
src/common/tracker/Artifact.class.php | 167 +-
src/common/tracker/include/ArtifactHtml.class.php | 11 +-
src/debian/changelog | 12 +
src/debian/copyright | 2 +-
src/debian/plugins | 3 +
src/locale/fusionforge.pot | 9850 ++++++++++++---------
src/rpm/plugins | 5 +-
src/www/include/Layout.class.php | 2 +-
src/www/index_std.php | 238 +-
src/www/users | 1 -
14 files changed, 5829 insertions(+), 4515 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
