ADAM / AIAHTML5 | GitLab

17 Apr, 2017

9 commits

Merge branch 'Develop' into QA
b75d4b2c

Nikita Kulshreshtha authored
2017-04-17 17:14:12 +0530
Browse Code »
Merge branch 'bodyviewmid' into Develop
f453fb7b

Nikita Kulshreshtha authored
2017-04-17 16:26:48 +0530
Browse Code »
Merge branch 'fixmodalpopup' into Develop
6cd522b4

Nikita Kulshreshtha authored
2017-04-17 16:16:13 +0530
Browse Code »
Merge branch 'removeextrateg' into Develop
f4cf7d54

Nikita Kulshreshtha authored
2017-04-17 16:13:31 +0530
Browse Code »
Merge branch 'AnnotationZoomIssue' into Develop
7b961d22

Nikita Kulshreshtha authored
2017-04-17 16:09:39 +0530
Browse Code »
Merge branch 'Bug_16731' into Develop
e82481f2

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

Nikita Kulshreshtha authored
2017-04-17 15:53:32 +0530
Browse Code »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into AnnotationZoomIssue
0a2ac62a

unknown authored
2017-04-17 12:03:12 +0530
Browse Code »
DA > Annotation Toolbar > Cursor get stuck with draw tools
b89f8c53

unknown authored
2017-04-17 12:00:46 +0530
Browse Code »

13 Apr, 2017

1 commit

this is for bug 16510
f021645a

Mukul Rajput authored
2017-04-13 18:00:40 +0530
Browse Code »

12 Apr, 2017

4 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 Code »
this is for bug 17009 and 17008
b4370f90

Mukul Rajput authored
2017-04-12 15:10:54 +0530
Browse Code »
this is for bug 17030
6b899130

Mukul Rajput authored
2017-04-12 13:19:49 +0530
Browse Code »
Committed code. Refs: #15885
0039ce21

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

11 Apr, 2017

18 commits

Merge branch 'Develop' into QA
9719344d

Nikita Kulshreshtha authored
2017-04-11 18:11:30 +0530
Browse Code »
Merge branch 'ATBarCSSIssue' into Develop
518ae30e

Nikita Kulshreshtha authored
2017-04-11 18:09:16 +0530
Browse Code »
buttons of brushsize was dislocated.- fixed
6c3d66d5

Nikita Kulshreshtha authored
2017-04-11 18:05:54 +0530
Browse Code »
Merge branch 'Develop' into QA
ad7eef91

Nikita Kulshreshtha authored
2017-04-11 17:20:12 +0530
Browse Code »
Merge branch 'LexixconForTrans' into Develop
1d1ff191

Nikita Kulshreshtha authored
2017-04-11 16:59:17 +0530
Browse Code »
commit changes for search functionality
3b0f23f0

unknown authored
2017-04-11 16:35:32 +0530
Browse Code »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into LexixconForTrans
555befc0

unknown authored
2017-04-11 16:09:28 +0530
Browse Code »
Lexicon Functionality For Transparency
8594721e

unknown authored
2017-04-11 16:08:16 +0530
Browse Code »
Merge branch 'IEAnnotationIssueMerge' into Develop
2591033f

Nikita Kulshreshtha authored
2017-04-11 12:53:22 +0530
Browse Code »
renamed a function and variable.
ccd2ffd2

Nikita Kulshreshtha authored
2017-04-11 12:50:39 +0530
Browse Code »
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 Code »
removed message
6593c5b8

Nikita Kulshreshtha authored
2017-04-11 12:18:22 +0530
Browse Code »
added iframeresize.html
5e25e0f8

Nikita Kulshreshtha authored
2017-04-11 12:15:01 +0530
Browse Code »
Commit Changes
8043d093

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

unknown authored
2017-04-11 11:25:36 +0530
Browse Code »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into QA
735e848c

Nikita Kulshreshtha authored
2017-04-11 11:15:49 +0530
Browse Code »
updated iframeresizer page.
8ad43a57

Nikita Kulshreshtha authored
2017-04-11 11:11:02 +0530
Browse Code »
Commit Changes
3ef62684

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

10 Apr, 2017

8 commits

Merge branch 'linkmcustomscroll' into Develop
854adcec

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

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

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

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

Nikita Kulshreshtha authored
2017-04-10 17:13:14 +0530
Browse Code »
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 Code »
Merge branch '16301Merge' into Develop
aedb458b

Nikita Kulshreshtha authored
2017-04-10 17:03:29 +0530
Browse Code »
added Merge Request #423 code manually
e2225a11

Nikita Kulshreshtha authored
2017-04-10 17:01:19 +0530
Browse Code »