ADAM / AIAHTML5 | GitLab

13 Sep, 2017

1 commit

The annotation bar was not working on CI due style syntax issue
8c21fe81

Amrita Vishnoi authored
2017-09-13 15:56:55 +0530
Browse Code »

08 Sep, 2017

4 commits

Merge branch 'Develop' into QA
f938f3d2

Nikita Kulshreshtha authored
2017-09-08 17:32:08 +0530
Browse Code »
Merge branch 'SearchDuplicateTermsIssue' into Develop
ed0a673f

Nikita Kulshreshtha authored
2017-09-08 15:45:08 +0530
Browse Code »
Merge branch 'QA' into Develop
e50dfe66

Nikita Kulshreshtha authored
2017-09-08 15:42:22 +0530
Browse Code »
this issue was introduced after increasing the timeout. Reverted the increased timeout. ...
8e9ae6bf
```
also there were issue in female, same terms were populating in different body views.
bodyview id was not set in localstorage. resolved this also,
```
Nikita Kulshreshtha authored
2017-09-08 15:06:04 +0530
Browse Code »

07 Sep, 2017

5 commits

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Develop
c6296f1e

Amrita Vishnoi authored
2017-09-07 18:23:12 +0530
Browse Code »
some changes after develop pull
d3aea965

Amrita Vishnoi authored
2017-09-07 18:22:59 +0530
Browse Code »
Merge branch 'Bug #21866 _2' into Develop
81edb415

Amrita Vishnoi authored
2017-09-07 17:34:01 +0530
Browse Code »
Ip address list
9dc05e92

Amrita Vishnoi authored
2017-09-07 15:46:08 +0530
Browse Code »
Mongo DB config file
bbc41b3c

Amrita Vishnoi authored
2017-09-07 12:47:47 +0530
Browse Code »

06 Sep, 2017

13 commits

message updated
5578d333

Amrita Vishnoi authored
2017-09-06 17:25:57 +0530
Browse Code »
merged QA into Develop to make develop updated
e339a575

Nikita Kulshreshtha authored
2017-09-06 16:49:08 +0530
Browse Code »
21866,21863 fix
3d9af83d

Nikita Kulshreshtha authored
2017-09-06 16:26:55 +0530
Browse Code »
21866,21863 fix
febfaab6

Nikita Kulshreshtha authored
2017-09-06 16:26:03 +0530
Browse Code »
Merge branch 'goBtnIssue_1' into QA
06b10eab

Amrita Vishnoi authored
2017-09-06 16:01:37 +0530
Browse Code »
estimation test
a460027c

Amrita Vishnoi authored
2017-09-06 15:51:04 +0530
Browse Code »
Merge branch 'CIGridViewIssueScroll' into QA
e6c000af

Amrita Vishnoi authored
2017-09-06 15:34:30 +0530
Browse Code »
Merge branch 'CAGridViewissueie' into QA
2d33b506

Amrita Vishnoi authored
2017-09-06 15:22:21 +0530
Browse Code »
Merge branch 'DAViewNotOpenIssue' into QA
a875ae5e

Amrita Vishnoi authored
2017-09-06 15:07:47 +0530
Browse Code »
this is solution for the bug CA issue with ie
9831dec9

Mukul Rajput authored
2017-09-06 14:56:53 +0530
Browse Code »
Merge branch 'Bug #22527 _1' into QA
a46b86a5

Amrita Vishnoi authored
2017-09-06 14:53:07 +0530
Browse Code »
this is solution for the bug Ci Gridview with scroll
40106395

Mukul Rajput authored
2017-09-06 13:27:13 +0530
Browse Code »
image canavs is not drawn that is why the issue occurs. ...
4f7608c2
```
incresed the time, need to test on server
```
Nikita Kulshreshtha authored
2017-09-06 10:48:09 +0530
Browse Code »

05 Sep, 2017

12 commits

Merge branch 'searchAnnotationIssue' into QA
f222589c

Nikita Kulshreshtha authored
2017-09-05 18:25:07 +0530
Browse Code »
Bug #22485 _1 merged
5dc6c30d

Amrita Vishnoi authored
2017-09-05 17:48:14 +0530
Browse Code »
Merge branch 'LMNotLoading' of http://52.6.196.163/ADAM/AIAHTML5 into QA
22292e83

Amrita Vishnoi authored
2017-09-05 17:28:27 +0530
Browse Code »
Bug #22099 _1 merged
c964685a

Amrita Vishnoi authored
2017-09-05 17:22:07 +0530
Browse Code »
Merge branch 'QA' of http://52.6.196.163/ADAM/AIAHTML5 into goBtnIssue_1
de1d6149

unknown authored
2017-09-05 17:07:56 +0530
Browse Code »
22484 :External Bug>Replace Go button from search with dropdown button and open … ...
f9554417
```
…search list on this button click.
```
unknown authored
2017-09-05 17:02:58 +0530
Browse Code »
Merge branch 'AAGridViewScrollissue' of http://52.6.196.163/ADAM/AIAHTML5 into QA
fd8bcd0d

Amrita Vishnoi authored
2017-09-05 16:44:38 +0530
Browse Code »
Merge branch 'QA' of http://52.6.196.163/ADAM/AIAHTML5 into searchAnnotationIssue
c87688d9

unknown authored
2017-09-05 16:29:47 +0530
Browse Code »
Merge branch 'inputboxlayernumberissue' into QA
f67efb58

Amrita Vishnoi authored
2017-09-05 16:16:58 +0530
Browse Code »
need to tets on server.
ed8b7317

Nikita Kulshreshtha authored
2017-09-05 16:15:42 +0530
Browse Code »
22404 : Duplicate body annotations/ structures are appearing in Search List and List Manager.
d990442c

unknown authored
2017-09-05 15:11:46 +0530
Browse Code »
if data is not found calling loadSerachData again and when get the data loading list manager
67307b1c

Nikita Kulshreshtha authored
2017-09-05 11:04:00 +0530
Browse Code »

04 Sep, 2017

5 commits

this is solution for bug 20273 AA state maintain issue in grid
81f9048c

Mukul Rajput authored
2017-09-04 18:25:22 +0530
Browse Code »
Merge branch 'Bug #22485 ' of http://52.6.196.163/ADAM/AIAHTML5 into QA ...
dec5c774
```
# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
#	400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
```
Amrita Vishnoi authored
2017-09-04 18:09:47 +0530
Browse Code »
tested for gender change by connecting to 43 databas efor layer 107 as this is h… ...
6650ea7f
```
…aving data for male and female anterior for muscular.
need to test on server for all views on gender as well as view chnage
```
Nikita Kulshreshtha authored
2017-09-04 18:08:58 +0530
Browse Code »
Merge branch 'Bug #22482 _1' into QA
2d48ba4c

Amrita Vishnoi authored
2017-09-04 17:45:44 +0530
Browse Code »
Merge branch 'Bug #22099 ' of http://52.6.196.163/ADAM/AIAHTML5 into Bug #22099 _1
e0d5bbac

Nikita Kulshreshtha authored
2017-09-04 17:33:06 +0530
Browse Code »