You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@airavata.apache.org by ma...@apache.org on 2017/11/20 21:52:39 UTC

[airavata-php-gateway] branch develop updated (954f717 -> fb11773)

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git.


    from 954f717  Merge branch 'Airavata-2279,2280' into develop
     add 64cb96d  Merge branch 'set-CAINFO-everywhere'
     add 943ed30  Add pga_config to gitignore
     add 343eca1  Add Idea PHPStorm files to gitignore
     add 660338c  Add .idea to gitignore
     add 3d21a7b  Add 'emailVerified' info to list of users returned by Keycloak::listUsers() and add 'emailVerified' column to manage-users.blade.php
     new fb11773  Merge branch 'AIRAVATA-2571' of https://github.com/neeraj-lad/airavata-php-gateway into develop

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore                             | 8 +++++++-
 app/libraries/Keycloak/Keycloak.php    | 2 +-
 app/views/admin/manage-users.blade.php | 6 ++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@airavata.apache.org" <co...@airavata.apache.org>'].

[airavata-php-gateway] 01/01: Merge branch 'AIRAVATA-2571' of https://github.com/neeraj-lad/airavata-php-gateway into develop

Posted by ma...@apache.org.

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git

commit fb1177344b7b57b9fa90ee8bba54f741de363b0c
Merge: 954f717 3d21a7b
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Nov 20 16:51:38 2017 -0500

    Merge branch 'AIRAVATA-2571' of https://github.com/neeraj-lad/airavata-php-gateway into develop

 .gitignore                             | 8 +++++++-
 app/libraries/Keycloak/Keycloak.php    | 2 +-
 app/views/admin/manage-users.blade.php | 6 ++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <co...@airavata.apache.org>.