Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Story1 #21

Open
wants to merge 104 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
be7c876
Update login.html
ciandcd2017 Dec 6, 2017
8073580
Merge pull request #1 from ciandcd2017/feature1
ciandcd2017 Dec 6, 2017
94af48e
Update
ciandcd2017 Dec 8, 2017
8c4b379
Merge pull request #2 from ciandcd2017/demo1
ciandcd2017 Dec 8, 2017
e457a44
Updated for usrst1
ciandcd2017 Dec 14, 2017
aa8f510
Merge pull request #3 from ciandcd2017/userst1
ciandcd2017 Dec 14, 2017
6c07180
updated for story1
ciandcd2017 Dec 15, 2017
9c69737
Merge pull request #4 from ciandcd2017/story1
ciandcd2017 Dec 15, 2017
b7b2257
Revert back
ciandcd2017 Dec 15, 2017
13a1658
Merge pull request #5 from ciandcd2017/story1
ciandcd2017 Dec 15, 2017
7f77d6b
Account for internal user
ciandcd2017 Dec 15, 2017
27bf469
Merge pull request #6 from ciandcd2017/story1
ciandcd2017 Dec 15, 2017
1f4c81d
Updating Cdde
ciandcd2017 Dec 15, 2017
b2c6943
Merge pull request #7 from ciandcd2017/story1
ciandcd2017 Dec 15, 2017
8369762
Reverted
ciandcd2017 Dec 15, 2017
b7d7f4f
Merge pull request #8 from ciandcd2017/story1
ciandcd2017 Dec 15, 2017
3caf92f
Commit for Phase2 - GK8
ciandcd2017 Dec 18, 2017
f2187fa
Merge pull request #9 from ciandcd2017/story1
ciandcd2017 Dec 18, 2017
3fa0ce4
Reverted code for K8 Integ
ciandcd2017 Dec 18, 2017
ae2f313
Merge pull request #10 from ciandcd2017/story1
ciandcd2017 Dec 18, 2017
f1a8113
Test with Wipro GKE
ciandcd2017 Dec 19, 2017
0d03cd1
Merge pull request #11 from ciandcd2017/story1
ciandcd2017 Dec 19, 2017
8c63044
tested in Wipro GKE
ciandcd2017 Dec 19, 2017
73a2fcf
Merge pull request #12 from ciandcd2017/story1
ciandcd2017 Dec 19, 2017
cc317cc
Integrated Automation
ciandcd2017 Dec 19, 2017
ca27f5f
Merge pull request #13 from ciandcd2017/story1
ciandcd2017 Dec 19, 2017
ba802df
reverted for Demo
ciandcd2017 Dec 19, 2017
aec8ef9
Merge pull request #14 from ciandcd2017/story1
ciandcd2017 Dec 19, 2017
09c6298
Updated for External User
ciandcd2017 Jan 2, 2018
0aa31fc
Merge pull request #15 from ciandcd2017/story1
ciandcd2017 Jan 2, 2018
ec9c338
updated Id
ciandcd2017 Jan 4, 2018
f0cd1f4
Updated ID
ciandcd2017 Jan 4, 2018
47db796
Added new selenium script
ciandcd2017 Jan 4, 2018
91bdf80
committed with ID
ciandcd2017 Jan 5, 2018
1516865
Merge pull request #16 from ciandcd2017/story1
ciandcd2017 Jan 5, 2018
0fe4e3d
commit for external user
ciandcd2017 Jan 5, 2018
967ac64
Merge pull request #17 from ciandcd2017/story1
ciandcd2017 Jan 5, 2018
5928ca7
reverted
ciandcd2017 Jan 5, 2018
4636269
Merge pull request #18 from ciandcd2017/story1
ciandcd2017 Jan 5, 2018
1228502
commit for external user
ciandcd2017 Jan 8, 2018
6a32aeb
Merge pull request #19 from ciandcd2017/story1
ciandcd2017 Jan 8, 2018
b8b5a5c
Revert the changes for external user
ciandcd2017 Jan 9, 2018
3c24f4f
Merge pull request #20 from ciandcd2017/story1
ciandcd2017 Jan 9, 2018
e49e4ac
Making changes for adding a link to external user
ciandcd2017 Jan 9, 2018
0c3ca84
Merge pull request #21 from ciandcd2017/story1
ciandcd2017 Jan 9, 2018
674ae80
Revert changes of external user for next demo
ciandcd2017 Jan 9, 2018
5635b13
Merge pull request #22 from ciandcd2017/story1
ciandcd2017 Jan 9, 2018
8e3edc1
added
ciandcd2017 Jan 9, 2018
cdb5403
reverted
ciandcd2017 Jan 9, 2018
003c032
Commit for external user
ciandcd2017 Jan 10, 2018
c6b03ad
Merge pull request #23 from ciandcd2017/story1
ciandcd2017 Jan 10, 2018
005ddcd
Testing for cloud
ciandcd2017 Jan 10, 2018
05919a9
Revert the test for cloud
ciandcd2017 Jan 10, 2018
bade65f
Testing google cloud
ciandcd2017 Jan 10, 2018
757e2a4
Revert test google cloud
ciandcd2017 Jan 10, 2018
98275d8
Revert the external user change
ciandcd2017 Jan 10, 2018
0f1a819
Merge pull request #24 from ciandcd2017/story1
ciandcd2017 Jan 10, 2018
7a2cf52
updated code for external user
ciandcd2017 Jan 10, 2018
a5b9523
Merge pull request #25 from ciandcd2017/story1
ciandcd2017 Jan 10, 2018
03fba7d
Revert changes of the external user
ciandcd2017 Jan 11, 2018
43cb703
Merge pull request #26 from ciandcd2017/story1
ciandcd2017 Jan 11, 2018
f1415b9
Updating changes for external user to test using the selenium IDE
ciandcd2017 Jan 11, 2018
5034abb
Updating the external user for selenium ide testing
ciandcd2017 Jan 11, 2018
18dd236
Checking the master build in codefresh
ciandcd2017 Jan 12, 2018
f0bd088
testing the story1 branch
ciandcd2017 Jan 12, 2018
23fd9ea
Create test.py
ciandcd2017 Jan 12, 2018
e4fd21b
reverted the test changes in story1
ciandcd2017 Jan 17, 2018
4d2fe40
Reverted the test changes
ciandcd2017 Jan 17, 2018
56dce60
Updates changes based on the demo chat application
ciandcd2017 Jan 24, 2018
d75f92b
Creating a file to automate the lets chat application
ciandcd2017 Jan 29, 2018
1cad6eb
fix for sendkeys
ciandcd2017 Jan 29, 2018
8d0b2cd
combining the string for username and email
ciandcd2017 Jan 29, 2018
7aee9fb
manually give the value for time
ciandcd2017 Jan 29, 2018
53bf511
conversion of time to string
ciandcd2017 Jan 29, 2018
3911304
edit in time
ciandcd2017 Jan 29, 2018
71753fc
fix
ciandcd2017 Jan 29, 2018
078e455
Wait before clicking the confirm button
ciandcd2017 Jan 30, 2018
68fc7b1
Add the headers required for Webdiverwait
ciandcd2017 Jan 30, 2018
2bb8fc0
Waiting using sleep
ciandcd2017 Jan 30, 2018
bb6f067
fix for sleep for python
ciandcd2017 Jan 30, 2018
6d7ca74
Update selenium_test.py
ciandcd2017 Jan 30, 2018
e900a8d
update the millisecs
ciandcd2017 Jan 30, 2018
a28ef04
Update selenium_test.py
ciandcd2017 Jan 30, 2018
f48bbef
Update selenium_test.py
ciandcd2017 Jan 30, 2018
341a661
Update selenium_test.py
ciandcd2017 Jan 30, 2018
fad838d
Update selenium_test.py
ciandcd2017 Jan 30, 2018
e4d03dc
Update selenium_test.py
ciandcd2017 Jan 30, 2018
5c84f9c
Update selenium_test.py
ciandcd2017 Jan 30, 2018
5b6b46e
Update selenium_test.py
ciandcd2017 Jan 30, 2018
7f4c945
Update selenium_test.py
ciandcd2017 Jan 30, 2018
12f3fc6
Update selenium_test.py
ciandcd2017 Jan 30, 2018
f72c93c
Commenting the confirm button for testing
ciandcd2017 Jan 31, 2018
b07c1c7
Revert changes in external user
ciandcd2017 Feb 2, 2018
d9dce53
reverted changes of external user
ciandcd2017 Feb 2, 2018
29f5dee
Testing ADD check
ciandcd2017 Feb 2, 2018
60529ca
Revert back the testing
ciandcd2017 Feb 2, 2018
976c17d
Adding changes of external user in story1
ciandcd2017 Feb 2, 2018
dcf0e82
Merge branch 'master' into story1
ciandcd2017 Feb 2, 2018
62a3dd3
File not needed
ciandcd2017 Feb 5, 2018
8fc9afd
selenium_plugin is created
ciandcd2017 Feb 5, 2018
299e8a8
Reverting the changes in the external user
ciandcd2017 Feb 6, 2018
3c2b79b
Removed the string At Midnight from Lets Chat at Midnight
ciandcd2017 Feb 7, 2018
2ef32a4
Feature:External User
ciandcd2017 Feb 9, 2018
21eef63
Revert changes
ciandcd2017 Feb 14, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions templates/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<% block body %>
<section class="lcb-login-main">
<h1 class="lcb-login-logo">Let<span class="flavour">'</span>s Chat at Midnight!</h1>
<h1 class="lcb-login-logo">Let<span class="flavour">'</span>s Chat!</h1>
<div class="lcb-login-boxes">
<form class="lcb-login-box lcb-login-box-login validate" action="./account/login" method="post" data-refresh="true">
<h2 class="lcb-login-box-heading"><$ __('Sign in') $></h2>
Expand All @@ -29,12 +29,12 @@ <h2 class="lcb-login-box-heading"><$ __('Sign in') $></h2>
<% if auth.local.enableRegistration %>
<div class="links pull-left">
<a href="#" class="lcb-show-box" data-target=".lcb-login-box-registration">
<$ __('I need an account') $>
<$ __('Account for Internal User') $>
</a>
</div>
</div>
<% endif %>
<button class="btn-info btn btn-lg pull-right" type="submit">
<$ __('Sign in') $>
<$ __('Sign in now') $>
<i class="fa fa-sign-in"></i>
</button>
</div>
Expand All @@ -46,31 +46,31 @@ <h2 class="lcb-login-box-heading"><$ __('Register') $></h2>
<div class="input-group">
<span class="input-group-addon">@</span>
<input type="text" name="username"
class="required form-control"
id="username" class="required form-control"
placeholder="<$ __('Username') $>" maxlength="24" >
</div>
</div>
<div class="form-group">
<input class="required email form-control" name="email" type="text" placeholder="<$ __('Email') $>" />
<input class="required email form-control" name="email" id="email" type="text" placeholder="<$ __('Email') $>" />
</div>
<div class="form-group">
<input class="required form-control" name="display-name" type="text" placeholder="<$ __('Display Name') $>" maxlength="24" />
<input class="required form-control" name="display-name" id="display-name" type="text" placeholder="<$ __('Display Name') $>" maxlength="24" />
</div>
<div class="row">
<div class="form-group col-sm-9">
<input class="required form-control" name="first-name" type="text" placeholder="<$ __('First Name') $>" maxlength="24" />
<input class="required form-control" name="first-name" type="text" id="first-name" placeholder="<$ __('First Name') $>" maxlength="24" />
</div>
<div class="form-group col-sm-9">
<input class="required form-control" name="last-name" type="text" placeholder="<$ __('Last Name') $>" maxlength="24" />
<input class="required form-control" name="last-name" id="last-name" type="text" placeholder="<$ __('Last Name') $>" maxlength="24" />
</div>
</div>
<div class="row">
<div class="form-group col-sm-9">
<input class="required form-control" name="password" type="password"
<input class="required form-control" name="password" id="password" type="password"
placeholder="<$ __('Password') $>" minlength="8" maxlength="64" autocomplete="off" />
</div>
<div class="form-group col-sm-9">
<input class="required form-control" name="password-confirm" type="password"
<input class="required form-control" name="password-confirm" id="password-confirm" type="password"
placeholder="<$ __('Confirm Password') $>" minlength="8" maxlength="64" autocomplete="off" />
</div>
</div>
Expand All @@ -80,7 +80,7 @@ <h2 class="lcb-login-box-heading"><$ __('Register') $></h2>
<$ __('I already have an account') $>
</a>
</div>
<button class="btn-info btn btn-lg pull-right" type="submit">
<button class="btn-info btn btn-lg pull-right" type="submit" id="submit">
<$ __('Register') $>
</button>
</div>
Expand Down