ADAM / AIAHTML5

1 commit

Issue in Transparency when annotation and annotation toolbar is open/close
5fadfdd4

unknown authored
2017-02-22 13:12:39 +0530
Browse Dir »

9 commits

removed a class
fe39ec41

Nikita Kulshreshtha authored
2017-02-21 18:19:17 +0530
Browse Dir »
Merge branch 'TBIssue1' of http://52.6.196.163/ADAM/AIAHTML5 into TBIssue1
020c0dd5

Nikita Kulshreshtha authored
2017-02-21 18:15:10 +0530
Browse Dir »
annotation tool bar canavses was added before deletion of the canvasDiv child. changed the location.
4b280fff

Nikita Kulshreshtha authored
2017-02-21 18:14:17 +0530
Browse Dir »
In a case there was issue in combination of Tbox and AToolbar.-fixed
c55173ee

Nikita Kulshreshtha authored
2017-02-21 18:00:20 +0530
Browse Dir »
added annotationToolbar open check
afab0321

Nikita Kulshreshtha authored
2017-02-21 16:55:11 +0530
Browse Dir »
now we can draw transparency box when annotation box is open
c2d51add

Nikita Kulshreshtha authored
2017-02-21 16:40:38 +0530
Browse Dir »
merged branch
b830a9b4

Nikita Kulshreshtha authored
2017-02-21 13:08:27 +0530
Browse Dir »
meaasge was incorrect
6de21315

Nikita Kulshreshtha authored
2017-02-21 12:36:41 +0530
Browse Dir »
not working in a case but working now
6808660f

Nikita Kulshreshtha authored
2017-02-21 12:25:34 +0530
Browse Dir »

2 commits

switched off authentiaction for development merge
725f1d75

Nikita Kulshreshtha authored
2017-02-20 12:15:06 +0530
Browse Dir »
Merge branch 'PrintCssIssues' into Develop
9281c1cf

Nikita Kulshreshtha authored
2017-02-20 11:31:02 +0530
Browse Dir »

10 commits

changed the location from where message picked
e9225240

Amrita Vishnoi authored
2017-02-16 17:42:31 +0530
Browse Dir »
Code correction regarding print-main.css conflicts
d9002148

Utkarsh Singh authored
2017-02-16 17:13:12 +0530
Browse Dir »
Allover message were written in string text for login. Now fixed.
35878cd6

Amrita Vishnoi authored
2017-02-16 17:07:59 +0530
Browse Dir »
For development purpose we have introduced default autentication TRUE. ...
952f23fd
```
we set this in web.config and handled in code accordingly.
On Live, we will set it false.
```
Nikita Kulshreshtha authored
2017-02-16 16:10:45 +0530
Browse Dir »
resolved conflicts
1a6a967e

Amrita Vishnoi authored
2017-02-16 16:02:35 +0530
Browse Dir »
updated message in the develop in which login was working fine on server.
7a102231

Amrita Vishnoi authored
2017-02-16 15:34:07 +0530
Browse Dir »
updated message on login
531f8772

Amrita Vishnoi authored
2017-02-16 13:14:21 +0530
Browse Dir »
small to capital for result params.
f78c1907

Nikita Kulshreshtha authored
2017-02-16 11:46:24 +0530
Browse Dir »
Update password intimation related changes
094e95a7

Nikita Kulshreshtha authored
2017-02-16 11:37:52 +0530
Browse Dir »
made changes.
d89e84b9

Nikita Kulshreshtha authored
2017-02-16 10:49:37 +0530
Browse Dir »

3 commits

introduced logs and some conditions.
1045b02d

Nikita Kulshreshtha authored
2017-02-15 17:25:02 +0530
Browse Dir »
changes made in code. ...
b0343ffb
```
earlier if user was not found, we could login but now not.
also issue in restting &location.url
```
Nikita Kulshreshtha authored
2017-02-15 11:44:28 +0530
Browse Dir »
Committed
12592eb0

Utkarsh Singh authored
2017-02-15 10:56:12 +0530
Browse Dir »

11 commits

Committed
48bae682

Utkarsh Singh authored
2017-02-14 20:34:10 +0530
Browse Dir »
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Develop
1d045e4f

Amrita Vishnoi authored
2017-02-14 17:21:34 +0530
Browse Dir »
Merge branch 'uncheckedbrush' of http://52.6.196.163/ADAM/AIAHTML5 into Develop
d5e8818e

Amrita Vishnoi authored
2017-02-14 16:58:13 +0530
Browse Dir »
commit against merge request 332.
4a4765f1

Amrita Vishnoi authored
2017-02-14 16:48:15 +0530
Browse Dir »
Merge against #308 merge request.
9d77c288

Nikita Kulshreshtha authored
2017-02-14 16:46:47 +0530
Browse Dir »
Merge branch 'Bug #13177 ' into Develop
1fe005bd

Amrita Vishnoi authored
2017-02-14 12:45:40 +0530
Browse Dir »
Merge branch 'Bug #13707 ' into Develop
191a1c8d

Amrita Vishnoi authored
2017-02-14 12:39:12 +0530
Browse Dir »
Merge branch 'Bug #13665 ' into Develop
d9e0fd1c

Amrita Vishnoi authored
2017-02-14 12:30:36 +0530
Browse Dir »
Merged against #329 merge request
be6739f5

Amrita Vishnoi authored
2017-02-14 12:16:34 +0530
Browse Dir »
Merge branch 'TBhighlight5Merge' into Develop
2c9f6d69

Amrita Vishnoi authored
2017-02-14 11:11:11 +0530
Browse Dir »
Merge branch 'viewChnageSkintoneIssue' into Develop
ba1513b2

Amrita Vishnoi authored
2017-02-14 10:58:54 +0530
Browse Dir »

4 commits

removed commnetd code
6d2a20b2

Nikita Kulshreshtha authored
2017-02-10 17:37:51 +0530
Browse Dir »
merged #13666
35ee7463

Nikita Kulshreshtha authored
2017-02-10 17:36:21 +0530
Browse Dir »
Committed code for Forgot UserId/ Password and reset Password
12d13a00

Utkarsh Singh authored
2017-02-10 16:03:28 +0530
Browse Dir »
resolved
0fdf209f

Nikita Kulshreshtha authored
2017-02-10 12:53:53 +0530
Browse Dir »