ADAM / AIAHTML5 | GitLab

05 Sep, 2017

1 commit

Merge branch 'inputboxlayernumberissue' into QA
f67efb58

Amrita Vishnoi authored
2017-09-05 16:16:58 +0530
Browse Code »

04 Sep, 2017

6 commits

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 »
Merge branch 'Bug #22482 _1' into QA
2d48ba4c

Amrita Vishnoi authored
2017-09-04 17:45:44 +0530
Browse Code »
Merge branch 'Bug #4471 ' into QA
4d8a6b47

Amrita Vishnoi authored
2017-09-04 16:59:28 +0530
Browse Code »
this is bug for 22096 layer number in layer input box, while move the slider
015f67ff

Mukul Rajput authored
2017-09-04 15:39:15 +0530
Browse Code »
Merged DoubleScrollbarIssue branch
fdcc4323

Amrita Vishnoi authored
2017-09-04 15:19:45 +0530
Browse Code »
added styles
57c00aa2

Nikita Kulshreshtha authored
2017-09-04 11:24:19 +0530
Browse Code »

01 Sep, 2017

9 commits

overlapbrushissue branch is merged
6ac32877

Amrita Vishnoi authored
2017-09-01 18:21:28 +0530
Browse Code »
need to test on server.
08947e16

Nikita Kulshreshtha authored
2017-09-01 18:15:47 +0530
Browse Code »
message pops up when no system available. ...
dd5b204f
```
need to correct the design.
```
Nikita Kulshreshtha authored
2017-09-01 17:47:42 +0530
Browse Code »
Merge branch 'overlapbrushissue' of http://52.6.196.163/ADAM/AIAHTML5 into QA
ed4758e5

Amrita Vishnoi authored
2017-09-01 17:45:01 +0530
Browse Code »
Merge branch 'AAActiveclassissue' of http://52.6.196.163/ADAM/AIAHTML5 into QA
199bf23a

Amrita Vishnoi authored
2017-09-01 17:29:52 +0530
Browse Code »
reduced time for loading fast
16ce3fde

Amrita Vishnoi authored
2017-09-01 16:58:54 +0530
Browse Code »
Atlas Anatomy loads slow so put wait cursor as well as the left tool bar show not appear delay.
6bcd834e

unknown authored
2017-09-01 15:51:31 +0530
Browse Code »
this is css issue of brush overlap
25fa2f7d

Mukul Rajput authored
2017-09-01 15:23:56 +0530
Browse Code »
this is bug for 21668
16039aba

Mukul Rajput authored
2017-09-01 11:43:42 +0530
Browse Code »

31 Aug, 2017

16 commits

this is solution for 21293 and 21297
742e1a88

Mukul Rajput authored
2017-08-31 15:49:40 +0530
Browse Code »
Merge branch 'QA' of http://52.6.196.163/ADAM/AIAHTML5 into AALoaderIssue
6216f09f

unknown authored
2017-08-31 15:49:08 +0530
Browse Code »
Loader Added In Atlas Anatomy Page
23661fb7

unknown authored
2017-08-31 15:38:18 +0530
Browse Code »
termData was null in Loading list manager so reacalled loading term data unction to get TermData.
ee3747db

Nikita Kulshreshtha authored
2017-08-31 15:25:39 +0530
Browse Code »
resolved issue in atlas anatomy, AOD.
a652edef

Nikita Kulshreshtha authored
2017-08-31 14:53:07 +0530
Browse Code »
bad merge
b1c2b210

unknown authored
2017-08-31 12:52:39 +0530
Browse Code »
removed one fix found issue in impact analysis
3f0c6648

Amrita Vishnoi authored
2017-08-31 12:43:53 +0530
Browse Code »
fixed this issue in DA
04010187

Nikita Kulshreshtha authored
2017-08-31 12:25:54 +0530
Browse Code »
Commit Changes
b776fa84

unknown authored
2017-08-31 11:28:19 +0530
Browse Code »
Commit Changes
685a3c1c

unknown authored
2017-08-31 11:24:34 +0530
Browse Code »
Merge branch 'dragdivositiossue' of http://52.6.196.163/ADAM/AIAHTML5 into QA
ce86bc01

Amrita Vishnoi authored
2017-08-31 11:21:17 +0530
Browse Code »
Manually merge in QA against #638 request
20203241

Amrita Vishnoi authored
2017-08-31 11:15:06 +0530
Browse Code »
Commit Changes
1c5ca50c

unknown authored
2017-08-31 10:51:06 +0530
Browse Code »
Merge branch 'Bug #21866 _1' of http://52.6.196.163/ADAM/AIAHTML5 into QA
4b9dcd1f

Amrita Vishnoi authored
2017-08-31 10:48:30 +0530
Browse Code »
this is solution for dragdivposition issue
654001b5

Mukul Rajput authored
2017-08-31 10:48:27 +0530
Browse Code »
Bug #21464 is merged manually
ef5fc94a

Amrita Vishnoi authored
2017-08-31 10:42:44 +0530
Browse Code »

30 Aug, 2017

5 commits

Globalized files
6511dc5a

Amrita Vishnoi authored
2017-08-30 17:29:37 +0530
Browse Code »
Merge branch 'Develop' into QA
d1f7f19f

Amrita Vishnoi authored
2017-08-30 17:12:45 +0530
Browse Code »
Merge branch 'AAPinIssue' of http://52.6.196.163/ADAM/AIAHTML5 into DevStable30Aug17 ...
8f7ed098
```
Conflicts:
	400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
```
unknown authored
2017-08-30 16:59:16 +0530
Browse Code »
Merge branch 'Bug #20467 ' of http://52.6.196.163/ADAM/AIAHTML5 into Develop
58e6b68d

Amrita Vishnoi authored
2017-08-30 16:05:49 +0530
Browse Code »
21215 : Atlas Anatomy > Pins appear on the Body System even when both Hide Pins … ...
1b04fbe3
```
…and Show All Pins In System(s) are un-select.
```
unknown authored
2017-08-30 13:17:57 +0530
Browse Code »

29 Aug, 2017

3 commits

commented code for making variable of isHighlightBodyByBodySystem false. ...
114ceb05
```
true is required for highlighting the body.
need to test this fix on server.
```
Nikita Kulshreshtha authored
2017-08-29 17:54:45 +0530
Browse Code »
Merge branch 'AtlasAnatomyJSPanelIssue' into Develop
ca615b74

Amrita Vishnoi authored
2017-08-29 16:50:13 +0530
Browse Code »
Merge branch 'AdminAccessMail' into Develop
1883ddec

Amrita Vishnoi authored
2017-08-29 16:10:11 +0530
Browse Code »