Commit 0b9f03a4 authored by Stéphane Bouvry's avatar Stéphane Bouvry
Browse files

Merge branch 'master' into rc

parents d692eb46 cce80cb5

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ prototype/timesheet/* 
!prototype/timesheet/test-exel.php

!prototype/timesheet/ods-base-test.xls



# Fichiers générés mais inutiles (POI)

public/js/oscar/dist/index.html



doc/*.html



# Connecteurs

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line 
image: localhost:5000/unicaen-dev-php7.0-apache

before_script:

  - export http_proxy=http://10.14.128.99:3128

  - export https_proxy=http://10.14.128.99:3128

config/autoload/unicaen-app.global.php

+1 −14
Original line number Diff line number Diff line
@@ -36,20 +36,7 @@ $settings = array( 
            'FILTER_STRUCTURE_CODE_ENTITE_PARENT'   => '(supannCodeEntiteParent=%s)',

        ],



        'log_path' => '/tmp/oscar-ldap.log',

        'connection' => array(

            'default' => array(

                'params' => array(

                    'host'                => 'ldap.unicaen.fr',

                    'port'                => 389,

                    'username'            => 'uid=applidev,ou=system,dc=unicaen,dc=fr',

                    'password'            => 'Ifq1pdeS2of_7DC',

                    'baseDn'              => 'ou=people,dc=unicaen,dc=fr',

                    'bindRequiresDn'      => true,

                    'accountFilterFormat' => '(&(objectClass=posixAccount)(supannAliasLogin=%s))',

                )

            )

        )

        'log_path' => '/tmp/oscar-ldap.log'

    ],

    'app_infos' => array(

        'nom'     => 'OSCAR',