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
08 Sep, 2016
2 commits
  • Merge branch 'ListManagerWorkingWIthUatCode' into Develop
    7fd1db7a
    Amrita Vishnoi authored
    2016-09-08 16:57:42 +0530  
    Browse File »
  • Made changes reported in review.
    6b49383e
    Mukul Rajput authored
    2016-09-08 14:25:06 +0530  
    Browse File »

07 Sep, 2016
2 commits
  • #7244,#7240,#6731
    2d231089
    Mukul Rajput authored
    2016-09-07 18:04:59 +0530  
    Browse File »
  • commit after merge
    04a17755
    Nikita Kulshreshtha authored
    2016-09-07 15:10:11 +0530  
    Browse File »

02 Sep, 2016
1 commit
  • this is work of edit style popup checkbox
    081a46c4
    Mukul Rajput authored
    2016-09-02 12:39:13 +0530  
    Browse File »

01 Sep, 2016
3 commits
  • 1. bug 7245-list manager close on other button. ...
    a1525289
    2. code of extract after list manger sleection.
    3. crash issue logs and trial code
    Nikita Kulshreshtha authored
    2016-09-01 18:27:44 +0530  
    Browse File »
  • changes for checkbox in edit style modal
    a19d5ae5
    Mukul Rajput authored
    2016-09-01 13:44:17 +0530  
    Browse File »
  • this is edit style model checkbox
    22d7ec8a
    Mukul Rajput authored
    2016-09-01 12:56:20 +0530  
    Browse File »

31 Aug, 2016
2 commits
  • Merged EditShape_Modal_Changes branch and modified after code review
    5fc7c2b4
    Amrita Vishnoi authored
    2016-08-31 17:08:33 +0530  
    Browse File »
  • Edit Shape Style Pop-up Background Disabled and dragging issue resolved
    4878814b
    unknown authored
    2016-08-31 12:05:38 +0530  
    Browse File »

29 Aug, 2016
3 commits
  • update controller file
    c9fa6efc
    Mukul Rajput authored
    2016-08-29 13:36:17 +0530  
    Browse File »
  • new edit style function
    4e2f1fe9
    Mukul Rajput authored
    2016-08-29 12:52:45 +0530  
    Browse File »
  • merge new files
    384fed29
    Mukul Rajput authored
    2016-08-29 12:35:38 +0530  
    Browse File »

26 Aug, 2016
2 commits
  • Commit changes for Fill option and Outline option (color and size)
    2d9fb1ad
    unknown authored
    2016-08-26 18:03:41 +0530  
    Browse File »
  • Merge branch 'Annotation_Eraser' of http://52.6.196.163/ADAM/AIAHTML5 into AnnotationToolBar_latest
    ac796d01
    unknown authored
    2016-08-26 10:53:45 +0530  
    Browse File »

24 Aug, 2016
1 commit
  • Commit Changes For Erase Functionality and Canvas Opacity
    44cadc82
    unknown authored
    2016-08-24 17:29:54 +0530  
    Browse File »

23 Aug, 2016
4 commits
  • Merge branch 'ATMerge' of http://52.6.196.163/ADAM/AIAHTML5 into AnnotationToolBar_latest
    09b35967
    unknown authored
    2016-08-23 16:25:53 +0530  
    Browse File »
  • commit changes after merge of ExtarctBlackIssueInLArm
    d4b77b35
    unknown authored
    2016-08-23 15:49:41 +0530  
    Browse File »
  • Merge branch 'ExtarctBlackIssueInLArm' of http://52.6.196.163/ADAM/AIAHTML5 into… ...
    ca2a151b
    … AnnotationPopupActiveButton
    
    Conflicts:
    	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
    	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
    	400-SOURCECODE/AIAHTML5.Web/index.html
    unknown authored
    2016-08-23 12:37:05 +0530  
    Browse File »
  • Commit changes for TextArea and Free style drawing.
    bd3b8d2b
    unknown authored
    2016-08-23 12:01:13 +0530  
    Browse File »

