ADAM / AIAHTML5 | GitLab

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

4 commits

set isUserAUthenticated to false.
ef3ad676

Nikita Kulshreshtha authored
2017-04-07 17:50:04 +0530
Browse Code »
Merge branch 'ModuleListBlankIssue' into Develop
66787030

Nikita Kulshreshtha authored
2017-04-07 17:33:03 +0530
Browse Code »
Merge branch 'CI_CA_jsPanelBackground_Issue' into Develop
093fbc3f

Nikita Kulshreshtha authored
2017-04-07 17:14:08 +0530
Browse Code »
added wait cursor
3aadf8e4

Nikita Kulshreshtha authored
2017-04-07 16:43:44 +0530
Browse Code »

06 Apr, 2017

3 commits

using ng-repeat to bind CI images.
d58e51ae

Nikita Kulshreshtha authored
2017-04-06 18:13:23 +0530
Browse Code »
Code rectified for annotation ui issue. Refs: #16723
bca264e9

Utkarsh Singh authored
2017-04-06 13:43:13 +0530
Browse Code »
Merge branch 'HemantChnages' into Develop
b58bbfbf

Amrita Vishnoi authored
2017-04-06 11:17:48 +0530
Browse Code »

05 Apr, 2017

1 commit

one page is deployed to handle the double scroll bar issue in external link and … ...
fa027aa3
```
…also domain name update
```
Amrita Vishnoi authored
2017-04-05 17:30:12 +0530
Browse Code »

04 Apr, 2017

9 commits

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into LexiconDataImplementation
427b7a2d

unknown authored
2017-04-04 17:46:14 +0530
Browse Code »
Refactor Annotation Code
dcab32ad

unknown authored
2017-04-04 17:39:25 +0530
Browse Code »
Merge branch 'Develop' into QA
87d22751

Amrita Vishnoi authored
2017-04-04 17:20:04 +0530
Browse Code »
removed min-height as per Hemant discussion
8687ecfc

Amrita Vishnoi authored
2017-04-04 16:51:33 +0530
Browse Code »
Merge branch 'ExternalLink' into Develop
afb51717

Amrita Vishnoi authored
2017-04-04 16:15:47 +0530
Browse Code »
Object Id set in which external pages are getting loaded
59883812

Amrita Vishnoi authored
2017-04-04 16:09:12 +0530
Browse Code »
Merge branch 'QA' of http://52.6.196.163/ADAM/AIAHTML5 into QA
65bffedf

Amrita Vishnoi authored
2017-04-04 14:49:18 +0530
Browse Code »
Merge branch 'Develop' into QA
464404ef

Amrita Vishnoi authored
2017-04-04 14:46:56 +0530
Browse Code »
Merge branch 'AIATimeLines' into Develop
c557e152

Amrita Vishnoi authored
2017-04-04 14:30:35 +0530
Browse Code »