ADAM / AIAHTML5 | GitLab

02 Jun, 2017

2 commits

annotations are shown on pin head click but need to impement multiannotation and… ...
e0a24ef5
```
… also need to write code for make head green for multiple pins
```
Nikita Kulshreshtha authored
2017-06-02 18:15:56 +0530
Browse File »
changed the implementation of pin drawing. Now using jcanvas to draw the pins on image.
84b28320

Nikita Kulshreshtha authored
2017-06-02 14:00:03 +0530
Browse File »

01 Jun, 2017

3 commits

using jcanvas for annotations but not working
8c101bb4

Nikita Kulshreshtha authored
2017-06-01 18:26:36 +0530
Browse File »
List Manager Active Issue
4be6fa1c

unknown authored
2017-06-01 16:00:29 +0530
Browse File »
Commit Changes
c2b7080e

unknown authored
2017-06-01 15:51:41 +0530
Browse File »

31 May, 2017

1 commit

11132:DA > Annotation search from Search List is not highlight in the List manager.
9e176a5f

unknown authored
2017-05-31 15:00:36 +0530
Browse File »

30 May, 2017

1 commit

18477:Settings > Lexicons > Verify : Selected lexicons are not displayed on the body annotation.
1bd95a37

unknown authored
2017-05-30 15:11:06 +0530
Browse File »

15 May, 2017

2 commits

Defect fixed for cleaning history of user.
9e1c50a7

Amrita Vishnoi authored
2017-05-15 16:31:08 +0530
Browse File »
FIx for bug 17019
e9e605fd

Amrita Vishnoi authored
2017-05-15 13:34:03 +0530
Browse File »

12 May, 2017

6 commits

Merge branch 'Bug_17182' into Develop
d88fa2c9

Amrita Vishnoi authored
2017-05-12 16:44:44 +0530
Browse File »
this is for bug 17129
7b8a1a36

Mukul Rajput authored
2017-05-12 16:19:54 +0530
Browse File »
Merge branch 'removecanclebutton' into Develop
f601412f

Amrita Vishnoi authored
2017-05-12 14:52:08 +0530
Browse File »
Merge branch 'exportimagebackgroundissue' into Develop
0cf24b1a

Amrita Vishnoi authored
2017-05-12 12:40:19 +0530
Browse File »
Merge branch 'modalbackgroundissue' into Develop
75dc9777

Amrita Vishnoi authored
2017-05-12 12:24:36 +0530
Browse File »
Merged for Bu : 16276. Merged Against #462 .
a5b3697f

Amrita Vishnoi authored
2017-05-12 12:00:48 +0530
Browse File »

01 May, 2017

1 commit

this is bug for 17180
139e5803

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

26 Apr, 2017

1 commit

removed message box if logged in id is null
2e6bc8fd

Amrita Vishnoi authored
2017-04-26 17:29:35 +0530
Browse File »

21 Apr, 2017

3 commits

this is for Bug #16272 , #16340
6fecfd8b

Mukul Rajput authored
2017-04-21 12:36:52 +0530
Browse File »
Committed code, refs: #17181 , 17182
65c11490

Utkarsh Singh authored
2017-04-21 11:22:55 +0530
Browse File »
Committed code, Refs: #17181 , 17182
b53e0010

Utkarsh Singh authored
2017-04-21 11:18:04 +0530
Browse File »

20 Apr, 2017

1 commit

this is for bug 16359
299bad19

Mukul Rajput authored
2017-04-20 12:40:01 +0530
Browse File »

19 Apr, 2017

1 commit

print preview issue fixed
b6cfc0bf

Mukul Rajput authored
2017-04-19 16:12:22 +0530
Browse File »

17 Apr, 2017

2 commits

Merge branch 'Bug_16731' into Develop
e82481f2

Nikita Kulshreshtha authored
2017-04-17 16:04:38 +0530
Browse File »
Merge branch 'US_15885' into Develop
d8cb4559

Nikita Kulshreshtha authored
2017-04-17 15:53:32 +0530
Browse File »

12 Apr, 2017

2 commits

Committed code. Refs: #16731 ...
16cf7308
```
Issue corrected for CI and 3D module too.
```
Utkarsh Singh authored
2017-04-12 17:03:54 +0530
Browse File »
Committed code. Refs: #15885
0039ce21

Utkarsh Singh authored
2017-04-12 11:09:08 +0530
Browse File »

11 Apr, 2017

5 commits

renamed a function and variable.
ccd2ffd2

Nikita Kulshreshtha authored
2017-04-11 12:50:39 +0530
Browse File »
Merge branch 'IEAnnotationIssue' of http://52.6.196.163/ADAM/AIAHTML5 into IEAnnotationIssueMerge
e1f69b63

Nikita Kulshreshtha authored
2017-04-11 12:34:13 +0530
Browse File »
Commit Changes
8043d093

unknown authored
2017-04-11 11:56:52 +0530
Browse File »
Commit Changes
ad5d6e5b

unknown authored
2017-04-11 11:25:36 +0530
Browse File »
Commit Changes
3ef62684

unknown authored
2017-04-11 10:47:40 +0530
Browse File »

10 Apr, 2017

9 commits

Merge branch 'linkmcustomscroll' into Develop
854adcec

Nikita Kulshreshtha authored
2017-04-10 17:33:36 +0530
Browse File »
lexicon implementation
32ac8e2b

Nikita Kulshreshtha authored
2017-04-10 17:31:48 +0530
Browse File »
this is mcustomscroll, change function name
6c1b8cdf

Mukul Rajput authored
2017-04-10 17:28:38 +0530
Browse File »
Merge branch 'blackcolorpaint' into Develop
f331f667

Nikita Kulshreshtha authored
2017-04-10 17:18:38 +0530
Browse File »
Merge branch 'filedisableanimation' into Develop
1e33dc8e

Nikita Kulshreshtha authored
2017-04-10 17:13:14 +0530
Browse File »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into LexiconImplementation ...
ca8fd718
```
Conflicts:
	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
```
unknown authored
2017-04-10 17:04:36 +0530
Browse File »
added Merge Request #423 code manually
e2225a11

Nikita Kulshreshtha authored
2017-04-10 17:01:19 +0530
Browse File »
Commit Changes
ac3d8045

unknown authored
2017-04-10 16:53:43 +0530
Browse File »
this is for mcustomscroll
6893502b

Mukul Rajput authored
2017-04-10 16:45:13 +0530
Browse File »