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/07 21:37:22 UTC

[airavata-php-gateway] 01/01: Merge branch 'AIRAVATA-2502'

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

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

commit c8a9bfdfbccb79cb305c7f03ac480a7e305cdebb
Merge: 4f5aff9 7f9dbd5
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Tue Nov 7 16:37:11 2017 -0500

    Merge branch 'AIRAVATA-2502'

 app/controllers/AccountController.php       |  4 +++
 app/libraries/CommonUtilities.php           | 12 ++++++---
 app/views/account/create.blade.php          | 28 ++++++++++++--------
 app/views/account/login-desktop.blade.php   | 36 +++++++++++++++++++-------
 app/views/account/login.blade.php           | 40 +++++++++++++++++++++--------
 app/views/partials/login-external.blade.php | 14 +++++-----
 public/css/bootstrap.min.css                | 27 +++++++++++++++++++
 7 files changed, 120 insertions(+), 41 deletions(-)

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