ADAM / AIAHTML5

16 Nov, 2016

1 commit

Added json Files and moved Tile load code in service but returning tile view HTML is pending...
6e9b06b6

Amrita Vishnoi authored
2016-11-16 10:56:36 +0530
Browse Code »

15 Nov, 2016

9 commits

Taken AA branch
c293f6fb

Amrita Vishnoi authored
2016-11-15 15:58:31 +0530
Browse Code »
Merge branch 'Bug #8666 ' into Develop
c81a594f

Amrita Vishnoi authored
2016-11-15 13:51:57 +0530
Browse Code »
Merge branch 'Bug #7235 ' into Develop
767ecfca

Amrita Vishnoi authored
2016-11-15 13:40:37 +0530
Browse Code »
Merge branch 'Bug #7978 ' into Develop
7daf2fa7

Amrita Vishnoi authored
2016-11-15 13:31:05 +0530
Browse Code »
Merge branch 'Bug #9777 ' into Develop
8abdaa8b

Amrita Vishnoi authored
2016-11-15 13:20:28 +0530
Browse Code »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Develop
7e2c2cb7

Amrita Vishnoi authored
2016-11-15 13:03:22 +0530
Browse Code »
Merge branch 'Bug #7663 ' into Develop
e4e60855

Amrita Vishnoi authored
2016-11-15 12:58:07 +0530
Browse Code »
Merge branch 'EditTextOption' into Develop
9875ed1c

Nikita Kulshreshtha authored
2016-11-15 12:15:20 +0530
Browse Code »
Annotation: Edit Text option is missing.
523e0176

unknown authored
2016-11-15 10:54:18 +0530
Browse Code »

14 Nov, 2016

2 commits

Merge branch 'Bug #8736 _1' into Develop
da83ae87

Amrita Vishnoi authored
2016-11-14 17:34:12 +0530
Browse Code »
Module Service work in progress...
fe0ccb07

Amrita Vishnoi authored
2016-11-14 14:42:33 +0530
Browse Code »

11 Nov, 2016

8 commits

attribute array has different index for the value of title so taking title of that.
c5b9000f

Nikita Kulshreshtha authored
2016-11-11 17:03:07 +0530
Browse Code »
remove was not supported.
20b1cbe9

Nikita Kulshreshtha authored
2016-11-11 15:44:17 +0530
Browse Code »
added tooltip to resolve this
2fe1213b

Nikita Kulshreshtha authored
2016-11-11 13:31:45 +0530
Browse Code »
Removed muli view open functionality title process.
9fc37106

Nikita Kulshreshtha authored
2016-11-11 13:11:48 +0530
Browse Code »
fixed
8e620fd5

Nikita Kulshreshtha authored
2016-11-11 12:49:02 +0530
Browse Code »
Merge branch 'Bugs_v4' into Develop
4c585150

Nikita Kulshreshtha authored
2016-11-11 11:55:44 +0530
Browse Code »
changed the remove method
837606de

unknown authored
2016-11-11 11:40:38 +0530
Browse Code »
spinner lasts till the process finish. ...
748db360
```
removed commented code.
```
Nikita Kulshreshtha authored
2016-11-11 11:18:55 +0530
Browse Code »

10 Nov, 2016

3 commits

highlight is maintained.
559ab2d9

Nikita Kulshreshtha authored
2016-11-10 15:33:40 +0530
Browse Code »
Merge branch 'Bug #9354 _1' into Develop
d5ae9aa1

Nikita Kulshreshtha authored
2016-11-10 11:34:48 +0530
Browse Code »
10-Nov-2016 scrum
e4aed70b

Amrita Vishnoi authored
2016-11-10 09:50:48 +0530
Browse Code »

09 Nov, 2016

6 commits

AA work in progress
5142b6fe

Amrita Vishnoi authored
2016-11-09 18:24:25 +0530
Browse Code »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Bugs_v4
3d7c24eb

unknown authored
2016-11-09 16:11:54 +0530
Browse Code »
Commit changes for #7769 :IE - Transparency box doesn't close on first click
1962d8f8

unknown authored
2016-11-09 16:09:53 +0530
Browse Code »
extracted part is maintained on gender and view change but n highlight mode. this is as per live
da36a67b

Nikita Kulshreshtha authored
2016-11-09 12:41:19 +0530
Browse Code »
Merge branch 'Bug #8837 _2' into Develop
40ea1f38

Nikita Kulshreshtha authored
2016-11-09 12:30:32 +0530
Browse Code »
removed xml files from solution
bf4202a2

Amrita Vishnoi authored
2016-11-09 11:37:39 +0530
Browse Code »

08 Nov, 2016

9 commits

scrum meeting points.
e0acb637

Amrita Vishnoi authored
2016-11-08 18:22:39 +0530
Browse Code »
Removed xml files. Mistakenly I have added xmlFiles.
1ddea18e

Amrita Vishnoi authored
2016-11-08 17:33:32 +0530
Browse Code »
Merge branch 'BugV2Merge' into Develop
64f4325c

Nikita Kulshreshtha authored
2016-11-08 16:59:01 +0530
Browse Code »
Merge branch 'Bugs_v2' of http://52.6.196.163/ADAM/AIAHTML5 into BugV2Merge
ab14330d

Nikita Kulshreshtha authored
2016-11-08 16:54:59 +0530
Browse Code »
Merge branch 'IEZoomIssueCA' into Develop
f25031a9

Nikita Kulshreshtha authored
2016-11-08 16:37:29 +0530
Browse Code »
Merge branch 'IEZoomIssueCI' into Develop
f430f59f

Nikita Kulshreshtha authored
2016-11-08 16:34:03 +0530
Browse Code »
now the highlighted body part is maintained on gender/ view change.
4767ef1e

Nikita Kulshreshtha authored
2016-11-08 16:26:04 +0530
Browse Code »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Bugs_v2 ...
15527ff9
```
# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
```
unknown authored
2016-11-08 12:54:55 +0530
Browse Code »

Commit changes for Issue ref: ...

77cf2dee

#9037:Clinical Animation > Annotation's Tools, Modes, Edit shape Style should be disable on CA's detail page.
#9016: Annotation > When text box is opened, view page should get disabled.

authored

2016-11-08 12:44:28 +0530

Browse Code »

07 Nov, 2016

2 commits

scrum status
b7a2d826

Amrita Vishnoi authored
2016-11-07 18:35:09 +0530
Browse Code »
whole data is not passing to openModuleItem
641bd20f

Amrita Vishnoi authored
2016-11-07 18:34:43 +0530
Browse Code »