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
23 Sep, 2016
1 commit
  • test
    e32b8918
    Amit Kumar authored
    2016-09-23 15:03:43 +0530  
    Browse File »

20 Sep, 2016
2 commits
  • this is for range of brush and ci list view table
    55fd4406
    Mukul Rajput authored
    2016-09-20 13:11:14 +0530  
    Browse File »
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into tablecibrush ...
    3dcad88d
    Conflicts:
    	400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
    Mukul Rajput authored
    2016-09-20 12:47:25 +0530  
    Browse File »

16 Sep, 2016
2 commits
  • Merge branch 'Ipadissue' into Develop
    1f740ed6
    Nikita Kulshreshtha authored
    2016-09-16 15:42:32 +0530  
    Browse File »
  • remove alert
    ae5a414b
    Mitali Srivastava authored
    2016-09-16 15:32:57 +0530  
    Browse File »

15 Sep, 2016
4 commits
  • #7705
    1dd907aa
    Mukul Rajput authored
    2016-09-15 18:57:58 +0530  
    Browse File »
  • Merge branch 'bugs' into Develop
    7ee514de
    Nikita Kulshreshtha authored
    2016-09-15 18:13:37 +0530  
    Browse File »
  • Bug #7404:Application is not running on ipad version 7.0.4
    848bfec7
    Mitali Srivastava authored
    2016-09-15 15:55:41 +0530  
    Browse File »
  • this is for CI list view table
    c58c33d2
    Mukul Rajput authored
    2016-09-15 12:05:09 +0530  
    Browse File »

14 Sep, 2016
2 commits
  • made changes of base uri
    73f55e73
    Amrita Vishnoi authored
    2016-09-14 18:20:31 +0530  
    Browse File »
  • Commit changes for Issue ...
    29c622f5
    Issue #7184:User is unable to select any annotation from an image
    unknown authored
    2016-09-14 17:26:33 +0530  
    Browse File »

13 Sep, 2016
3 commits
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into bugs ...
    768e53e6
    # Conflicts:
    #	400-SOURCECODE/AIAHTML5.Web/index.html
    unknown authored
    2016-09-13 12:37:31 +0530  
    Browse File »
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into LabExercize ...
    a95da31d
    Conflicts:
    	400-SOURCECODE/AIAHTML5.Web/Web.config
    	400-SOURCECODE/AIAHTML5.Web/index.html
    Amit Kumar authored
    2016-09-13 12:11:31 +0530  
    Browse File »
  • commit changes for Issue : Ref ...
    4ca5af23
    1) #7414:Settings > User should be able to access Annotation Toolbar from Settings too
    2)#7178 : Tool Tip is not reflecting for the mode "Identify" and the "Draw" and the "Tool" in the Annotation toolbar
    unknown authored
    2016-09-13 12:07:15 +0530  
    Browse File »

12 Sep, 2016
1 commit
  • tem changes
    40f57f51
    Amrita Vishnoi authored
    2016-09-12 13:49:20 +0530  
    Browse File »

09 Sep, 2016
3 commits
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Annotation_Pencil ...
    5c7bfab2
    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-09-09 16:18:42 +0530  
    Browse File »
  • Implemented Text Area Edit, Identity and draw functionality.
    b402dbb3
    unknown authored
    2016-09-09 16:04:40 +0530  
    Browse File »
  • Commit changes for Ref: ...
    005e31fb
    Issue#7547 :Once the edit shape style popup is opened if user clicks and drag popup gets displaced from its original position.
    unknown authored
    2016-09-09 15:37:15 +0530  
    Browse File »

08 Sep, 2016
3 commits
  • Modified base uri as per server
    cfac7f46
    Amrita Vishnoi authored
    2016-09-08 17:03:47 +0530  
    Browse File »
  • 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
5 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 »
  • Merge branch 'DisableATBarOnPopUp' of http://52.6.196.163/ADAM/AIAHTML5 into Annotation_Pencil
    e5fea54e
    unknown authored
    2016-09-01 12:03:25 +0530  
    Browse File »
  • Commit changes for: ...
    f4b38866
    1)Edit TextArea
    2)Identify and draw option
    3)Increase pencil width
    unknown authored
    2016-09-01 12:01:58 +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
4 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 LabExercize ...
    814e77d2
    Conflicts:
    	400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
    	400-SOURCECODE/AIAHTML5.Web/Web.config
    	400-SOURCECODE/AIAHTML5.Web/index.html
    Amit Kumar authored
    2016-08-26 11:12:06 +0530  
    Browse File »
  • Lab Exercise module - in progess
    63248dfc
    Amit Kumar authored
    2016-08-26 11:07:48 +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
1 commit
  • 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 »