[Fusionforge-commits] FusionForge branch GUM updated. 583456fac1d2b1af7f02682ec94d9a6169aae212

Sylvain Beucler beuc-inria at fusionforge.org
Fri Aug 22 09:07:32 CEST 2014


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, GUM has been updated
       via  583456fac1d2b1af7f02682ec94d9a6169aae212 (commit)
       via  4d6891f9fca8ce88e5ac182d29fd5d77006240a5 (commit)
       via  cce71ddf38fd1a24f88668ab1ab96d4ef5d2a5be (commit)
       via  32ef1be88060f137cc051895f2053ce4734bbe6d (commit)
       via  6878f49575260fd85707e6c47b542fb07c47c1e0 (commit)
       via  4d8accbb0df610b5fb1f4a35ce86c288c28dc2d8 (commit)
       via  845b969719789a7eee168265cc7bf4c5f3a9eb67 (commit)
       via  d48076e73f17899a7580f8483f6355998b3f2c52 (commit)
       via  e51e928523137c533c2258e564dc631b9cf21acc (commit)
       via  6e74d197024b888de299043999ec2034114561ce (commit)
       via  dc0c92d6c9e35171c7710358a676e3e1da02374b (commit)
       via  b1162df369dc93fbdab227a9320289f5038b84b8 (commit)
       via  e5fc9eec7adf8f08e8463027863cc3d69d125e33 (commit)
       via  f1f46bee529a80f5519570314ae6eab17717f756 (commit)
       via  b8dc5bc3d79e9358a7bfd50f7c2ee8495f7a6641 (commit)
       via  852f691e0975bf6c529a56357aa1ff34c0c3be77 (commit)
       via  d9eab294b2af2a9fcc77d861d80927d78c0864df (commit)
       via  042c8a32f0c023eecc605079c19b4dd13f5d6a6a (commit)
       via  7858ea1cfceb8eb54b1d25792ae8eae04046c4a5 (commit)
       via  f03c6750fd41dc524410296d482907abd4bbe27f (commit)
       via  d6a93427c37940939f5391fce8f3720436ed1f8f (commit)
       via  17f9aa4127f28747c0a395f473394c941387f5c5 (commit)
       via  2cc3d39ac77ba02fa22956afed12c876cc0fb1eb (commit)
       via  bd48ef0b88c9a21e394e659b2558f249fa2ec1a3 (commit)
       via  43021a59ecac2183d9e332d06ddf7c451d094b1e (commit)
       via  f5674451915dba1dc2be5f8ec1e56038635f2135 (commit)
       via  0f8f04d5b870c2d5d96a573676d1bcf9f59de2a9 (commit)
       via  7c4ea0b089dbfb03fcfef7cf7f3cdccb08fe6c50 (commit)
       via  30dae1bcaa87f3265ef29d531ae7e66b9a8f5af4 (commit)
       via  b3bad23b14273ea85d0d8575d73ce0c3084f24ca (commit)
       via  e39da791343d5db729e980b04eb1dc88ba8c5352 (commit)
      from  8afa34aacd929059e503e063ce00044933182f1e (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 -----------------------------------------------------------------
commit 583456fac1d2b1af7f02682ec94d9a6169aae212
Merge: 8afa34a 4d6891f
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Aug 22 08:59:02 2014 +0200

    Merge remote-tracking branch 'origin/master' into GUM
    
    Conflicts:
    	src/utils/manage-apache-config.sh


-----------------------------------------------------------------------

Summary of changes:
 src/CHANGES                                        |   24 +-
 src/bin/migrate-to-ini-files.sh                    |    1 -
 src/common/frs/FRSPackage.class.php                |    7 +
 src/common/frs/include/frs_utils.php               |   12 -
 src/common/frs/views/admin.php                     |   13 +-
 src/common/include/Group.class.php                 |   10 +-
 src/common/include/GroupJoinRequest.class.php      |   68 ++--
 src/db/20140819-frs-migrate-rbac.sql               |   35 ++
 ...140821-drop-project-database-broken-feature.sql |    5 +
 src/etc/config.ini.d/defaults.ini                  |    1 -
 .../moinmoin/common/MoinMoinPlugin.class.php       |    1 +
 src/www/admin/database.php                         |  170 ---------
 src/www/admin/index.php                            |    6 +-
 src/www/developer/diary.php                        |    2 +-
 src/www/include/Layout.class.php                   |    2 +-
 src/www/project/admin/database.php                 |  255 -------------
 src/www/project/admin/project_admin_utils.php      |   46 ---
 src/www/project/admin/users.php                    |  377 ++++++++------------
 src/www/project/memberlist.php                     |   60 ++--
 src/www/project/report/index.php                   |  146 ++++----
 src/www/project/request.php                        |   29 +-
 src/www/project/stats/index.php                    |   13 +-
 src/www/themes/css/fusionforge.css                 |    9 +
 tests/scripts/phpunit.sh                           |   26 +-
 24 files changed, 399 insertions(+), 919 deletions(-)
 create mode 100644 src/db/20140819-frs-migrate-rbac.sql
 create mode 100644 src/db/20140821-drop-project-database-broken-feature.sql
 delete mode 100644 src/www/admin/database.php
 delete mode 100644 src/www/project/admin/database.php


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list