ADAM / AIAHTML5 | GitLab

10 Jan, 2017

2 commits

Rectangle resizing issue resolved
46998b12

unknown authored
2017-01-10 17:48:25 +0530
Browse File »
Merged Code With Stable Code
c105cbda

unknown authored
2017-01-10 16:00:40 +0530
Browse File »

09 Jan, 2017

3 commits

Merge branch 'CICAMenu' into Develop
532e67d4

Nikita Kulshreshtha authored
2017-01-09 17:48:23 +0530
Browse File »
Bug #11539 fixes
54b0692c

Amrita Vishnoi authored
2017-01-09 15:54:45 +0530
Browse File »
Bug #10201 : Menu > Options ----> List Manger and Add to Existing Curriculum shou… ...
09ecfd7d
```
…ld be disable on CI and CA Detail page.
```
Mitali Srivastava authored
2017-01-09 13:43:26 +0530
Browse File »

06 Jan, 2017

9 commits

Merge branch 'cinewerase' into Develop
7e3fe013

Amrita Vishnoi authored
2017-01-06 18:28:03 +0530
Browse File »
Merge branch 'AnnotationDawingDetectMode_Merge' into Develop
6f506a63

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

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

Amrita Vishnoi authored
2017-01-06 17:34:35 +0530
Browse File »
renamed variables
6b654e27

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

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

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

Amrita Vishnoi authored
2017-01-06 15:52:11 +0530
Browse File »
merged Bugs_v10 into develop
05cbcd96

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

05 Jan, 2017

1 commit

this is ci erase tool functionality
020abb71

Mukul Rajput authored
2017-01-05 16:19:04 +0530
Browse File »

29 Dec, 2016

1 commit

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 File »

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 File »

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 File »
Commit Changes for textarea
b51b2ae2

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

19 Dec, 2016

3 commits

Commit Changes
38fa0efb

unknown authored
2016-12-19 15:22:59 +0530
Browse File »
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 File »
Annotation: User should be able to see what he/she drawing
2fdee721

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

16 Dec, 2016

1 commit

Merge branch 'Erasetoolfunctionality' into Develop
7cca942d

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

13 Dec, 2016

4 commits

after changing code for modesty. Navigator image was not reflected on skintone/ modesty change. ...
0a6e382d
```
Remove angular binding from navImg and added src attribute when we get nav image src.
Also added new event for changing Nav image on modesty change only.
```
Nikita Kulshreshtha authored
2016-12-13 18:18:12 +0530
Browse File »
DA > Annotation search from Search List is not highlight in the List manager.
ac503277

unknown authored
2016-12-13 15:42:46 +0530
Browse File »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Bugs_v10 ...
868ce8d7
```
# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
#	400-SOURCECODE/AIAHTML5.Web/index.html
```
unknown authored
2016-12-13 12:33:30 +0530
Browse File »
Commit changes for mukul impact issue . Removed utkarsh's code
48f33248

unknown authored
2016-12-13 12:15:12 +0530
Browse File »

12 Dec, 2016

3 commits

this is for erase functionality
966a7a2c

Mukul Rajput authored
2016-12-12 19:38:45 +0530
Browse File »
issue is fixed but navigator image is not changed on settings change. Need to see
d634241c

Nikita Kulshreshtha authored
2016-12-12 12:41:09 +0530
Browse File »
DA > Annotation search from Search List is not highlight in the List manager.
3d5dcdc4

unknown authored
2016-12-12 10:50:55 +0530
Browse File »

09 Dec, 2016

2 commits

changed the code for settings. ...
072fb342
```
Need to stop the multiple call on settingsEvent listener then will fix the bug
```
Nikita Kulshreshtha authored
2016-12-09 18:24:11 +0530
Browse File »
This commit contains change for Utkarash and Impact issue caused from mukul 's merge
f0c0a72e

unknown authored
2016-12-09 11:56:56 +0530
Browse File »

07 Dec, 2016

1 commit

DA > Annotation > When Pin is selected and click on any where on the screen only… ...
1423cfe2
```
… head of the pin is displays.
```
unknown authored
2016-12-07 17:53:13 +0530
Browse File »

05 Dec, 2016

1 commit

bug 9711 is fixed
d545a0a4

Nikita Kulshreshtha authored
2016-12-05 12:22:14 +0530
Browse File »

30 Nov, 2016

1 commit

commit changes for Issue : 9711
db85f87f

unknown authored
2016-11-30 16:09:32 +0530
Browse File »

28 Nov, 2016

1 commit

Paint Brush Size issue Resolved
3152a626

Mukul Rajput authored
2016-11-28 12:47:50 +0530
Browse File »

17 Nov, 2016

1 commit

Commit changes for #9842 :Annotation > Font- size problem.
eddec163

unknown authored
2016-11-17 17:58:26 +0530
Browse File »

15 Nov, 2016

3 commits

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Bugs_v5
4006fee4

unknown authored
2016-11-15 17:24:50 +0530
Browse File »
Commit changes for Issue Ref #10122 :Clinical Animation > Annotation Toolbar gets… ...
87e7d110
```
… enable when List Manager is opened and closed in CA detail page.
```
unknown authored
2016-11-15 16:26:37 +0530
Browse File »
Settings > The entire highlighted part should be active
f52704b5

unknown authored
2016-11-15 12:34:43 +0530
Browse File »