ADAM / AIAHTML5 | GitLab

20 Jan, 2017

1 commit

this is for close annotation model sketch brush must not work
febe4c27

Mukul Rajput authored
2017-01-20 12:12:53 +0530
Browse Dir »

19 Jan, 2017

3 commits

removed one extra function
7e6d4d67

Amrita Vishnoi authored
2017-01-19 11:01:52 +0530
Browse Dir »
3d anatomy mapped with its view and also removed one extra function from home controller
2084019f

Amrita Vishnoi authored
2017-01-19 11:00:16 +0530
Browse Dir »
for now the modules are hard coded as earlier and bypasses login. ...
5705d96e
```
This will be back once the remote mongoDB conenction issue is fixed.
```
Nikita Kulshreshtha authored
2017-01-19 10:32:58 +0530
Browse Dir »

18 Jan, 2017

1 commit

handled cases for login
b3511541

Nikita Kulshreshtha authored
2017-01-18 15:44:39 +0530
Browse Dir »

17 Jan, 2017

10 commits

login integration
7ab9aefb

Amrita Vishnoi authored
2017-01-17 16:34:59 +0530
Browse Dir »
Against merge request: #287
698d8c3a

Amrita Vishnoi authored
2017-01-17 16:07:42 +0530
Browse Dir »
Merge branch 'Bug #12343 ' into Develop
a966bef7

Amrita Vishnoi authored
2017-01-17 15:56:19 +0530
Browse Dir »
Merge branch 'CICAShowAllNew' into Develop
b6559926

Amrita Vishnoi authored
2017-01-17 15:37:23 +0530
Browse Dir »
Merge branch 'ButtonSearchDANew' into Develop
ddd4a39b

Amrita Vishnoi authored
2017-01-17 15:27:00 +0530
Browse Dir »
Refs: #10873
7e795a1b

Utkarsh Singh authored
2017-01-17 15:20:14 +0530
Browse Dir »
commented code removed
8c25c62b

Nikita Kulshreshtha authored
2017-01-17 14:52:48 +0530
Browse Dir »
Earlier Merge Request #275 ...
2ca436a7
```
Bug #7130:Nothing happens on clicking these buttons
```
Mitali Srivastava authored
2017-01-17 14:08:06 +0530
Browse Dir »
Earlier Merge Request #278 ...
2aeeeee4
```
Bug #12233:Clinical Illustration > "Show All" button is not working.
```
Mitali Srivastava authored
2017-01-17 13:32:12 +0530
Browse Dir »
Refs : #10871
e2e5b717

Utkarsh Singh authored
2017-01-17 12:32:29 +0530
Browse Dir »

16 Jan, 2017

11 commits

resolved bug. ...
27b67d4f
```
rename a function.
```
Nikita Kulshreshtha authored
2017-01-16 18:30:46 +0530
Browse Dir »
Merge branch 'Bug #12427 _2' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-16Jan2017
df499cdd

Amrita Vishnoi authored
2017-01-16 17:39:50 +0530
Browse Dir »
resolved the bug. now the modesty image in TB only shown if it exists on current layer.
98d24e4f

Nikita Kulshreshtha authored
2017-01-16 17:13:05 +0530
Browse Dir »
Against Merge Request : #274
9e7890ba

Amrita Vishnoi authored
2017-01-16 16:34:24 +0530
Browse Dir »
Merge branch 'brushopacity' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-16Jan2017
adbef95c

Amrita Vishnoi authored
2017-01-16 15:34:18 +0530
Browse Dir »
Merge branch 'mouseuperaseiconblack' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-16Jan2017
00a807c8

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

Amrita Vishnoi authored
2017-01-16 15:20:44 +0530
Browse Dir »
Merge branch 'MergingHistoryCodeinDevelop' of http://52.6.196.163/ADAM/AIAHTML5 … ...
807d21d6
```
…into Develop-16Jan2017
```
Amrita Vishnoi authored
2017-01-16 12:44:57 +0530
Browse Dir »
removed comment from wrong place
10873ab1

Amrita Vishnoi authored
2017-01-16 12:21:24 +0530
Browse Dir »
Merged code against closed request ID: #258
fa8f0546

Amrita Vishnoi authored
2017-01-16 11:39:20 +0530
Browse Dir »
Commit Changes
bee21369

unknown authored
2017-01-16 11:30:19 +0530
Browse Dir »

13 Jan, 2017

3 commits

changed location of code for setting title of module
756604af

Nikita Kulshreshtha authored
2017-01-13 16:43:41 +0530
Browse Dir »
removed commnetd code
44c99714

Nikita Kulshreshtha authored
2017-01-13 16:26:24 +0530
Browse Dir »
Commit Changes For History Code
c15dd72d

unknown authored
2017-01-13 15:11:40 +0530
Browse Dir »

12 Jan, 2017

10 commits

now title of module is dynamic. ...
aa922a08
```
issue in selection color.
```
Nikita Kulshreshtha authored
2017-01-12 18:27:32 +0530
Browse Dir »
commit changes for Bug #12596 :DA > Annotation Toolbar > If Fill Option and Outli… ...
54e1c49e
```
…ne option are unchecked and user click on Cancel button. Changes should be discard.
```
unknown authored
2017-01-12 17:11:49 +0530
Browse Dir »
login and dynamic modules
8845454a

Nikita Kulshreshtha authored
2017-01-12 15:17:06 +0530
Browse Dir »
this is for opacity on brush draw sketch
9bd18a5a

Mukul Rajput authored
2017-01-12 13:08:13 +0530
Browse Dir »
this is for mouse release erase icon must be black
482ad256

Mukul Rajput authored
2017-01-12 12:49:58 +0530
Browse Dir »
this is for erase button and brush icon must be black
3e7c3726

Mukul Rajput authored
2017-01-12 12:35:17 +0530
Browse Dir »
Merge branch 'RectangleResizingIssue' into Develop
acd0e040

Amrita Vishnoi authored
2017-01-12 12:33:51 +0530
Browse Dir »
Merge branch 'ColorIssueInEditPopup' into Develop
9c2ad1d7

Amrita Vishnoi authored
2017-01-12 12:20:24 +0530
Browse Dir »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Bugs_v17 ...
9eeccea8
```
# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
```
unknown authored
2017-01-12 12:02:25 +0530
Browse Dir »
Commit changes for Bug #12596 :DA > Annotation Toolbar > If Fill Option and Outli… ...
0ef23937
```
…ne option are unchecked and user click on Cancel button. Changes should be discard.
```
unknown authored
2017-01-12 11:57:15 +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 »