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/03 15:59:01 UTC
[airavata-php-gateway] 02/02: Merge branch 'AIRAVATA-2502' into
develop
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 4b917455653d9025352575b19fd3140ebbf4f894
Merge: e7e0c19 fd6675b
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Fri Nov 3 11:57:05 2017 -0400
Merge branch 'AIRAVATA-2502' into develop
app/controllers/AccountController.php | 4 ++++
app/libraries/CommonUtilities.php | 12 ++++++----
app/views/account/create.blade.php | 25 +++++++++++--------
app/views/account/login-desktop.blade.php | 36 +++++++++++++++++++++-------
app/views/account/login.blade.php | 37 +++++++++++++++++++++--------
app/views/partials/login-external.blade.php | 14 +++++------
public/css/bootstrap.min.css | 28 ++++++++++++++++++++++
7 files changed, 115 insertions(+), 41 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <co...@airavata.apache.org>.