ADAM / AIAHTML5

30 Sep, 2016

1 commit

TextArea active button issues resolved
cb305f4d

unknown authored
2016-09-30 10:25:24 +0530
Browse Dir »

21 Sep, 2016

1 commit

Three D anatomy changes - done
340490cf

Amit Kumar authored
2016-09-21 10:30:35 +0530
Browse Dir »

14 Sep, 2016

2 commits

3dAnatomy done
289f8a45

Amit Kumar authored
2016-09-14 17:59:39 +0530
Browse Dir »
3danatomy is done.
98d2e93e

Amit Kumar authored
2016-09-14 17:11:37 +0530
Browse Dir »

13 Sep, 2016

2 commits

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into LabExercize ...
a95da31d
```
Conflicts:
	400-SOURCECODE/AIAHTML5.Web/Web.config
	400-SOURCECODE/AIAHTML5.Web/index.html
```
Amit Kumar authored
2016-09-13 12:11:31 +0530
Browse Dir »
test
b884d7e6

Amit Kumar authored
2016-09-13 12:08:46 +0530
Browse Dir »

12 Sep, 2016

2 commits

changes done and create json for Respiratory system.
a45bba01

Amit Kumar authored
2016-09-12 17:45:51 +0530
Browse Dir »
Merge branch 'LMInFemale' into Develop
9baafbe6

Amrita Vishnoi authored
2016-09-12 11:02:57 +0530
Browse Dir »

09 Sep, 2016

3 commits

Option alignment done for 5 modules
80656ba9

Amit Kumar authored
2016-09-09 17:24:05 +0530
Browse Dir »
List manager is working in female gender also.
a36a5126

Nikita Kulshreshtha authored
2016-09-09 13:13:59 +0530
Browse Dir »
Drag and drop the option into the option box - done
3961a190

Amit Kumar authored
2016-09-09 12:21:06 +0530
Browse Dir »

08 Sep, 2016

1 commit

Options alignment done
d776869b

Amit Kumar authored
2016-09-08 17:16:17 +0530
Browse Dir »

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

2 commits

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

Amit Kumar authored
2016-09-02 18:21:22 +0530
Browse Dir »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into updatededitstyle ...
c51417b5
```
Conflicts:
	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
	400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
```
Mukul Rajput authored
2016-09-02 12:45:43 +0530
Browse Dir »

01 Sep, 2016

2 commits

DA updated and validated jsons. ...
629d1743
```
Homecontroller fix for setting after merge with branch DisableATBarOnPopUp
```
Mitali Srivastava authored
2016-09-01 13:33:56 +0530
Browse Dir »
Completed CS and DS json for lab exercise module
9b5c980f

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

29 Aug, 2016

2 commits

new edit style function
4e2f1fe9

Mukul Rajput authored
2016-08-29 12:52:45 +0530
Browse Dir »
merge new files
384fed29

Mukul Rajput authored
2016-08-29 12:35:38 +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 »

19 Aug, 2016

1 commit

Lab Excercise module
0932cf03

Amit Kumar authored
2016-08-19 11:25:31 +0530
Browse Dir »

12 Aug, 2016

1 commit

Refs: #6615 ...
3f454990
```
Should highlight left menu bar button only one at a time
```
Amrita Vishnoi authored
2016-08-12 14:28:51 +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 »