ADAM / AIAHTML5 | GitLab

06 Dec, 2017

1 commit

Merge branch 'ipadIssue' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC ...
f67064b1
```
# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
```
Amrita Vishnoi authored
2017-12-06 16:03:49 +0530
Browse File »

27 Nov, 2017

2 commits

merged manually against Merge Request #754
a88d4742

Amrita Vishnoi authored
2017-11-27 18:11:28 +0530
Browse File »
Merge branch 'LoginIssueForGAdmin' into Develop
0e23a568

Amrita Vishnoi authored
2017-11-27 16:43:02 +0530
Browse File »

24 Nov, 2017

2 commits

Merge branch 'AAprintpreviewbgdisable' into Develop
ba141cc5

Amrita Vishnoi authored
2017-11-24 13:19:09 +0530
Browse File »
Merge branch 'zoomprintprivewipad' into Develop
74eef6a1

Amrita Vishnoi authored
2017-11-24 13:10:22 +0530
Browse File »

17 Nov, 2017

1 commit

now the issue is when modesty is off, than also modesty is drwan on tbox and also at wrong position
96e4a996

Nikita Kulshreshtha authored
2017-11-17 18:27:26 +0530
Browse File »

15 Nov, 2017

1 commit

this is disable background of AA when we click print preview
f8f53256

Mukul Rajput authored
2017-11-15 10:36:29 +0530
Browse File »

14 Nov, 2017

1 commit

this is zoom with printpreview
bcd032b6

Mukul Rajput authored
2017-11-14 18:36:30 +0530
Browse File »

27 Oct, 2017

1 commit

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into ipadIssue
7cbab50f

unknown authored
2017-10-27 15:16:59 +0530
Browse File »

25 Oct, 2017

1 commit

fixed the issue by checking licenseid =0 and removed the check for superadmin. n… ...
6fd2eed8
```
…ow when licenseId=0 theuser will get all modules and admin tab enabled.
Need to cross check from live
```
Nikita Kulshreshtha authored
2017-10-25 13:16:10 +0530
Browse File »

23 Oct, 2017

1 commit

Commit Changes
46eaeedb

unknown authored
2017-10-23 16:06:01 +0530
Browse File »

18 Oct, 2017

2 commits

Merge branch 'Bug #--23481 ' into Develop
e2df8187

Amrita Vishnoi authored
2017-10-18 12:19:33 +0530
Browse File »
this is solution for bug 23735
83ef8df0

Mukul Rajput authored
2017-10-18 11:34:43 +0530
Browse File »

13 Oct, 2017

2 commits

Merge branch 'DrawBDSysetmPrintPrivAA' into Develop
eadd7bbb

Amrita Vishnoi authored
2017-10-13 18:26:53 +0530
Browse File »
set admin role property in rootscope again
ba866df8

Nikita Kulshreshtha authored
2017-10-13 15:40:46 +0530
Browse File »

12 Oct, 2017

2 commits

this is solution for the bug 23843
9d4195b2

Mukul Rajput authored
2017-10-12 16:10:02 +0530
Browse File »
23771 : Settings > Lexicons > Duplicate lexicon are appear.
e0c33846

unknown authored
2017-10-12 12:08:04 +0530
Browse File »

11 Oct, 2017

7 commits

Committing updated code refs: 23481
5bd7f8f3

Utkarsh Singh authored
2017-10-11 16:39:48 +0530
Browse File »
Merge branch 'AAprintpreviewissue' into Develop
a5504e68

Amrita Vishnoi authored
2017-10-11 14:08:48 +0530
Browse File »
Merge branch 'oldTileViewController-2' into Develop
212f1588

Amrita Vishnoi authored
2017-10-11 13:56:22 +0530
Browse File »
this is soluiton for AA printpriview issue
9cdf37cd

Mukul Rajput authored
2017-10-11 13:55:08 +0530
Browse File »
Merge branch 'DisablePendingModules' into Develop
3d8d7054

Amrita Vishnoi authored
2017-10-11 13:48:05 +0530
Browse File »
Merge branch 'PendingUserModules' into Develop
9ed1a0c0

Amrita Vishnoi authored
2017-10-11 13:45:38 +0530
Browse File »
Merge branch 'UserModulesOrder-2' into Develop
752c72e9

Amrita Vishnoi authored
2017-10-11 13:43:01 +0530
Browse File »

10 Oct, 2017

1 commit

Commit Changes
38ca5649

unknown authored
2017-10-10 12:22:44 +0530
Browse File »

09 Oct, 2017

6 commits

Updated code
bdbd138b

Utkarsh Singh authored
2017-10-09 19:15:49 +0530
Browse File »
Bug #23641 : File > Print Preview > Atlas Anatomy > Body system's pins appear on … ...
65a6a611
```
…the Print preview page.
```
unknown authored
2017-10-09 18:12:49 +0530
Browse File »
Committing updated code regarding showing pending modules under heading
5c2fce35

Utkarsh Singh authored
2017-10-09 12:57:01 +0530
Browse File »
variable name was wrong
98c2c8b3

Nikita Kulshreshtha authored
2017-10-09 12:32:37 +0530
Browse File »
Committing updated file
3cf8a2a3

Utkarsh Singh authored
2017-10-09 11:36:32 +0530
Browse File »
Removed unused log entry
5e70cfea

Utkarsh Singh authored
2017-10-09 10:09:54 +0530
Browse File »

06 Oct, 2017

2 commits

Committing updated files regarding user modules
718c5ead

Utkarsh Singh authored
2017-10-06 18:11:18 +0530
Browse File »
Nikita login fixes under Merge Request #703
2a60d8dc

Amrita Vishnoi authored
2017-10-06 11:48:34 +0530
Browse File »

05 Oct, 2017

4 commits

Merge branch 'LoginFixes1' into Develop
edfbce74

Amrita Vishnoi authored
2017-10-05 18:26:25 +0530
Browse File »
Merge branch 'Bug-21861-2' into Develop
a4167b49

Amrita Vishnoi authored
2017-10-05 18:11:27 +0530
Browse File »
Committing updated code refs: #21861
b82ad628

Utkarsh Singh authored
2017-10-05 15:01:27 +0530
Browse File »
merged loginFixes
2267dd55

Nikita Kulshreshtha authored
2017-10-05 14:12:38 +0530
Browse File »

04 Oct, 2017

3 commits

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 File »
Null check
dba4e561

Amrita Vishnoi authored
2017-10-04 16:54:25 +0530
Browse File »
Committing updated code refs: 23238
e2e97be9

Utkarsh Singh authored
2017-10-04 16:45:38 +0530
Browse File »