ADAM / AIAHTML5 | GitLab

11 Oct, 2017

6 commits

Merge branch 'DisablePendingModules' into Develop
3d8d7054

Amrita Vishnoi authored
2017-10-11 13:48:05 +0530
Browse Code »
Merge branch 'PendingUserModules' into Develop
9ed1a0c0

Amrita Vishnoi authored
2017-10-11 13:45:38 +0530
Browse Code »
Merge branch 'UserModulesOrder-2' into Develop
752c72e9

Amrita Vishnoi authored
2017-10-11 13:43:01 +0530
Browse Code »
Merge branch 'highlightbyBodySystemBug' into Develop
d9ced140

Amrita Vishnoi authored
2017-10-11 12:14:17 +0530
Browse Code »
nikita's code.
3aa73b9b

Mukul Rajput authored
2017-10-11 11:43:28 +0530
Browse Code »
Merge branch 'Bug23222' into Develop
0af9dd05

Amrita Vishnoi authored
2017-10-11 11:43:22 +0530
Browse Code »

10 Oct, 2017

2 commits

Committing 'Disable Pending Modules' code
c9c94e8a

Utkarsh Singh authored
2017-10-10 13:39:36 +0530
Browse Code »
Committing updated code refs: 21269
97ede35d

Utkarsh Singh authored
2017-10-10 10:43:08 +0530
Browse Code »

09 Oct, 2017

6 commits

Updated code
bdbd138b

Utkarsh Singh authored
2017-10-09 19:15:49 +0530
Browse Code »
this is revert back of Tileviewcontroller and Tileviewhml with version 77
74b4c993

Mukul Rajput authored
2017-10-09 15:57:17 +0530
Browse Code »
Committing updated code regarding showing pending modules under heading
5c2fce35

Utkarsh Singh authored
2017-10-09 12:57:01 +0530
Browse Code »
variable name was wrong
98c2c8b3

Nikita Kulshreshtha authored
2017-10-09 12:32:37 +0530
Browse Code »
Committing updated file
3cf8a2a3

Utkarsh Singh authored
2017-10-09 11:36:32 +0530
Browse Code »
Removed unused log entry
5e70cfea

Utkarsh Singh authored
2017-10-09 10:09:54 +0530
Browse Code »

06 Oct, 2017

8 commits

Committing updated files regarding user modules
718c5ead

Utkarsh Singh authored
2017-10-06 18:11:18 +0530
Browse Code »
modified module order and moduleId similar in database.
5bd0714d

Amrita Vishnoi authored
2017-10-06 16:02:26 +0530
Browse Code »
Merge branch 'Develop' into QA
334ca5aa

Amrita Vishnoi authored
2017-10-06 12:09:42 +0530
Browse Code »
Merge branch 'LoginFixes2' into Develop
7f3f710c

Amrita Vishnoi authored
2017-10-06 11:54:00 +0530
Browse Code »
Nikita login fixes under Merge Request #703
2a60d8dc

Amrita Vishnoi authored
2017-10-06 11:48:34 +0530
Browse Code »
Merge branch 'applyBtnAAIssue' into Develop
7bf18d67

Nikita Kulshreshtha authored
2017-10-06 11:09:25 +0530
Browse Code »
this is solution for the bug 23452 Apply btn issue with AA
f2375d8f

Mukul Rajput authored
2017-10-06 10:45:23 +0530
Browse Code »
changed code for getting modules.
d1e46479

Nikita Kulshreshtha authored
2017-10-06 10:39:33 +0530
Browse Code »

05 Oct, 2017

7 commits

Merge branch 'LoginFixes1' into Develop
edfbce74

Amrita Vishnoi authored
2017-10-05 18:26:25 +0530
Browse Code »
Merge branch 'Bug-21861-2' into Develop
a4167b49

Amrita Vishnoi authored
2017-10-05 18:11:27 +0530
Browse Code »
Merge branch 'Bug-21269-2' into Develop
0da87b4f

Amrita Vishnoi authored
2017-10-05 17:45:51 +0530
Browse Code »
Merge branch 'QA' into Develop
78a8690b

Amrita Vishnoi authored
2017-10-05 17:30:08 +0530
Browse Code »
Committing updated code refs: #21861
b82ad628

Utkarsh Singh authored
2017-10-05 15:01:27 +0530
Browse Code »
merged loginFixes
2267dd55

Nikita Kulshreshtha authored
2017-10-05 14:12:38 +0530
Browse Code »
Committing updated files refs: #21269
26743028

Utkarsh Singh authored
2017-10-05 13:37:33 +0530
Browse Code »

04 Oct, 2017

11 commits

removed reference
7dd270c6

Amrita Vishnoi authored
2017-10-04 18:25:09 +0530
Browse Code »
a defect introduced in annotations due to that annotation text was showing in multiline
2345f819

Amrita Vishnoi authored
2017-10-04 17:18:56 +0530
Browse Code »
Merge branch 'Bug-23238-2' of http://52.6.196.163/ADAM/AIAHTML5 into QA
d349f2b8

Amrita Vishnoi authored
2017-10-04 17:00:11 +0530
Browse Code »
Null check
dba4e561

Amrita Vishnoi authored
2017-10-04 16:54:25 +0530
Browse Code »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into QA ...
78c07a91
```
# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/index.html
```
Amrita Vishnoi authored
2017-10-04 16:49:47 +0530
Browse Code »
Committing updated code refs: 23238
e2e97be9

Utkarsh Singh authored
2017-10-04 16:45:38 +0530
Browse Code »
Merge branch 'Bug #23119 _1' of http://52.6.196.163/ADAM/AIAHTML5 into Develop ...
e3c3cc0e
```
# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
```
Amrita Vishnoi authored
2017-10-04 16:16:00 +0530
Browse Code »
Merge branch 'Prod_AnnotatyionIssue' into Develop
89a3c155

Amrita Vishnoi authored
2017-10-04 15:24:57 +0530
Browse Code »
SQL password changed
da3025f7

Amrita Vishnoi authored
2017-10-04 13:38:40 +0530
Browse Code »
Against Merge request #693
5d566074

Amrita Vishnoi authored
2017-10-04 13:03:10 +0530
Browse Code »
changed msg in error
91466682

Nikita Kulshreshtha authored
2017-10-04 11:38:22 +0530
Browse Code »