ADAM / AIAHTML5 | GitLab

11 Apr, 2017

15 commits

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

20 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 »
Commit Changes
4608b011

unknown authored
2017-04-10 17:00:01 +0530
Browse Code »
Commit Changes
ac3d8045

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

Mukul Rajput authored
2017-04-10 16:45:13 +0530
Browse Code »
Merge branch 'WronMailIssue' into Develop
51fabdf9

Nikita Kulshreshtha authored
2017-04-10 16:04:37 +0530
Browse Code »
added comment why we are redrecting user to index page on browser refresh.
dcd084ac

Nikita Kulshreshtha authored
2017-04-10 15:56:35 +0530
Browse Code »
this is for bug 15623
e52f1d24

Mukul Rajput authored
2017-04-10 15:56:04 +0530
Browse Code »
this is for bug 16661
230f23a7

Mukul Rajput authored
2017-04-10 15:33:12 +0530
Browse Code »
Merge branch 'App_RefreshIssue' into Develop
ef0c0bf3

Nikita Kulshreshtha authored
2017-04-10 15:20:57 +0530
Browse Code »
Committed code. Refs: #15352 , 15361, 15368
ead1b9f8

Utkarsh Singh authored
2017-04-10 15:14:10 +0530
Browse Code »
Committed code. Refs: 15352, 15361, 15368
4f1a2778

Utkarsh Singh authored
2017-04-10 15:02:41 +0530
Browse Code »
copied code from gitlab from develop brach, don't understand why showing modifie… ...
58e4a39b
```
…d file although had reset Develop
```
Amrita Vishnoi authored
2017-04-10 13:02:07 +0530
Browse Code »
Newly estimation files are added
aa41639f

Amrita Vishnoi authored
2017-04-10 12:58:47 +0530
Browse Code »

08 Apr, 2017

3 commits

Parameter assignment changed
c7568872

Utkarsh Singh authored
2017-04-08 14:54:34 +0530
Browse Code »
Commit For Annotation
5e166421

unknown authored
2017-04-08 14:51:36 +0530
Browse Code »
App refresh issue rectified for
7c6bf4e7

Utkarsh Singh authored
2017-04-08 13:13:16 +0530
Browse Code »

07 Apr, 2017

2 commits

Merge branch 'Develop' into QA
70bc743f

Nikita Kulshreshtha authored
2017-04-07 17:53:00 +0530
Browse Code »
set isUserAUthenticated to false.
ef3ad676

Nikita Kulshreshtha authored
2017-04-07 17:50:04 +0530
Browse Code »