ADAM / AIAHTML5 | GitLab

09 Jun, 2017

1 commit

added vocabterm jsons in common folder of json. ...
14e45497
```
made options enable
```
Nikita Kulshreshtha authored
2017-06-09 15:29:25 +0530
Browse Code »

08 Jun, 2017

8 commits

isAuthenticate set false
83f75cfc

Amrita Vishnoi authored
2017-06-08 17:55:19 +0530
Browse Code »
Merge branch 'SelectSyetemPinIssueMerge2' into Develop
11e00ef3

Amrita Vishnoi authored
2017-06-08 17:45:23 +0530
Browse Code »
merged SelectSystemPinIssue and ...
cb71c688
```
added some code manually as not merged automatically.
```
Amrita Vishnoi authored
2017-06-08 17:39:56 +0530
Browse Code »
Some AA bug fixes-
1461deb2

Amrita Vishnoi authored
2017-06-08 16:55:41 +0530
Browse Code »
added null checks. ...
6782af94
```
rename a varibale.
fixed issue after renaming.
```
Nikita Kulshreshtha authored
2017-06-08 16:24:20 +0530
Browse Code »
Merge branch 'AAAnnotation3Merge' into Develop
675ce92b

Amrita Vishnoi authored
2017-06-08 12:31:37 +0530
Browse Code »
Merge branch 'AAAnnotation3' of http://52.6.196.163/ADAM/AIAHTML5 into AAAnnotation3Merge
c7079db7

Amrita Vishnoi authored
2017-06-08 12:15:01 +0530
Browse Code »
Merge branch 'AASelectSystemFeature2Merge' into Develop
188612f5

Amrita Vishnoi authored
2017-06-08 11:54:35 +0530
Browse Code »

07 Jun, 2017

11 commits

changes in select system code
86d38287

Nikita Kulshreshtha authored
2017-06-07 22:06:51 +0530
Browse Code »
removed alert
6b5549ac

Nikita Kulshreshtha authored
2017-06-07 18:59:42 +0530
Browse Code »
removed unused page.
eeb1f11f

Nikita Kulshreshtha authored
2017-06-07 18:49:31 +0530
Browse Code »
this branch is having annotaion code without multi languge ...
9f208480
```
this code has issue in select system feature
```
Nikita Kulshreshtha authored
2017-06-07 18:40:22 +0530
Browse Code »
Commit after AASelectSystemFeature2 conflict resolve
a263f244

Amrita Vishnoi authored
2017-06-07 18:26:56 +0530
Browse Code »
Merge branch 'AtlasHightlightBodySystem' into Develop
7e662ac4

Amrita Vishnoi authored
2017-06-07 17:45:44 +0530
Browse Code »
added code for removing speech bubble of previously selected system.
9e88cfba

Nikita Kulshreshtha authored
2017-06-07 17:21:26 +0530
Browse Code »
Merge branch 'AODSlugFix' into Develop
7988fb50

Amrita Vishnoi authored
2017-06-07 17:20:37 +0530
Browse Code »
dlls commit
c46f37eb

Amrita Vishnoi authored
2017-06-07 16:53:53 +0530
Browse Code »
AOD slug is updated in AIA.js
5b1f6ca8

Amrita Vishnoi authored
2017-06-07 16:52:13 +0530
Browse Code »
Merge branch 'AdminProjectSeparation' into Develop
4168639c

Amrita Vishnoi authored
2017-06-07 16:11:02 +0530
Browse Code »

01 Jun, 2017

6 commits

Merge branch 'ListManagerActiveIssue1' into Develop
a1c82a2d

Nikita Kulshreshtha authored
2017-06-01 16:21:26 +0530
Browse Code »
Merge branch 'ListManagerSearchIssue' into Develop
cd0310a1

Nikita Kulshreshtha authored
2017-06-01 16:14:16 +0530
Browse Code »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into ListManagerActiveIssue1
92596bdb

unknown authored
2017-06-01 16:04:13 +0530
Browse Code »
List Manager Active Issue
4be6fa1c

unknown authored
2017-06-01 16:00:29 +0530
Browse Code »
Commit Changes
c2b7080e

unknown authored
2017-06-01 15:51:41 +0530
Browse Code »
Merge branch 'Bug #18479 ' into Develop
2b0e11c4

Nikita Kulshreshtha authored
2017-06-01 15:09:12 +0530
Browse Code »

31 May, 2017

1 commit

11132:DA > Annotation search from Search List is not highlight in the List manager.
9e176a5f

unknown authored
2017-05-31 15:00:36 +0530
Browse Code »

30 May, 2017

5 commits

added and commented code for creating pin directly on Div
4d3879ab

Nikita Kulshreshtha authored
2017-05-30 18:12:46 +0530
Browse Code »
system selection is complete. green image of pin is remaining
c32fc8d5

Nikita Kulshreshtha authored
2017-05-30 17:32:59 +0530
Browse Code »
Commit Changes
3034a22f

unknown authored
2017-05-30 15:21:58 +0530
Browse Code »
18477:Settings > Lexicons > Verify : Selected lexicons are not displayed on the body annotation.
1bd95a37

unknown authored
2017-05-30 15:11:06 +0530
Browse Code »
annotation speech bubble is draggable but second speech bubble position is not correct after drag
01b7c7ad

Nikita Kulshreshtha authored
2017-05-30 13:06:21 +0530
Browse Code »

29 May, 2017

1 commit

speech bubble is at proper position but line is not draggable. ...
97fe1524
```
Also need to remove speech bubble of the previous selected system on system selection.
```
Nikita Kulshreshtha authored
2017-05-29 17:59:13 +0530
Browse Code »

26 May, 2017

1 commit

annotation is visisble but not on appropriate location.
f084fd2a

Nikita Kulshreshtha authored
2017-05-26 18:25:07 +0530
Browse Code »

25 May, 2017

5 commits

Settings > Lexicons > Make the below mentioned changes.
c6501953

unknown authored
2017-05-25 13:03:09 +0530
Browse Code »
this is for highlight sidebar body system
86a613e8

Mukul Rajput authored
2017-05-25 12:08:41 +0530
Browse Code »
removed debugger
1d2fae10

Nikita Kulshreshtha authored
2017-05-25 11:46:43 +0530
Browse Code »
removed debugger
38daa33e

Nikita Kulshreshtha authored
2017-05-25 11:46:22 +0530
Browse Code »
Merge branch 'AAFixes' into Develop
69b00c58

Nikita Kulshreshtha authored
2017-05-25 11:42:50 +0530
Browse Code »

24 May, 2017

1 commit

added select system functionality. need to chekc if all pins are visible when we… ...
628c74c5
```
… select the system and also need to show the annotations on first 2 pins in pindata of selected system with green pin head.
```
Nikita Kulshreshtha authored
2017-05-24 18:25:02 +0530
Browse Code »