ADAM / AIAHTML5 | GitLab

20 Sep, 2017

8 commits

Merge branch 'Develop' into QA
3669f465

Amrita Vishnoi authored
2017-09-20 15:15:33 +0530
Browse Code »
Merge branch 'CAApplybuttonissue' into Develop
c4b04495

Amrita Vishnoi authored
2017-09-20 13:30:13 +0530
Browse Code »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Develop
897b655d

Amrita Vishnoi authored
2017-09-20 13:16:27 +0530
Browse Code »
changes in space
9fbc14be

Amrita Vishnoi authored
2017-09-20 13:15:15 +0530
Browse Code »
Merge branch 'ListManagerIEIssue' into Develop
159dd70a

Nikita Kulshreshtha authored
2017-09-20 12:38:17 +0530
Browse Code »
Changed Name
e1ae1b52

unknown authored
2017-09-20 12:29:48 +0530
Browse Code »
Merge branch 'IdentityImplementation' of http://52.6.196.163/ADAM/AIAHTML5 into ListManagerIEIssue ...
a5afc658
```
Conflicts:
	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
```
unknown authored
2017-09-20 12:19:00 +0530
Browse Code »
Merge branch 'duplicateSearchListIssue' into Develop
a3725629

Nikita Kulshreshtha authored
2017-09-20 11:55:48 +0530
Browse Code »

19 Sep, 2017

4 commits

22404 :Duplicate body annotations/ structures are appearing in Search List.
492808dd

unknown authored
2017-09-19 17:21:52 +0530
Browse Code »
Clinical Animation > Settings gets close when click on the Apply button
ad7edd35

Mukul Rajput authored
2017-09-19 13:12:44 +0530
Browse Code »
this is bug 22554 Clinical Animation > Settings gets close when click on the Apply button.
3c58ab07

Mukul Rajput authored
2017-09-19 13:10:05 +0530
Browse Code »
Commit Changes
4d746dca

unknown authored
2017-09-19 12:02:26 +0530
Browse Code »

18 Sep, 2017

4 commits

Merge branch 'spriteIconImages' into Develop
1d126740

Nikita Kulshreshtha authored
2017-09-18 12:06:06 +0530
Browse Code »
Merge branch 'settingPopupIssue_2_Merge' into Develop
1a963976

Nikita Kulshreshtha authored
2017-09-18 12:00:25 +0530
Browse Code »
Merge branch 'settingPopupIssue_2'
8d552386

Nikita Kulshreshtha authored
2017-09-18 11:54:31 +0530
Browse Code »
Commit Changes
0905fa98

unknown authored
2017-09-18 10:37:22 +0530
Browse Code »

15 Sep, 2017

8 commits

prvioesly some json for language ...
8ae0cd10
```
were not valid. now commiting valid json files for language
```
Nikita Kulshreshtha authored
2017-09-15 18:32:27 +0530
Browse Code »
Merge branch 'Bug #22872 _1' into Develop
46205308

Nikita Kulshreshtha authored
2017-09-15 18:13:10 +0530
Browse Code »
Bug #22872 _1 is merged
74a3ef98

Amrita Vishnoi authored
2017-09-15 17:30:39 +0530
Browse Code »
Merge branch 'Bug #22671 ' into Develop
1a539f67

Amrita Vishnoi authored
2017-09-15 16:58:19 +0530
Browse Code »
Against Merge request #673
01840c6f

Amrita Vishnoi authored
2017-09-15 16:51:08 +0530
Browse Code »
against Merge Request #661 request
d53d2ce9

Amrita Vishnoi authored
2017-09-15 16:30:20 +0530
Browse Code »
Merge Request #655
0cdff253

Amrita Vishnoi authored
2017-09-15 16:00:41 +0530
Browse Code »
Commit Changes
c6d78f13

unknown authored
2017-09-15 12:36:18 +0530
Browse Code »

14 Sep, 2017

2 commits

Implemented Identity Functionality in Annotation ToolBar
44d0a505

unknown authored
2017-09-14 18:22:20 +0530
Browse Code »
fixed bugs 22872, 22874, 22896, 7130
5fadb9fc

Nikita Kulshreshtha authored
2017-09-14 13:02:07 +0530
Browse Code »

13 Sep, 2017

3 commits

one more file of language
e7eda75a

Amrita Vishnoi authored
2017-09-13 17:19:49 +0530
Browse Code »
modified language files
3a091223

Amrita Vishnoi authored
2017-09-13 17:16:59 +0530
Browse Code »
The annotation bar was not working on CI due style syntax issue
8c21fe81

Amrita Vishnoi authored
2017-09-13 15:56:55 +0530
Browse Code »

12 Sep, 2017

4 commits

report
0f5aa9a7

Amrita Vishnoi authored
2017-09-12 17:09:31 +0530
Browse Code »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Develop
93fecc81

Amrita Vishnoi authored
2017-09-12 16:48:51 +0530
Browse Code »
documents
f2c4a02d

Amrita Vishnoi authored
2017-09-12 16:43:50 +0530
Browse Code »
Commit Changes
a67ef75b

unknown authored
2017-09-12 10:34:55 +0530
Browse Code »

11 Sep, 2017

7 commits

Merge branch 'Bug-22822' into Develop
f8973a30

Nikita Kulshreshtha authored
2017-09-11 17:17:33 +0530
Browse Code »
Merge branch 'Bug_16290_2' into Develop
564757a4

Nikita Kulshreshtha authored
2017-09-11 17:14:25 +0530
Browse Code »
Merge branch 'Bug-22056' into Develop
b0e3d11b

Nikita Kulshreshtha authored
2017-09-11 16:45:22 +0530
Browse Code »
Annotation Tool Bar Code
43203ab4

unknown authored
2017-09-11 16:08:05 +0530
Browse Code »
get the AIAUser list based on institute name
f987152a

Amrita Vishnoi authored
2017-09-11 16:02:26 +0530
Browse Code »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Develop
8adc7f41

Amrita Vishnoi authored
2017-09-11 15:17:04 +0530
Browse Code »
License Expiration script
f7df27df

Amrita Vishnoi authored
2017-09-11 15:15:10 +0530
Browse Code »