ADAM / AIAHTML5 | GitLab

04 Oct, 2017

10 commits

a defect introduced in annotations due to that annotation text was showing in multiline
2345f819

Amrita Vishnoi authored
2017-10-04 17:18:56 +0530
Browse Code »
Merge branch 'Bug-23238-2' of http://52.6.196.163/ADAM/AIAHTML5 into QA
d349f2b8

Amrita Vishnoi authored
2017-10-04 17:00:11 +0530
Browse Code »
Null check
dba4e561

Amrita Vishnoi authored
2017-10-04 16:54:25 +0530
Browse Code »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into QA ...
78c07a91
```
# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/index.html
```
Amrita Vishnoi authored
2017-10-04 16:49:47 +0530
Browse Code »
Committing updated code refs: 23238
e2e97be9

Utkarsh Singh authored
2017-10-04 16:45:38 +0530
Browse Code »
Merge branch 'Bug #23119 _1' of http://52.6.196.163/ADAM/AIAHTML5 into Develop ...
e3c3cc0e
```
# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
```
Amrita Vishnoi authored
2017-10-04 16:16:00 +0530
Browse Code »
Merge branch 'Prod_AnnotatyionIssue' into Develop
89a3c155

Amrita Vishnoi authored
2017-10-04 15:24:57 +0530
Browse Code »
SQL password changed
da3025f7

Amrita Vishnoi authored
2017-10-04 13:38:40 +0530
Browse Code »
Against Merge request #693
5d566074

Amrita Vishnoi authored
2017-10-04 13:03:10 +0530
Browse Code »
changed msg in error
91466682

Nikita Kulshreshtha authored
2017-10-04 11:38:22 +0530
Browse Code »

03 Oct, 2017

3 commits

made changes to fix this issue. need to test on qa and production
46894182

Nikita Kulshreshtha authored
2017-10-03 16:53:56 +0530
Browse Code »
Commit Changes
3f0d1415

unknown authored
2017-10-03 16:26:33 +0530
Browse Code »
change the message for incorrect email id
2a0f7ec7

Nikita Kulshreshtha authored
2017-10-03 11:03:55 +0530
Browse Code »

29 Sep, 2017

8 commits

deleted unused controller
67d7d0f6

Nikita Kulshreshtha authored
2017-09-29 16:50:01 +0530
Browse Code »
update code
df1e8c5b

Nikita Kulshreshtha authored
2017-09-29 16:45:44 +0530
Browse Code »
changed text of terms and conditions title
f9291b0c

Nikita Kulshreshtha authored
2017-09-29 16:05:52 +0530
Browse Code »
Commit Changes
f562c0f0

unknown authored
2017-09-29 15:38:09 +0530
Browse Code »
updated code
10b2f628

Nikita Kulshreshtha authored
2017-09-29 14:50:38 +0530
Browse Code »
Merge branch 'highlightissuewithviewchange' into Develop
de8f52ae

Amrita Vishnoi authored
2017-09-29 11:11:57 +0530
Browse Code »
deleted check_browser_close file because there is no use of this file.
fbe6e5b4

1

Amrita Vishnoi authored
2017-09-29 11:05:07 +0530
Browse Code »
Merge branch 'refreshissuenew' into Develop
660f6ff7

Amrita Vishnoi authored
2017-09-29 10:33:06 +0530
Browse Code »

28 Sep, 2017

7 commits

finished restructuring
29975015

Nikita Kulshreshtha authored
2017-09-28 18:19:21 +0530
Browse Code »
Merge branch 'annotationToolBarDisableissue' into Develop
34dc20b6

Amrita Vishnoi authored
2017-09-28 18:14:36 +0530
Browse Code »
Merge branch 'spacialcharissuedainput' into Develop
9c7ffa7f

Amrita Vishnoi authored
2017-09-28 17:46:57 +0530
Browse Code »
Merge branch 'normalbtniconissueda' into Develop
5039be3b

Amrita Vishnoi authored
2017-09-28 17:37:41 +0530
Browse Code »
modified
8c2057a0

Amrita Vishnoi authored
2017-09-28 17:36:40 +0530
Browse Code »
this is resolve issue of 23283
7fd16030

Mukul Rajput authored
2017-09-28 16:49:37 +0530
Browse Code »
this is solution for refresh issue which was throw login page
c7659641

Mukul Rajput authored
2017-09-28 11:37:54 +0530
Browse Code »

27 Sep, 2017

4 commits

made some changes in forgotPassword
2808e788

Nikita Kulshreshtha authored
2017-09-27 18:33:01 +0530
Browse Code »
modified login code
8423ce8c

Nikita Kulshreshtha authored
2017-09-27 17:42:00 +0530
Browse Code »
Merge branch 'CurrentPosition' into Develop
63bcb370

Amrita Vishnoi authored
2017-09-27 15:11:23 +0530
Browse Code »
modified color of row to highlight
17c62ad3

Amrita Vishnoi authored
2017-09-27 14:47:02 +0530
Browse Code »

26 Sep, 2017

2 commits

this is solution for bug 23310 Annotation Toolbar gets disable in the below scenario
1a181173

Mukul Rajput authored
2017-09-26 16:23:08 +0530
Browse Code »
this is solution for 23038 DA > Input Layer box should not allow special characters
ac63845a

Mukul Rajput authored
2017-09-26 09:18:38 +0530
Browse Code »

25 Sep, 2017

6 commits

this is solution 23093 File > Print Preview > The Maximize button icon changes i… ...
607164ed
```
…n the below mention scenario.
```
Mukul Rajput authored
2017-09-25 18:33:28 +0530
Browse Code »
Merge branch 'activeIssueInAALeftToolbar' into Develop
a7c54707

Amrita Vishnoi authored
2017-09-25 18:23:55 +0530
Browse Code »
Merge branch 'IEAnnotationIssue_1' into Develop
41f627f1

Amrita Vishnoi authored
2017-09-25 18:04:31 +0530
Browse Code »
Merge branch 'LexiconIssue' into Develop
3e9deb74

Amrita Vishnoi authored
2017-09-25 17:41:01 +0530
Browse Code »
Merge branch 'ListManagerIEIssue_1' into Develop
2e475c94

Amrita Vishnoi authored
2017-09-25 17:19:45 +0530
Browse Code »
code review findings
621eb0cc

Nikita Kulshreshtha authored
2017-09-25 15:02:33 +0530
Browse Code »