ADAM / AIAHTML5

30 Sep, 2016

6 commits

88 Merged Request
68f8eacb

Amrita Vishnoi authored
2016-09-30 12:33:25 +0530
Browse Code »
79 merged commit
1f82b15f

Amrita Vishnoi authored
2016-09-30 11:55:39 +0530
Browse Code »
Refs: 7646, 7914 ...
4a6500fa
```
commit after buBugFix.
```
Nikita Kulshreshtha authored
2016-09-30 11:41:12 +0530
Browse Code »
74 merged request changes
0fb9ec8e

Amrita Vishnoi authored
2016-09-30 11:35:30 +0530
Browse Code »
renamed function
53f67365

Amrita Vishnoi authored
2016-09-30 11:21:19 +0530
Browse Code »
Merge branch 'ReplicatedCodeForAnnotation' into Develop
9e2be78c

Amrita Vishnoi authored
2016-09-30 10:57:04 +0530
Browse Code »

29 Sep, 2016

15 commits

decreased time
8cb4e826

Amrita Vishnoi authored
2016-09-29 17:01:54 +0530
Browse Code »
extended time
c472cbfa

Amrita Vishnoi authored
2016-09-29 16:38:37 +0530
Browse Code »
Merge branch 'RemovedAddEventLitsnersForFreeze' into Develop
a57d7b65

Amrita Vishnoi authored
2016-09-29 16:23:20 +0530
Browse Code »
Removed addEventListner
900c353c

Amrita Vishnoi authored
2016-09-29 16:10:13 +0530
Browse Code »
more null check
2ef28470

Amrita Vishnoi authored
2016-09-29 14:58:43 +0530
Browse Code »
null check
3c386e26

Amrita Vishnoi authored
2016-09-29 14:49:40 +0530
Browse Code »
Merge branch 'MergeDevelopIntoFreezeCodeWithFixes' into Develop
814bc907

Amrita Vishnoi authored
2016-09-29 14:26:39 +0530
Browse Code »
Merged after pulling Develop
64f31c11

Amrita Vishnoi authored
2016-09-29 14:10:36 +0530
Browse Code »
dispatching event from gender Switch too
126b78ef

Amrita Vishnoi authored
2016-09-29 13:49:17 +0530
Browse Code »
now we are dispatching event from javascript onclick function
e773e07e

Amrita Vishnoi authored
2016-09-29 13:42:56 +0530
Browse Code »
Merge branch 'FreezeCodeManualMerge' into Develop
ceca6087

Amrita Vishnoi authored
2016-09-29 12:59:20 +0530
Browse Code »
removed debugger.
ad6aadbf

Amrita Vishnoi authored
2016-09-29 12:51:46 +0530
Browse Code »
Removed rootscope
e3e99fdc

Amrita Vishnoi authored
2016-09-29 12:47:14 +0530
Browse Code »
manual freeze fix merge and also removed addEventListner from close and create t… ...
ad8770dd
```
…box function because they were creating functional issue and now we have added onClick for them.
```
Amrita Vishnoi authored
2016-09-29 12:31:22 +0530
Browse Code »
Freezing issue is fixed.
2a2ce7c2

Amrita Vishnoi authored
2016-09-29 11:56:53 +0530
Browse Code »

28 Sep, 2016

3 commits

Refs: 8112
d3e93a6c

Amrita Vishnoi authored
2016-09-28 17:47:35 +0530
Browse Code »
Merge branch 'NikitaDevelopBranch' into Develop
e56077ee

Amrita Vishnoi authored
2016-09-28 11:01:16 +0530
Browse Code »
Removed Debuggers
d08bae56

Amrita Vishnoi authored
2016-09-28 10:51:41 +0530
Browse Code »

27 Sep, 2016

2 commits

Commit changes for paint canvas
50a0f797

unknown authored
2016-09-27 11:15:46 +0530
Browse Code »
Review Code For Annotation Tool Bar
0a4e1d4d

unknown authored
2016-09-27 10:16:12 +0530
Browse Code »

26 Sep, 2016

5 commits

Removed ng-click
ebbf8841

unknown authored
2016-09-26 17:35:56 +0530
Browse Code »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into ReplicatedCodeForAnnotation ...
ef72daa8
```
Conflicts:
	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
```
unknown authored
2016-09-26 16:58:54 +0530
Browse Code »
Rename Function For Annotation
254b8ac9

unknown authored
2016-09-26 16:55:48 +0530
Browse Code »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Develop
7d2b7051

Nikita Kulshreshtha authored
2016-09-26 15:32:55 +0530
Browse Code »
Merge branch 'HOAfterSearchThenViewChange' into Develop
c597217c

Nikita Kulshreshtha authored
2016-09-26 15:26:05 +0530
Browse Code »

23 Sep, 2016

5 commits

Commit changes for the issue Ref: ...
e26f5798
```
#7914:Annotation should be disable when List Manager is open.
```
unknown authored
2016-09-23 18:17:11 +0530
Browse Code »
when user seracg anything then change view and then select any systemfrom highli… ...
f1564423
```
…ght options, its highlighted the system.
Made layerNumber by default 0 on gender  change as per live.
```
Nikita Kulshreshtha authored
2016-09-23 17:18:50 +0530
Browse Code »
issue was highlight options was not maintained on llayer change.
bb85654e

Nikita Kulshreshtha authored
2016-09-23 16:19:38 +0530
Browse Code »
1. extract is maintained on layer change if exist. ...
3c31fdaa
```
2. if user first click on extract without selecting any body part then nothing happens. Now if user click on any body part, extract is done.
```
Nikita Kulshreshtha authored
2016-09-23 15:13:39 +0530
Browse Code »
Resolved line issue, pin issue and replicated a code for annotation toolbar in different views.
8fefb59f

unknown authored
2016-09-23 11:17:49 +0530
Browse Code »

22 Sep, 2016

4 commits

after reverting flushCanavs to coloredImage src dependent, List manager stopped working. ...
18fab3c4
```
Reverted that code and apllied loop length as per view.
Now LM is working.
```
Nikita Kulshreshtha authored
2016-09-22 18:14:29 +0530
Browse Code »
extract is done only when user selected some body part.
bab9b7bb

Nikita Kulshreshtha authored
2016-09-22 16:06:52 +0530
Browse Code »
commit changes for issue #7646
255e98f2

unknown authored
2016-09-22 15:23:00 +0530
Browse Code »
commit changes for Issue Ref: ...
3fe06c2c
```
#7646:List Manager - Incorrect state of the button
```
unknown authored
2016-09-22 14:25:32 +0530
Browse Code »