ADAM / AIAHTML5

16 Sep, 2016

6 commits

Merge branch 'Ipadissue' into Develop
1f740ed6

Nikita Kulshreshtha authored
2016-09-16 15:42:32 +0530
Browse Dir »
remove alert
ae5a414b

Mitali Srivastava authored
2016-09-16 15:32:57 +0530
Browse Dir »
changed branch name as the previous branch name( DisableTBOnExtract&ViceVersa ) … ...
2027a9c6
```
…for enabling diabling TBox nad vice versa wa not recognised by git.
```
Nikita Kulshreshtha authored
2016-09-16 13:08:30 +0530
Browse Dir »
disable tbox on extract ...
0a33dd98
```
disable  extract on Tbox
```
Nikita Kulshreshtha authored
2016-09-16 12:29:01 +0530
Browse Dir »
maintain scroll on highlight to normal.
3bbef99a

Nikita Kulshreshtha authored
2016-09-16 11:00:29 +0530
Browse Dir »
Refs: #7148
15f7c07f

Nikita Kulshreshtha authored
2016-09-16 10:41:18 +0530
Browse Dir »

15 Sep, 2016

9 commits

Merge branch 'bugs' into Develop
7ee514de

Nikita Kulshreshtha authored
2016-09-15 18:13:37 +0530
Browse Dir »
in lateral arm LM and search loader icon was not going invisible.
ebc80013

Nikita Kulshreshtha authored
2016-09-15 17:14:32 +0530
Browse Dir »
on gender change searched highlited portion is hilghlighted.
66fc170f

Nikita Kulshreshtha authored
2016-09-15 16:47:34 +0530
Browse Dir »
renamed a variable which created issue. sometimes space is created between name. ...
bd7fb618
```
This created issue in opening view after closing jspanel sometimes.
```
Nikita Kulshreshtha authored
2016-09-15 15:51:05 +0530
Browse Dir »
loading icon was not visible on search and LM - Fixed.
76312e57

Nikita Kulshreshtha authored
2016-09-15 15:12:44 +0530
Browse Dir »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Ipadissue
0176201d

Mitali Srivastava authored
2016-09-15 13:34:42 +0530
Browse Dir »
title was Male Anterior always in LM - Fixed.
71b6f72b

Nikita Kulshreshtha authored
2016-09-15 12:02:10 +0530
Browse Dir »
After list manager load removed the wait cursor.
168aa89c

Nikita Kulshreshtha authored
2016-09-15 11:53:08 +0530
Browse Dir »
List manager/ search scroll fix with Develop stable code.
e1e05093

Nikita Kulshreshtha authored
2016-09-15 11:32:07 +0530
Browse Dir »

14 Sep, 2016

6 commits

Bug #7707 :CI and CA Search > The search button should work in case no criteria is selected. ...

c4ecf557

Bug #7677:Clinical Animation> thumbnails are not displayed
Bug #7523:Clinical Illustration:Message is missing, when no items are found after search.
Bug #7520:Clinical Animation:Message is missing! when no items are found after search.

authored

2016-09-14 18:36:00 +0530

Browse Dir »

Merge branch 'ThreedAnatomy' into Develop
590d0e29

Amrita Vishnoi authored
2016-09-14 18:15:34 +0530
Browse Dir »
Commit changes for Issue ...
29c622f5
```
Issue #7184:User is unable to select any annotation from an image
```
unknown authored
2016-09-14 17:26:33 +0530
Browse Dir »
3danatomy is done.
98d2e93e

Amit Kumar authored
2016-09-14 17:11:37 +0530
Browse Dir »
Bug #7114 :Search is not showing correct result
c3e32785

Mitali Srivastava authored
2016-09-14 16:44:44 +0530
Browse Dir »
Stabilized Develop branch back which has been disturbed after Nikita merge.
00a3c44f

Amrita Vishnoi authored
2016-09-14 12:21:57 +0530
Browse Dir »

13 Sep, 2016

6 commits

Merge branch 'showhidestructurename' into Develop
2cb60e3b

Amrita Vishnoi authored
2016-09-13 14:47:05 +0530
Browse Dir »
removed commented code
fbc6967e

Amrita Vishnoi authored
2016-09-13 14:19:42 +0530
Browse Dir »
Browser crash issue is resolved.now we are pushing data in ColoredImageSRC array
1ecdea6b

Amrita Vishnoi authored
2016-09-13 14:16:20 +0530
Browse Dir »
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 »
#7642 , #6200
15683ca1

Mukul Rajput authored
2016-09-13 11:26:26 +0530
Browse Dir »

12 Sep, 2016

7 commits

crash issue is In progress , we need to catch the enter event as well we can't fix it by ng-change.
aafbcbc0

Amrita Vishnoi authored
2016-09-12 18:29:32 +0530
Browse Dir »
changes done and create json for Respiratory system.
a45bba01

Amit Kumar authored
2016-09-12 17:45:51 +0530
Browse Dir »
Modified HomeController file
3e101343

Amrita Vishnoi authored
2016-09-12 13:59:52 +0530
Browse Dir »
tem changes
40f57f51

Amrita Vishnoi authored
2016-09-12 13:49:20 +0530
Browse Dir »
Refactor Code
aa477e2a

unknown authored
2016-09-12 12:00:11 +0530
Browse Dir »
Merge branch 'thumbnailviewchange' into Develop
efb210be

Amrita Vishnoi authored
2016-09-12 11:17:49 +0530
Browse Dir »
Merge branch 'LMInFemale' into Develop
9baafbe6

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

09 Sep, 2016

6 commits

bug #6200 ,#6731 ,#7283 ,#5286
9871bdc5

Mukul Rajput authored
2016-09-09 18:49:13 +0530
Browse Dir »
Merge branch 'bugs' into Develop
a076bcf9

Amrita Vishnoi authored
2016-09-09 17:30:06 +0530
Browse Dir »
Refs: #7398
84c06ae9

Amrita Vishnoi authored
2016-09-09 17:12:03 +0530
Browse Dir »
Commit Changes for Text Area
7be22d6b

unknown authored
2016-09-09 16:28:23 +0530
Browse Dir »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Annotation_Pencil ...
5c7bfab2
```
Conflicts:
	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
	400-SOURCECODE/AIAHTML5.Web/index.html
```
unknown authored
2016-09-09 16:18:42 +0530
Browse Dir »
Implemented Text Area Edit, Identity and draw functionality.
b402dbb3

unknown authored
2016-09-09 16:04:40 +0530
Browse Dir »