ADAM / AIAHTML5

17 Jan, 2017

1 commit

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Test_stash ...
122a7252
```
Conflicts:
	400-SOURCECODE/AIAHTML5.Web/index.html
```
Amit Kumar authored
2017-01-17 11:37:28 +0530
Browse Dir »

16 Jan, 2017

4 commits

Against Merge Request : #274
9e7890ba

Amrita Vishnoi authored
2017-01-16 16:34:24 +0530
Browse Dir »
against merge request: #269
5fda215d

Amrita Vishnoi authored
2017-01-16 15:20:44 +0530
Browse Dir »
change for space against merge request #268
ca2e66e3

Amrita Vishnoi authored
2017-01-16 15:10:38 +0530
Browse Dir »
Merge branch 'citableviewissu' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-16Jan2017
c7400b10

Amrita Vishnoi authored
2017-01-16 15:04:02 +0530
Browse Dir »

12 Jan, 2017

2 commits

this is for erase button and brush icon must be black
3e7c3726

Mukul Rajput authored
2017-01-12 12:35:17 +0530
Browse Dir »
this is for ca table view fix
355cd6d3

Mukul Rajput authored
2017-01-12 12:18:02 +0530
Browse Dir »

11 Jan, 2017

1 commit

DA > Annotation Toolbar > Default color "White" in Fill Option and "Black" in Ou… ...
f455b7ba
```
…tline Option is display in the below mention case.
```
unknown authored
2017-01-11 13:27:13 +0530
Browse Dir »

09 Jan, 2017

3 commits

Merge branch 'CICAMenu' into Develop
532e67d4

Nikita Kulshreshtha authored
2017-01-09 17:48:23 +0530
Browse Dir »
this is show hide structure
e30d71ca

Mukul Rajput authored
2017-01-09 15:46:54 +0530
Browse Dir »
Bug #10201 : Menu > Options ----> List Manger and Add to Existing Curriculum shou… ...
09ecfd7d
```
…ld be disable on CI and CA Detail page.
```
Mitali Srivastava authored
2017-01-09 13:43:26 +0530
Browse Dir »

06 Jan, 2017

1 commit

Merge branch 'catableviewnew' into Develop
ad250edf

Amrita Vishnoi authored
2017-01-06 18:03:04 +0530
Browse Dir »

26 Dec, 2016

1 commit

this is for ca table view new
c28c18a7

Mukul Rajput authored
2016-12-26 15:20:45 +0530
Browse Dir »

19 Dec, 2016

2 commits

Background Image Issue
473c797e

unknown authored
2016-12-19 15:29:35 +0530
Browse Dir »
Merge branch 'JsPannelInAA' of http://52.6.196.163/ADAM/AIAHTML5 into PinInAA
a71ebd7f

Amrita Vishnoi authored
2016-12-19 11:35:20 +0530
Browse Dir »

12 Dec, 2016

1 commit

code till not introduced the JSPannel.
cdb4b6ef

Amrita Vishnoi authored
2016-12-12 17:44:59 +0530
Browse Dir »

08 Dec, 2016

1 commit

Atlas anatomy test files
48abc380

Amrita Vishnoi authored
2016-12-08 17:06:21 +0530
Browse Dir »

25 Nov, 2016

1 commit

Able to open the AA Open view but not the dynamic one.
6dff4700

Amrita Vishnoi authored
2016-11-25 18:20:34 +0530
Browse Dir »

17 Nov, 2016

1 commit

Bug #8679 : CI > List View> Image should be selected in the list if we click on any of it
d0198fd5

Mitali Srivastava authored
2016-11-17 13:45:10 +0530
Browse Dir »

16 Nov, 2016

1 commit

Bug #7963 : CI & CA > Change the tooltip. ...
194dc810
```
The tooltip class is moved to main.css to acheive uniformity in the project and remove duplicacy of definning it.
```
Mitali Srivastava authored
2016-11-16 18:54:44 +0530
Browse Dir »

28 Oct, 2016

1 commit

Merge conflicts after taking Atlas Anatomy pull.
e0a5604f

Amrita Vishnoi authored
2016-10-28 16:40:46 +0530
Browse Dir »

20 Oct, 2016

1 commit

this is for 7750 and 7749
2153d8dc

Mukul Rajput authored
2016-10-20 20:11:25 +0530
Browse Dir »

14 Oct, 2016

2 commits

extr4acted out common code for CI AND CA
d856c12a

Amrita Vishnoi authored
2016-10-14 15:28:56 +0530
Browse Dir »
All images are of different size so created a class to make all of them in same size.
d5b85e0c

Amrita Vishnoi authored
2016-10-14 13:02:52 +0530
Browse Dir »

13 Oct, 2016

1 commit

this is for bug #7875 and #7873
13266c6c

Mukul Rajput authored
2016-10-13 12:48:41 +0530
Browse Dir »

07 Oct, 2016

2 commits

this is for bug #8327 again
fbc14498

Mukul Rajput authored
2016-10-07 13:31:44 +0530
Browse Dir »
this is for bug 8327
a5d00ea8

Mukul Rajput authored
2016-10-07 12:28:17 +0530
Browse Dir »

30 Sep, 2016

1 commit

74 merged request changes
0fb9ec8e

Amrita Vishnoi authored
2016-09-30 11:35:30 +0530
Browse Dir »

20 Sep, 2016

1 commit

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into tablecibrush ...
3dcad88d
```
Conflicts:
	400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
```
Mukul Rajput authored
2016-09-20 12:47:25 +0530
Browse Dir »

15 Sep, 2016

2 commits

Bug #7404 :Application is not running on ipad version 7.0.4
848bfec7

Mitali Srivastava authored
2016-09-15 15:55:41 +0530
Browse Dir »
this is for CI list view table
c58c33d2

Mukul Rajput authored
2016-09-15 12:05:09 +0530
Browse Dir »

09 Sep, 2016

1 commit

Commit changes for Ref: ...

005e31fb

Issue#7547 :Once the edit shape style popup is opened if user clicks and drag popup gets displaced from its original position.

authored

2016-09-09 15:37:15 +0530

Browse Dir »

08 Sep, 2016

1 commit

Made changes reported in review.
6b49383e

Mukul Rajput authored
2016-09-08 14:25:06 +0530
Browse Dir »

01 Sep, 2016

1 commit

Files Merged with branch DisableATBarOnPopUp
c78cfb13

Mukul Rajput authored
2016-09-01 13:15:12 +0530
Browse Dir »

31 Aug, 2016

1 commit

Edit Shape Style Pop-up Background Disabled and dragging issue resolved
4878814b

unknown authored
2016-08-31 12:05:38 +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 »

23 Aug, 2016

2 commits

Merge branch 'ExtarctBlackIssueInLArm' of http://52.6.196.163/ADAM/AIAHTML5 into… ...

ca2a151b

… AnnotationPopupActiveButton

Conflicts:
	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
	400-SOURCECODE/AIAHTML5.Web/index.html

authored

2016-08-23 12:37:05 +0530

Browse Dir »

Commit changes for TextArea and Free style drawing.
bd3b8d2b

unknown authored
2016-08-23 12:01:13 +0530
Browse Dir »

22 Aug, 2016

1 commit

commit
3057b35f

Mukul Rajput authored
2016-08-22 15:12:39 +0530
Browse Dir »