ADAM / AIAHTML5

07 Sep, 2016

1 commit

Reproductive System module json file - created
c3cb2f88

Amit Kumar authored
2016-09-07 18:08:42 +0530
Browse Dir »

02 Sep, 2016

1 commit

Create json for 2 module and 2 is is progress
0e11ffe9

Amit Kumar authored
2016-09-02 18:21:22 +0530
Browse Dir »

01 Sep, 2016

1 commit

Completed CS and DS json for lab exercise module
9b5c980f

Amit Kumar authored
2016-09-01 12:51:35 +0530
Browse Dir »

26 Aug, 2016

2 commits

Merge branch 'Annotation_Eraser' of http://52.6.196.163/ADAM/AIAHTML5 into LabExercize ...
814e77d2
```
Conflicts:
	400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
	400-SOURCECODE/AIAHTML5.Web/Web.config
	400-SOURCECODE/AIAHTML5.Web/index.html
```
Amit Kumar authored
2016-08-26 11:12:06 +0530
Browse Dir »
Lab Exercise module - in progess
63248dfc

Amit Kumar authored
2016-08-26 11:07:48 +0530
Browse Dir »

24 Aug, 2016

2 commits

Merge branch 'GotoNavMan' of http://52.6.196.163/ADAM/AIAHTML5 into Annotation_Eraser
3a5851c4

unknown authored
2016-08-24 18:02:14 +0530
Browse Dir »
Commit Changes For Erase Functionality and Canvas Opacity
44cadc82

unknown authored
2016-08-24 17:29:54 +0530
Browse Dir »

23 Aug, 2016

5 commits

Fixed to go-to and navigator button and also included images related with medial view.
0482df3b

Mitali Srivastava authored
2016-08-23 19:51:52 +0530
Browse Dir »
Merge branch 'SearchNavButton' of http://52.6.196.163/ADAM/AIAHTML5 into ButtonFix ...
f1194d9b
```
Conflicts:
	400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
```
Mitali Srivastava authored
2016-08-23 17:05:24 +0530
Browse Dir »
Added images related with Medial view
f89bc963

Mitali Srivastava authored
2016-08-23 16:53:47 +0530
Browse Dir »
merged Annotation tool bar code.
90e94162

Amrita Vishnoi authored
2016-08-23 14:17:56 +0530
Browse Dir »
Modify button for search and navigator man as per new prototype
3443dd42

Amrita Vishnoi authored
2016-08-23 12:40:54 +0530
Browse Dir »

22 Aug, 2016

1 commit

introduced new folder for annotation toolbar
48c966dd

Nikita Kulshreshtha authored
2016-08-22 16:26:33 +0530
Browse Dir »

10 Aug, 2016

1 commit

Refs: #5292 ...
aa087298
```
Setting is integrated
```
Amrita Vishnoi authored
2016-08-10 18:37:55 +0530
Browse Dir »

02 Aug, 2016

1 commit

Added modified ethnicity folder
5a80b415

Amrita Vishnoi authored
2016-08-02 13:02:18 +0530
Browse Dir »

28 Jul, 2016

1 commit

Merge branch 'NavigatorMan' of http://52.6.196.163/ADAM/AIAHTML5 into NavigatorManMerge ...

c3474c63

# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
#	400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
#	400-SOURCECODE/AIAHTML5.Web/content/data/json/da/da_dat_orient_image.json

authored

2016-07-28 10:31:04 +0530

Browse Dir »

27 Jul, 2016

2 commits

Refs: #4468 ...
c49259ed
```
Merged code of navigator man with draggable issue
```
Amrita Vishnoi authored
2016-07-27 16:41:41 +0530
Browse Dir »
Navigator Man Merge but have dragable issue
9dbb6085

Amrita Vishnoi authored
2016-07-27 16:38:58 +0530
Browse Dir »

23 Jul, 2016

1 commit

Navigator draggable div. scroll position is not getting set yet
043ea602

Mitali Srivastava authored
2016-07-23 17:47:38 +0530
Browse Dir »

30 Jun, 2016

1 commit