22 Aug, 2016
2 commits
  • commit after LArmBlackIssue merge
    e0bbc12f
    Mukul Rajput authored
    2016-08-22 15:17:10 +0530  
    Browse File »
  • commit
    3057b35f
    Mukul Rajput authored
    2016-08-22 15:12:39 +0530  
    Browse File »

18 Aug, 2016
2 commits
  • There was an issue of holding previously extracted data in next without ctrl click, now it is fixed.
    0fe75d86
    Amrita Vishnoi authored
    2016-08-18 17:08:29 +0530  
    Browse File »
  • settings code is merged but issue in OK functionality and also sometimes in Apply
    f2d80735
    Nikita Kulshreshtha authored
    2016-08-18 11:58:55 +0530  
    Browse File »

17 Aug, 2016
2 commits
  • annotation toolbar code merged
    22d52173
    Nikita Kulshreshtha authored
    2016-08-17 14:04:05 +0530  
    Browse File »
  • on close transparency box annotations are also hidden.
    31e0d145
    Nikita Kulshreshtha authored
    2016-08-17 12:31:48 +0530  
    Browse File »

16 Aug, 2016
4 commits
  • Merge branch 'AnnotationToolBar_DrawingOptions' of http://52.6.196.163/ADAM/AIAH… ...
    e26e5495
    …TML5 into AnnotationToolBar_latest
    
    # Conflicts:
    #	400-SOURCECODE/AIAHTML5.Web/Web.config
    #	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
    #	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
    #	400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
    #	400-SOURCECODE/AIAHTML5.Web/index.html
    unknown authored
    2016-08-16 16:43:03 +0530  
    Browse File »
  • Merge branch 'DefectFix' of http://52.6.196.163/ADAM/AIAHTML5 into AnnotationToolBar_latest ...
    3dc489d1
    # Conflicts:
    #	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
    #	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
    #	400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
    #	400-SOURCECODE/AIAHTML5.Web/index.html
    unknown authored
    2016-08-16 16:33:38 +0530  
    Browse File »
  • Commit changes for Annotation Toolbar: Jcanvas
    98e905fc
    unknown authored
    2016-08-16 14:36:58 +0530  
    Browse File »
  • Merged latest branch DefectFix -- all stable
    f8529676
    unknown authored
    2016-08-16 11:43:23 +0530  
    Browse File »

12 Aug, 2016
1 commit
  • Set to base url is AIA
    c72ae239
    Amrita Vishnoi authored
    2016-08-12 14:30:20 +0530  
    Browse File »

11 Aug, 2016
1 commit
  • Merge branch 'SettingsMerge' of http://52.6.196.163/ADAM/AIAHTML5 into SettingsMerge1
    e8e73854
    Nikita Kulshreshtha authored
    2016-08-11 13:14:52 +0530  
    Browse File »

10 Aug, 2016
2 commits
  • Refs: #5292 ...
    aa087298
    Setting is integrated
    Amrita Vishnoi authored
    2016-08-10 18:37:55 +0530  
    Browse File »
  • commit
    091e2de4
    Nikita Kulshreshtha authored
    2016-08-10 16:33:01 +0530  
    Browse File »

03 Aug, 2016
2 commits
  • Made close image path as per Amazone cloud server website.
    7fb8477c
    Amrita Vishnoi authored
    2016-08-03 13:07:04 +0530  
    Browse File »
  • removed worker process
    74791ddc
    Amrita Vishnoi authored
    2016-08-03 11:10:14 +0530  
    Browse File »

02 Aug, 2016
1 commit
  • fixed console errors and removed console logs
    06e0644a
    Nikita Kulshreshtha authored
    2016-08-02 12:05:10 +0530  
    Browse File »

01 Aug, 2016
1 commit
  • deleted unused code. ...
    82dfbe13
    added a flag of list manager close
    Nikita Kulshreshtha authored
    2016-08-01 11:35:55 +0530  
    Browse File »

29 Jul, 2016
2 commits
  • List Manager is merged
    885da7bc
    Amrita Vishnoi authored
    2016-07-29 17:30:27 +0530  
    Browse File »
  • commit changes for Annotation toolbar: ...
    46b3ee59
    DrawLine()
    unknown authored
    2016-07-29 13:32:31 +0530  
    Browse File »