ADAM / AIAHTML5

13 Sep, 2016

1 commit

Switched off search functionality but LS will also not work due to annotation data is off.
72d1805d

Amrita Vishnoi authored
2016-09-13 11:46:28 +0530
Browse Code »

12 Sep, 2016

9 commits

Merge branch 'TextAreaMerge' into Develop
27d0ad0c

Amrita Vishnoi authored
2016-09-12 14:17:24 +0530
Browse Code »
git ignore
89d4f9fe

Amrita Vishnoi authored
2016-09-12 14:11:41 +0530
Browse Code »
delete .org
4bf6b477

Amrita Vishnoi authored
2016-09-12 14:11:17 +0530
Browse Code »
Modified HomeController file
3e101343

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

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

unknown authored
2016-09-12 12:00:11 +0530
Browse Code »
Merge branch 'BodyViewTitleBug7543' into Develop
5bc4a80b

Amrita Vishnoi authored
2016-09-12 11:37:24 +0530
Browse Code »
Merge branch 'thumbnailviewchange' into Develop
efb210be

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

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

09 Sep, 2016

13 commits

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

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

Amrita Vishnoi authored
2016-09-09 17:30:06 +0530
Browse Code »
Merge branch 'Sprin10BugFix' into Develop
420a99e2

Amrita Vishnoi authored
2016-09-09 17:24:48 +0530
Browse Code »
Refs: #7398
84c06ae9

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

unknown authored
2016-09-09 16:28:23 +0530
Browse Code »
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 Code »
Comitt Changes for Web.csproj and Web.csproj.user
70336bbd

unknown authored
2016-09-09 16:12:34 +0530
Browse Code »
Implemented Text Area Edit, Identity and draw functionality.
b402dbb3

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

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 Code »

Bug #7543 :DA > Incorrect View Title
c5fe5499

Mitali Srivastava authored
2016-09-09 15:33:22 +0530
Browse Code »
Refs: #7298
8313a5d3

Nikita Kulshreshtha authored
2016-09-09 13:15:22 +0530
Browse Code »
List manager is working in female gender also.
a36a5126

Nikita Kulshreshtha authored
2016-09-09 13:13:59 +0530
Browse Code »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into bugs
0270d7e6

unknown authored
2016-09-09 10:04:58 +0530
Browse Code »

08 Sep, 2016

17 commits

Merge branch 'ExtractFixMerge' into Develop
db0b2ac4

Amrita Vishnoi authored
2016-09-08 17:41:34 +0530
Browse Code »
Merge branch 'ExtractAfterSearchOrLM' of http://52.6.196.163/ADAM/AIAHTML5 into ExtractFixMerge ...
ec7fba62
```
# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
```
Amrita Vishnoi authored
2016-09-08 17:36:22 +0530
Browse Code »
Commit changes for Ref : Issue #7399 ...
da965f1e
```
 Issue #7399: Alerts are showing for all body sytems on Curriculum builder module click(observed at google chrome)
```
unknown authored
2016-09-08 17:35:14 +0530
Browse Code »
Modified base uri as per server
cfac7f46

Amrita Vishnoi authored
2016-09-08 17:03:47 +0530
Browse Code »
Merge branch 'ListManagerWorkingWIthUatCode' into Develop
7fd1db7a

Amrita Vishnoi authored
2016-09-08 16:57:42 +0530
Browse Code »
Merge branch 'HighlightFunctionsBugsMerge' into Develop
15ca083f

Amrita Vishnoi authored
2016-09-08 16:45:52 +0530
Browse Code »
Commit changes for Ref: Issue #7286 ...
bfca2cb9
```
//Issue #7286 :Undefined annotation should not appear
```
unknown authored
2016-09-08 16:40:41 +0530
Browse Code »
Refs: #6740 ...
ca97b013
```
Dissectible Anatomy > Both the highlighted functions can't be active at the same time
```
Amrita Vishnoi authored
2016-09-08 16:37:08 +0530
Browse Code »
changed baseref from AIAHTML5 to AIA
6be46160

Nikita Kulshreshtha authored
2016-09-08 15:27:33 +0530
Browse Code »
Merge branch 'temp' into Develop
5f257280

Amrita Vishnoi authored
2016-09-08 15:20:55 +0530
Browse Code »
Removed unwanted files which had committed earlier
0542c9e4

Amrita Vishnoi authored
2016-09-08 15:16:01 +0530
Browse Code »
Merge branch 'FixesAfterCodeReview' into Develop
7c850638

Amrita Vishnoi authored
2016-09-08 15:02:09 +0530
Browse Code »
COMMITED .CSPROJ FILE
e3504454

Mukul Rajput authored
2016-09-08 14:27:03 +0530
Browse Code »
Made changes reported in review.
6b49383e

Mukul Rajput authored
2016-09-08 14:25:06 +0530
Browse Code »
Refs: #7098
0f6ed55c

Nikita Kulshreshtha authored
2016-09-08 14:06:28 +0530
Browse Code »
#6740 :Dissectible Anatomy > Both the highlighted functions can't be active at the same time ...
453122b9
```
#7424:Highlight button should not be active when user clicks on Extract button
#7428:Only Highlight should be active
#7429:Incorrect state of the button
```
Mitali Srivastava authored
2016-09-08 14:05:28 +0530
Browse Code »
Merge branch '7398IssueFix' into Develop
1310aae7

Amrita Vishnoi authored
2016-09-08 14:05:03 +0530
Browse Code »