ADAM / AIAHTML5 | GitLab

21 Feb, 2017

15 commits

Merge branch 'TBIssue1' into Develop
66c73b5b

Nikita Kulshreshtha authored
2017-02-21 18:21:59 +0530
Browse Code »
removed a class
fe39ec41

Nikita Kulshreshtha authored
2017-02-21 18:19:17 +0530
Browse Code »
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 Code »
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 Code »
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 Code »
added annotationToolbar open check
afab0321

Nikita Kulshreshtha authored
2017-02-21 16:55:11 +0530
Browse Code »
Merge branch 'TransparencyNotWorking_Merge' into Develop
a25f1460

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

Nikita Kulshreshtha authored
2017-02-21 16:40:38 +0530
Browse Code »
Merge branch 'listMangerStateMaintainIssue1_Merge' into Develop
3959ad25

Nikita Kulshreshtha authored
2017-02-21 13:10:22 +0530
Browse Code »
merged branch
b830a9b4

Nikita Kulshreshtha authored
2017-02-21 13:08:27 +0530
Browse Code »
Merge branch 'messageModalIntergartion' into Develop
0e5d2091

Nikita Kulshreshtha authored
2017-02-21 12:41:22 +0530
Browse Code »
meaasge was incorrect
6de21315

Nikita Kulshreshtha authored
2017-02-21 12:36:41 +0530
Browse Code »
removed zindex as it amde the ok button of modal non clickable.
12a34fe5

Nikita Kulshreshtha authored
2017-02-21 12:29:58 +0530
Browse Code »
not working in a case but working now
6808660f

Nikita Kulshreshtha authored
2017-02-21 12:25:34 +0530
Browse Code »
Commit Changes
50bf3ea4

unknown authored
2017-02-21 11:52:53 +0530
Browse Code »

20 Feb, 2017

2 commits

switched off authentiaction for development merge
725f1d75

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

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

16 Feb, 2017

14 commits

changed the location from where message picked
e9225240

Amrita Vishnoi authored
2017-02-16 17:42:31 +0530
Browse Code »
Merge branch 'LoginIssues' into Develop
6c7473be

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

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

Amrita Vishnoi authored
2017-02-16 17:07:59 +0530
Browse Code »
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 Code »
resolved conflicts
1a6a967e

Amrita Vishnoi authored
2017-02-16 16:02:35 +0530
Browse Code »
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 Code »
updated message on login
531f8772

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

Nikita Kulshreshtha authored
2017-02-16 11:46:24 +0530
Browse Code »
Merge branch 'AfterResetPasswordClose' into Develop
b8b62ae9

Nikita Kulshreshtha authored
2017-02-16 11:40:56 +0530
Browse Code »
Update password intimation related changes
094e95a7

Nikita Kulshreshtha authored
2017-02-16 11:37:52 +0530
Browse Code »
Merge branch 'PasswordResetMailBodyUpdates_Merge' into Develop
a79023e0

Nikita Kulshreshtha authored
2017-02-16 10:55:41 +0530
Browse Code »
changed the message
5a0f2429

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

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

15 Feb, 2017

9 commits

Merge branch 'emailConfigs' into Develop
495776ca

Nikita Kulshreshtha authored
2017-02-15 18:17:55 +0530
Browse Code »
configurations for email sending from Live.
b9ec8090

Nikita Kulshreshtha authored
2017-02-15 18:13:41 +0530
Browse Code »
Merge branch 'ChangesInLogin' into Develop
cd7313db

Nikita Kulshreshtha authored
2017-02-15 17:31:43 +0530
Browse Code »
introduced logs and some conditions.
1045b02d

Nikita Kulshreshtha authored
2017-02-15 17:25:02 +0530
Browse Code »
removed IP
a949d27f

Nikita Kulshreshtha authored
2017-02-15 12:05:43 +0530
Browse Code »
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 Code »
Merge branch 'ResetPass_Complete' into Develop
252cf5ea

Nikita Kulshreshtha authored
2017-02-15 11:02:35 +0530
Browse Code »
Committed
12592eb0

Utkarsh Singh authored
2017-02-15 10:56:12 +0530
Browse Code »
Commited code Branch ResetPass_COmplete
7de53748

Utkarsh Singh authored
2017-02-15 10:07:09 +0530
Browse Code »