Skip to content
Merged
Changes from 2 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
73e8632
Issue #SB-16209 fix: Added fix for collection deeplink issue while sc…
swayangjit Dec 16, 2019
c890307
Issue #SB-16209 merge: Merge pull request #331 from swayangjit/releas…
AmiableAnil Dec 16, 2019
a4eaf9d
Issue #SB-16953 fix: Adding loader before Tnc
NavKumarV Jan 6, 2020
bce781d
Issue #SB-16953 fix: Adding loader before Tnc-2
NavKumarV Jan 6, 2020
258a9cc
Issue #SB-16953 fix: Adding loader before Tnc-3
NavKumarV Jan 7, 2020
a17896d
Issue #SB-16953 merge: Merge pull request #413 from NavKumarV/release…
AmiableAnil Jan 7, 2020
2b7ddb3
Issue #SB-16649 fix: webview update popup
balakrishna-m Jan 7, 2020
5025953
Issue #SB-16649 fix: webview update popup
balakrishna-m Jan 7, 2020
4673189
Issue #SB-16649 merge: Merge pull request #418 from balakrishna10/rel…
swayangjit Jan 7, 2020
586a2ad
Issue: #SB-16926 chore: to additionally send stateId, districtId, dec…
JSDevL Jan 8, 2020
8c53bfe
Issue #SB-16649 fix: Updated the method to fetch the current webview …
swayangjit Jan 8, 2020
398066a
Merge pull request #426 from swayangjit/release-2.5.3
swayangjit Jan 8, 2020
a9ba9ec
Issue: #SB-16926 fix: REVERTED: deviceConfig changes
JSDevL Jan 9, 2020
65ad8ac
Issue: #SB-16926 merge: Merge pull request #424 from arfath-gwl/relea…
swayangjit Jan 9, 2020
3272400
Issue #SB-16942: Updated sunbird-sdk version.
swayangjit Jan 9, 2020
fc6d08e
Issue #SB-16942 merge: Merge pull request #427 from swayangjit/releas…
AmiableAnil Jan 9, 2020
07c59a3
Issue #SB-000 test: Added testcases for popups.
swayangjit Jan 9, 2020
fc80f41
Issue #SB-16649 fix: android web view issue
balakrishna-m Jan 9, 2020
a8a850b
Issue #SB-17157 fix: Fixed location popup issue.
AmiableAnil Jan 9, 2020
fe9b6eb
Issue #SB-16649 fix: android web view issue
balakrishna-m Jan 9, 2020
8021d1b
Issue #SB-16649 merge: Merge pull request #430 from balakrishna10/rel…
swayangjit Jan 9, 2020
6218909
Issue #SB-16649 fix: Update buildconfig reader tagged version.
swayangjit Jan 9, 2020
c9ad1a5
Issue #SB-16649 fix: Updated file-support tagged version.
swayangjit Jan 9, 2020
71734a7
Issue #SB-16649 fix: Merge pull request #431 from swayangjit/release-…
swayangjit Jan 9, 2020
a538b6e
Issue #SB-17157 merge: Merge pull request #429 from AmiableAnil/relea…
swayangjit Jan 9, 2020
8858b39
Merge branch 'release-2.7.0' of https://github.com/Sunbird-Ed/Sunbird…
swayangjit Jan 9, 2020
b8c8cc0
Issue #SB-000 merge: Merge branch 'release-2.5.3' into release-2.6.5
swayangjit Jan 9, 2020
900b88d
Issue #SB-000 merge: Merge pull request #432 from swayangjit/release-…
swayangjit Jan 9, 2020
16d45b2
Issue #SB-17157 fix: removing of hide-header code in tnc page.
NavKumarV Jan 10, 2020
f2c5b38
Issue #SB-17157 merge: Merge pull request #433 from NavKumarV/release…
swayangjit Jan 10, 2020
e731279
Issue #SB-16649 fix: Updated webview version to 68.
swayangjit Jan 10, 2020
641c072
Merge pull request #437 from swayangjit/release-2.6.5
sharathkashyap Jan 10, 2020
0c4a388
Issue: #SB-16926 chore: sdk version bump
JSDevL Jan 10, 2020
545eac0
Issue: #SB-16926 merge: Merge pull request #438 from arfath-gwl/relea…
swayangjit Jan 10, 2020
97025ed
Issue #SB-000 merge: Merge branch 'release-2.6.5' into release-2.7.0
swayangjit Jan 10, 2020
5303184
Issue #SB-000 test: Updated testcases for district mapping.
swayangjit Jan 10, 2020
dbaefd4
Issue #SB-000 merge: Merge branch 'release-2.7.0' of https://github.c…
swayangjit Jan 10, 2020
21afafb
Issue #SB-000 test : Added test cases for popups.
swayangjit Jan 12, 2020
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
2 changes: 1 addition & 1 deletion src/app/terms-and-conditions/terms-and-conditions.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export class TermsAndConditionsPage implements OnInit {
this.disableSubmitButton = false;
if (value['status']) {
if (this.commonUtilService.isUserLocationAvalable(serverProfile)
&& await tncUpdateHandlerService.isSSOUser(profile)) {
|| await tncUpdateHandlerService.isSSOUser(profile)) {
await tncUpdateHandlerService.dismissTncPage();
this.appGlobalService.closeSigninOnboardingLoader();
this.router.navigate(['/', RouterLinks.TABS]);
Expand Down