ADAM / AIAHTML5 | GitLab

06 Jan, 2017

15 commits

Merge branch 'eraselayerchange' into Develop
9fcc3c41

Amrita Vishnoi authored
2017-01-06 18:12:39 +0530
Browse Dir »
Merge branch 'catableviewnew' into Develop
ad250edf

Amrita Vishnoi authored
2017-01-06 18:03:04 +0530
Browse Dir »
Merge branch 'EditPopupIssuue' into Develop
a12bc3b6

Nikita Kulshreshtha authored
2017-01-06 17:57:41 +0530
Browse Dir »
Merge branch 'AnnotationDawingDetectMode_Merge' into Develop
6f506a63

Nikita Kulshreshtha authored
2017-01-06 17:54:48 +0530
Browse Dir »
merged AnnotationDawingDetectMode and renamed varibales
6b9edcfe

Nikita Kulshreshtha authored
2017-01-06 17:51:01 +0530
Browse Dir »
Fixed Line issue in IE
6f8c4019

Amrita Vishnoi authored
2017-01-06 17:34:35 +0530
Browse Dir »
fixed issue, introduced by merged changes from merge request
1aa20f6b

Amrita Vishnoi authored
2017-01-06 16:43:45 +0530
Browse Dir »
renamed variables
6b654e27

Amrita Vishnoi authored
2017-01-06 16:34:44 +0530
Browse Dir »
Renamed one more function
1e62cb2c

Amrita Vishnoi authored
2017-01-06 16:23:08 +0530
Browse Dir »
Fixed after conflict resolve
538312a1

Amrita Vishnoi authored
2017-01-06 16:03:25 +0530
Browse Dir »
Renamed the function names
5c37396d

Amrita Vishnoi authored
2017-01-06 15:52:11 +0530
Browse Dir »
merged Bugs_v15
cee03d59

Nikita Kulshreshtha authored
2017-01-06 15:18:05 +0530
Browse Dir »
Merge branch 'CICANewBugs' into Develop
e16a659d

Amrita Vishnoi authored
2017-01-06 13:23:51 +0530
Browse Dir »
Merge branch 'Bugs_v12' into Develop
c538cb1a

Nikita Kulshreshtha authored
2017-01-06 13:10:49 +0530
Browse Dir »
merged Bugs_v10 into develop
05cbcd96

Nikita Kulshreshtha authored
2017-01-06 12:54:45 +0530
Browse Dir »

05 Jan, 2017

1 commit

Bug #12388 :Clinical Illustration > Double list are showing in List View in the below mention steps. ...
6a8566fc
```
Bug #12395:Clinical Animation > Double list are showing in List View in the below mention steps.
```
Mitali Srivastava authored
2017-01-05 18:47:56 +0530
Browse Dir »

29 Dec, 2016

2 commits

commit changes for Issue Ref: #7747 :Annotation: Texture is not working
c8290476

unknown authored
2016-12-29 12:31:44 +0530
Browse Dir »
Commit changes for Issue Ref: #12221 :DA > Annotation Toolbar > If Outline option… ...
90ed96ca
```
… is unchecked, and user draw the shapes. Outline is display on the shapes.
```
unknown authored
2016-12-29 12:15:57 +0530
Browse Dir »

27 Dec, 2016

1 commit

this is solution for bug erase not work on layer change
caaa4c9c

Mukul Rajput authored
2016-12-27 18:04:54 +0530
Browse Dir »

26 Dec, 2016

1 commit

this is for ca table view new
c28c18a7

Mukul Rajput authored
2016-12-26 15:20:45 +0530
Browse Dir »

22 Dec, 2016

1 commit

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Bugs_v13 ...
ab08335b
```
# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
#	400-SOURCECODE/AIAHTML5.Web/index.html
```
unknown authored
2016-12-22 11:55:57 +0530
Browse Dir »

21 Dec, 2016

2 commits

this is for ie outline with color and size annotation image
35695cde

Mukul Rajput authored
2016-12-21 15:54:13 +0530
Browse Dir »
Commit Changes for textarea
b51b2ae2

unknown authored
2016-12-21 11:56:17 +0530
Browse Dir »

19 Dec, 2016

5 commits

Background Image Issue
473c797e

unknown authored
2016-12-19 15:29:35 +0530
Browse Dir »
Commit Changes
38fa0efb

unknown authored
2016-12-19 15:22:59 +0530
Browse Dir »
Commit changes for Issue Ref: 11545 : Annotation Toolbar > "Brush Size" identity is missing.
0b276ebf

unknown authored
2016-12-19 11:55:57 +0530
Browse Dir »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into AnnotationDawingDetectMode ...
582dbc1f
```
Conflicts:
	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
	400-SOURCECODE/AIAHTML5.Web/index.html
```
unknown authored
2016-12-19 11:37:51 +0530
Browse Dir »
Annotation: User should be able to see what he/she drawing
2fdee721

unknown authored
2016-12-19 11:27:36 +0530
Browse Dir »

16 Dec, 2016

5 commits

Merge branch 'AnnotationIssueInTB' into Develop
414afdff

Amrita Vishnoi authored
2016-12-16 17:52:47 +0530
Browse Dir »
Merge branch 'zIndexIssueinModestyTB' into Develop
e8674218

Amrita Vishnoi authored
2016-12-16 17:43:36 +0530
Browse Dir »
Merge branch 'Bug #10598 ' into Develop
9339a58c

Amrita Vishnoi authored
2016-12-16 17:26:56 +0530
Browse Dir »
Merge branch 'DAOpenViewIssue' into Develop
b8cff37e

Amrita Vishnoi authored
2016-12-16 17:15:02 +0530
Browse Dir »
Merge branch 'Erasetoolfunctionality' into Develop
7cca942d

Nikita Kulshreshtha authored
2016-12-16 12:07:09 +0530
Browse Dir »

15 Dec, 2016

4 commits

Merge branch 'paintinputboxnan' into Develop
2ce7857f

Nikita Kulshreshtha authored
2016-12-15 16:53:47 +0530
Browse Dir »
Merge branch 'CanvasDivScrollPositionIssue' into Develop
435997b1

Nikita Kulshreshtha authored
2016-12-15 16:38:48 +0530
Browse Dir »
Merge branch '#11132 ' into Develop
d0ebde2a

Nikita Kulshreshtha authored
2016-12-15 16:33:27 +0530
Browse Dir »
Merge branch 'PinClickedIssueResolved' into Develop
9a56818d

Nikita Kulshreshtha authored
2016-12-15 16:30:30 +0530
Browse Dir »

13 Dec, 2016

3 commits

Annotation issue is fixed in TB. ...
7b9b01fd
```
Now Modesty is implemented and also the annotations are correct on each place.
```
Nikita Kulshreshtha authored
2016-12-13 16:44:45 +0530
Browse Dir »
DA > Annotation search from Search List is not highlight in the List manager.
ac503277

unknown authored
2016-12-13 15:42:46 +0530
Browse Dir »
Annotations are working now in both mirror and non mirrored images in TBox. ...
267f8bdd
```
Need to implement annotations code on Modesty canva sin TB.
```
Nikita Kulshreshtha authored
2016-12-13 14:35:43 +0530
Browse Dir »