You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/10/19 23:56:36 UTC
airavata-php-gateway git commit: fixing AIRAVATA-1813
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master 88b50373d -> 875c5a10d
fixing AIRAVATA-1813
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/875c5a10
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/875c5a10
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/875c5a10
Branch: refs/heads/master
Commit: 875c5a10d07f4d1e5429a5709ee8c448041a86ed
Parents: 88b5037
Author: scnakandala <su...@gmail.com>
Authored: Mon Oct 19 17:56:31 2015 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Oct 19 17:56:31 2015 -0400
----------------------------------------------------------------------
app/controllers/AccountController.php | 2 +-
app/views/account/create.blade.php | 2 +-
app/views/application/interface.blade.php | 1 +
app/views/application/module.blade.php | 1 +
4 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/875c5a10/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 0f9ccf7..e73c4e5 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -12,7 +12,7 @@ class AccountController extends BaseController
{
$rules = array(
"username" => "required|min:6",
- "password" => "required|min:6|max:12|regex:/^.*(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[@!$#%&*]).*$/",
+ "password" => "required|min:6|max:12|regex:/^.*(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[@!$#%*]).*$/",
"confirm_password" => "required|same:password",
"email" => "required|email",
);
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/875c5a10/app/views/account/create.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/create.blade.php b/app/views/account/create.blade.php
index 3926e49..6b03173 100644
--- a/app/views/account/create.blade.php
+++ b/app/views/account/create.blade.php
@@ -39,7 +39,7 @@
<div class="form-group required"><label class="control-label">Password</label>
<div><input class="form-control" id="password" minlength="6" name="password" placeholder="Password"
- required="required" title="" type="password" data-container="body" data-toggle="popover" data-placement="left" data-content="Password needs to contain at least (a) One lower case letter (b) One Upper case letter and (c) One number (d) One of the following special characters - !@#$%&*"/>
+ required="required" title="" type="password" data-container="body" data-toggle="popover" data-placement="left" data-content="Password needs to contain at least (a) One lower case letter (b) One Upper case letter and (c) One number (d) One of the following special characters - !@#$%*"/>
</div>
</div>
<div class="form-group required"><label class="control-label">Password (again)</label>
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/875c5a10/app/views/application/interface.blade.php
----------------------------------------------------------------------
diff --git a/app/views/application/interface.blade.php b/app/views/application/interface.blade.php
index 6862914..1527ccf 100644
--- a/app/views/application/interface.blade.php
+++ b/app/views/application/interface.blade.php
@@ -48,6 +48,7 @@
data-parent="#accordion" href="#collapse-{{$index}}">
{{ $interface->applicationName }}
</a>
+ <small>{{ $interface->applicationInterfaceId }}</small>
@if(Session::has("admin"))
<div class="pull-right col-md-2 interface-options fade">
<span class="glyphicon glyphicon-pencil edit-app-interface" style="cursor:pointer;"
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/875c5a10/app/views/application/module.blade.php
----------------------------------------------------------------------
diff --git a/app/views/application/module.blade.php b/app/views/application/module.blade.php
index e75f4c4..557f6ff 100644
--- a/app/views/application/module.blade.php
+++ b/app/views/application/module.blade.php
@@ -59,6 +59,7 @@
href="#collapse-{{$index}}">
{{ $module->appModuleName }}
</a>
+ <small>{{ $module->appModuleId }}</small>
@if(Session::has("admin"))
<div class="pull-right col-md-2 module-options fade">
<span class="glyphicon glyphicon-pencil edit-app-module" style="cursor:pointer;"