ADAM / AIAHTML5 | GitLab

02 Feb, 2018

6 commits

manually merged tapIssue_2(Merge Request #843 )
155cd133

Nikita Kulshreshtha authored
2018-02-02 17:11:13 +0530
Browse Code »
Merge branch 'Anno_searchListIsse' into Develop-IPAD-MAC
f6fdbf6b

Nikita Kulshreshtha authored
2018-02-02 17:02:37 +0530
Browse Code »
Merge branch 'loaderIssueAAIE' into Develop-IPAD-MAC
47490a04

Nikita Kulshreshtha authored
2018-02-02 16:57:11 +0530
Browse Code »
manually merged yearupdateissue(Merge Request #845 )
1096aae3

Nikita Kulshreshtha authored
2018-02-02 16:52:58 +0530
Browse Code »
space changes
11e8e1e0

Nikita Kulshreshtha authored
2018-02-02 16:50:04 +0530
Browse Code »
this is the solution for the bug 26606
8097e01d

Mukul Rajput authored
2018-02-02 16:05:19 +0530
Browse Code »

01 Feb, 2018

1 commit

this is solution for the bug 24858
b8364a4b

Mukul Rajput authored
2018-02-01 10:56:33 +0530
Browse Code »

31 Jan, 2018

6 commits

11132 : DA > Annotation search from Search List is not highlight in the List manager
588249d5

unknown authored
2018-01-31 16:49:49 +0530
Browse Code »
manually merged AIAAdminApi
ff2e54b0

Nikita Kulshreshtha authored
2018-01-31 14:45:26 +0530
Browse Code »
manually merged AODScrollIissue
60d57fa8

Nikita Kulshreshtha authored
2018-01-31 13:53:08 +0530
Browse Code »
Develop-IPAD-MAC code
a2a99e48

Nikita Kulshreshtha authored
2018-01-31 12:59:13 +0530
Browse Code »
Merge branch '26672' into Develop-IPAD-MAC
e1a24cf7

Nikita Kulshreshtha authored
2018-01-31 12:32:21 +0530
Browse Code »
Merge branch 'ATToolbar_2' into Develop-IPAD-MAC
26e1133e

Nikita Kulshreshtha authored
2018-01-31 12:27:20 +0530
Browse Code »

30 Jan, 2018

1 commit

26596 : Atlas Anatomy > The searched body annotation is not highlighted
2d11f8ba

unknown authored
2018-01-30 18:08:22 +0530
Browse Code »

25 Jan, 2018

11 commits

manulayy merged bugfix5 branch which is having code of #822 ,#823 ,#824 , #825
4bfd9579

Nikita Kulshreshtha authored
2018-01-25 15:51:56 +0530
Browse Code »
commit Changes
0ad05f5f

unknown authored
2018-01-25 15:49:34 +0530
Browse Code »
26672 : First time Addressed>CI and CA > Selected illustration and Animation is … ...
db798846
```
…not loaded in the below scenario
```
unknown authored
2018-01-25 15:45:10 +0530
Browse Code »
Merge branch 'bugfix5' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC
32f7b93e

Nikita Kulshreshtha authored
2018-01-25 15:39:26 +0530
Browse Code »
this is the solution for AOD IPAD scroll
1d7653c6

Mukul Rajput authored
2018-01-25 15:30:42 +0530
Browse Code »
this is solution for the bug highlight issue with list manager system in AA
13294ebb

Mukul Rajput authored
2018-01-25 15:21:53 +0530
Browse Code »
this is the solution for loader for list manager system
e1a2dba2

Mukul Rajput authored
2018-01-25 15:13:02 +0530
Browse Code »
this is the solution for the bug tab dropdown
b3053ef7

Mukul Rajput authored
2018-01-25 14:59:24 +0530
Browse Code »
this is solution for the bug table image is not in middle
d6374634

Mukul Rajput authored
2018-01-25 14:45:42 +0530
Browse Code »
manually merged AdminredirectUrl branch
3f7510bb

Nikita Kulshreshtha authored
2018-01-25 14:24:11 +0530
Browse Code »
this is solution for bug redirect admin url
3484b5c4

Mukul Rajput authored
2018-01-25 13:07:45 +0530
Browse Code »

24 Jan, 2018

4 commits

manually merged textHorizontalIssue
406ea973

Nikita Kulshreshtha authored
2018-01-24 15:53:19 +0530
Browse Code »
manually merged CALandscapeIssue into develop.
63560c2e

Nikita Kulshreshtha authored
2018-01-24 15:48:52 +0530
Browse Code »
files came after resettimg to Develop-IPAD-MAc
519b7396

Nikita Kulshreshtha authored
2018-01-24 15:39:09 +0530
Browse Code »
new files came from develop
1a5f0330

Nikita Kulshreshtha authored
2018-01-24 13:55:24 +0530
Browse Code »

23 Jan, 2018

4 commits

Merge branch 'AIAAdminApi' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC ...
991f51b4
```
# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
#	400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
```
Amrita Vishnoi authored
2018-01-23 17:20:32 +0530
Browse Code »
some changes came after : git checkout -b AIAAdminApi origin/AIAAdminApi
9d9835cd

Amrita Vishnoi authored
2018-01-23 17:09:31 +0530
Browse Code »
some changes came after : git checkout -b AIAAdminApi origin/AIAAdminApi
c97fc7d1

Amrita Vishnoi authored
2018-01-23 17:04:03 +0530
Browse Code »
some changes came after : git checkout -b AIAAdminApi origin/AIAAdminApi
3170a2e4

Amrita Vishnoi authored
2018-01-23 16:57:43 +0530
Browse Code »

22 Jan, 2018

2 commits

Commit Changes
d5881720

unknown authored
2018-01-22 18:12:15 +0530
Browse Code »
Horizontal Text Issue
57e58c04

unknown authored
2018-01-22 16:37:02 +0530
Browse Code »

18 Jan, 2018

5 commits

merged AIAAdminApi
335a8cfa

Nikita Kulshreshtha authored
2018-01-18 16:09:00 +0530
Browse Code »
meregd AIAAdminApi
fa970934

Nikita Kulshreshtha authored
2018-01-18 16:05:09 +0530
Browse Code »
merged code from AIAAdminApi
cbc7e3fa

Nikita Kulshreshtha authored
2018-01-18 16:01:48 +0530
Browse Code »
Add dist folder
3110b119

Gagandeep authored
2018-01-18 15:52:03 +0530
Browse Code »
Merge branch 'AIAAdminApi' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC
de5f4fe0

Nikita Kulshreshtha authored
2018-01-18 15:51:33 +0530
Browse Code »