Logo white

ADAM / AIAHTML5

Sign in
  • Sign in
  • Project
  • Files
  • Commits
  • Network
  • Graphs
  • Milestones
  • Issues
  • Merge Requests 14
  • Labels
  • Wiki
  • Snippets
  • Commits 3,087
  • Compare
  • Branches 1610
  • Tags 133
  • AIAHTML5
  • 400-SOURCECODE
  • AIAHTML5.Web
  • index.html
18 Jan, 2017
1 commit
  • handled cases for login
    b3511541
    Nikita Kulshreshtha authored
    2017-01-18 15:44:39 +0530  
    Browse File »

17 Jan, 2017
4 commits
  • login integration
    7ab9aefb
    Amrita Vishnoi authored
    2017-01-17 16:34:59 +0530  
    Browse File »
  • Against merge request: #287
    698d8c3a
    Amrita Vishnoi authored
    2017-01-17 16:07:42 +0530  
    Browse File »
  • Refs: #10873
    7e795a1b
    Utkarsh Singh authored
    2017-01-17 15:20:14 +0530  
    Browse File »
  • Refs : #10871
    e2e5b717
    Utkarsh Singh authored
    2017-01-17 12:32:29 +0530  
    Browse File »

16 Jan, 2017
3 commits
  • Against Merge Request : #274
    9e7890ba
    Amrita Vishnoi authored
    2017-01-16 16:34:24 +0530  
    Browse File »
  • against merge request: #269
    5fda215d
    Amrita Vishnoi authored
    2017-01-16 15:20:44 +0530  
    Browse File »
  • Merged code against closed request ID: #258
    fa8f0546
    Amrita Vishnoi authored
    2017-01-16 11:39:20 +0530  
    Browse File »

12 Jan, 2017
8 commits
  • 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 File »
  • login and dynamic modules
    8845454a
    Nikita Kulshreshtha authored
    2017-01-12 15:17:06 +0530  
    Browse File »
  • did center aligned after polygon removal
    6d6934c4
    Amrita Vishnoi authored
    2017-01-12 12:55:38 +0530  
    Browse File »
  • Merge branch 'PolygonIconRemoved' into Develop
    bb16d7a9
    Amrita Vishnoi authored
    2017-01-12 12:44:01 +0530  
    Browse File »
  • this is for erase button and brush icon must be black
    3e7c3726
    Mukul Rajput authored
    2017-01-12 12:35:17 +0530  
    Browse File »
  • 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 File »
  • commit
    5b0a7f1a
    unknown authored
    2017-01-12 11:57:50 +0530  
    Browse File »
  • 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 File »

11 Jan, 2017
4 commits
  • Commit changes for the Issue Ref : Bug #12240:Annotation Toolbar > Color Mismatch.
    d4459de8
    unknown authored
    2017-01-11 13:32:46 +0530  
    Browse File »
  • 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 File »
  • working code for login and dynamic modules. ...
    7be3ebe4
    only those modules are not showing which are not merged.
    when click on DA module all moduels get seleted. need to reslove
    Nikita Kulshreshtha authored
    2017-01-11 13:25:40 +0530  
    Browse File »
  • added log4net
    d9f2e4ca
    Nikita Kulshreshtha authored
    2017-01-11 11:02:56 +0530  
    Browse File »

09 Jan, 2017
3 commits
  • Removed comments
    bbee54b3
    Utkarsh Singh authored
    2017-01-09 16:16:14 +0530  
    Browse File »
  • PolygonIconRemoved
    5f0eda58
    unknown authored
    2017-01-09 15:50:23 +0530  
    Browse File »
  • Refs: #10207 (Export Image implementation)
    ff6b10c7
    Utkarsh Singh authored
    2017-01-09 15:23:57 +0530  
    Browse File »

06 Jan, 2017
8 commits
  • Merge branch 'brushdecrement' into Develop
    fee17fee
    Amrita Vishnoi authored
    2017-01-06 18:21:43 +0530  
    Browse File »
  • Fixed Line issue in IE
    6f8c4019
    Amrita Vishnoi authored
    2017-01-06 17:34:35 +0530  
    Browse File »
  • fixed issue, introduced by merged changes from merge request
    1aa20f6b
    Amrita Vishnoi authored
    2017-01-06 16:43:45 +0530  
    Browse File »
  • Fixed after conflict resolve
    538312a1
    Amrita Vishnoi authored
    2017-01-06 16:03:25 +0530  
    Browse File »
  • Renamed the function names
    5c37396d
    Amrita Vishnoi authored
    2017-01-06 15:52:11 +0530  
    Browse File »
  • merged Bugs_v15
    cee03d59
    Nikita Kulshreshtha authored
    2017-01-06 15:18:05 +0530  
    Browse File »
  • Merge branch 'Bugs_v12' into Develop
    c538cb1a
    Nikita Kulshreshtha authored
    2017-01-06 13:10:49 +0530  
    Browse File »
  • merged Bugs_v10 into develop
    05cbcd96
    Nikita Kulshreshtha authored
    2017-01-06 12:54:45 +0530  
    Browse File »

29 Dec, 2016
2 commits
  • commit changes for Issue Ref: #7747:Annotation: Texture is not working
    c8290476
    unknown authored
    2016-12-29 12:31:44 +0530  
    Browse File »
  • Commit changes for Issue Ref: #12221:DA > Annotation Toolbar > If Outline option… ...
    90ed96ca
    … is unchecked, and user draw the shapes. Outline is display on the shapes.
    unknown authored
    2016-12-29 12:15:57 +0530  
    Browse File »

27 Dec, 2016
1 commit
  • this is decrement brush size
    c9ec5bc1
    Mukul Rajput authored
    2016-12-27 19:36:43 +0530  
    Browse File »

23 Dec, 2016
1 commit
  • login and other html are on same page. used ng-show. ...
    67d9dc40
    error in modules showing.
    Nikita Kulshreshtha authored
    2016-12-23 17:38:00 +0530  
    Browse File »

22 Dec, 2016
2 commits
  • modules prop is not getting bind after login success
    962f3335
    Nikita Kulshreshtha authored
    2016-12-22 18:30:11 +0530  
    Browse File »
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Bugs_v13 ...
    ab08335b
    # Conflicts:
    #	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
    #	400-SOURCECODE/AIAHTML5.Web/index.html
    unknown authored
    2016-12-22 11:55:57 +0530  
    Browse File »

21 Dec, 2016
1 commit
  • this is for ie outline with color and size annotation image
    35695cde
    Mukul Rajput authored
    2016-12-21 15:54:13 +0530  
    Browse File »

19 Dec, 2016
1 commit
  • Commit changes for Issue Ref: 11545 : Annotation Toolbar > "Brush Size" identity is missing.
    0b276ebf
    unknown authored
    2016-12-19 11:55:57 +0530  
    Browse File »

15 Dec, 2016
1 commit
  • Merge branch 'paintinputboxnan' into Develop
    2ce7857f
    Nikita Kulshreshtha authored
    2016-12-15 16:53:47 +0530  
    Browse File »