commit afetr CA_Module merge
baf1bcb2

Nikita Kulshreshtha authored
2016-06-30 10:41:37 +0530
Browse Dir »

27 Jun, 2016

1 commit

CI Module jspanel and ca json and images
ef481fa1

Mitali Srivastava authored
2016-06-27 19:30:19 +0530
Browse Dir »

25 Jun, 2016

1 commit

commit after unhighlight merge
d149de1c

Nikita Kulshreshtha authored
2016-06-25 17:11:06 +0530
Browse Dir »

24 Jun, 2016

3 commits

mci image
3eb655a8

Nikita Kulshreshtha authored
2016-06-24 14:43:02 +0530
Browse Dir »
Extracted right mci images for 25% zoom, this solved annotation issue
7e575186

Nikita Kulshreshtha authored
2016-06-24 13:55:29 +0530
Browse Dir »
Refs: #4464 ...
f7195e49
```
1. Added close button.
2. issue is fixed.
```
Amrita Vishnoi authored
2016-06-24 11:57:58 +0530
Browse Dir »

23 Jun, 2016

1 commit

Zoom 25% annotation issue is fixed in layer 0. on other layers, the mci image is… ...
07fd3c36
```
… different so it is not working.
```
Nikita Kulshreshtha authored
2016-06-23 18:20:09 +0530
Browse Dir »

22 Jun, 2016

2 commits

modesty implemented in zoom 25%
3c61c0a8

Nikita Kulshreshtha authored
2016-06-22 16:46:54 +0530
Browse Dir »
Changes after CI code merge...
7be40144

Amrita Vishnoi authored
2016-06-22 15:18:38 +0530
Browse Dir »

21 Jun, 2016

1 commit

commit after zoom merge
fb6cba87

Nikita Kulshreshtha authored
2016-06-21 13:02:41 +0530
Browse Dir »

16 Jun, 2016

3 commits

few more images
f02adb91

Amrita Vishnoi authored
2016-06-16 21:10:18 +0530
Browse Dir »
few more images...
89c228d2

Amrita Vishnoi authored
2016-06-16 21:08:29 +0530
Browse Dir »
Refs: #4460 ...
99cf0012
```
implemented zoom for 25 and 75 level but on 25th zoom level annotations are showing on wrong place.
```
Amrita Vishnoi authored
2016-06-16 16:33:36 +0530
Browse Dir »

13 Jun, 2016

2 commits

commit after HighlightInGrayScaleMode pull
ded23b07

Nikita Kulshreshtha authored
2016-06-13 12:52:31 +0530
Browse Dir »
rename the folder for images and json
6e28b141

Nikita Kulshreshtha authored
2016-06-13 11:56:11 +0530
Browse Dir »

10 Jun, 2016

1 commit

Transparency code merged ...
b51e9fdb

Amrita Vishnoi authored
2016-06-10 10:51:30 +0530
Browse Dir »

02 Jun, 2016

1 commit

1. Revised version of translation ...
e1022c85
```
2. POC project.
3. changes after merge
```
Amrita Vishnoi authored
2016-06-02 11:30:46 +0530
Browse Dir »

01 Jun, 2016

1 commit

Merge branch 'CurriculamBuilder' of http://52.6.196.163/ADAM/AIAHTML5 into CI_Module ...
e551dbc5
```
Conflicts:
	.gitignore
	400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
```
Mitali Srivastava authored
2016-06-01 13:43:07 +0530
Browse Dir »

27 May, 2016

2 commits

added ci images and json
6dc9a1a4

Mitali Srivastava authored
2016-05-27 20:21:20 +0530
Browse Dir »
Merge branch 'GrayScaleMode' of http://52.6.196.163/ADAM/AIAHTML5 into DAMultipleViewOpen ...
5d1a6aa2
```
# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
```
unknown authored
2016-05-27 13:54:18 +0530
Browse Dir »

20 May, 2016

1 commit

1. modesty setting implementation started. ...
8235afc2
```
2. moifeid annotation speech bubble
```
Nikita Kulshreshtha authored
2016-05-20 18:20:27 +0530
Browse Dir »