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
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 Code »
  • 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 Code »

24 Aug, 2016
10 commits
  • commit changes after code merge with latest branch GotoNavMan
    69cbf2ba
    unknown authored
    2016-08-24 18:06:38 +0530  
    Browse Code »
  • Merge branch 'GotoNavMan' of http://52.6.196.163/ADAM/AIAHTML5 into Annotation_Eraser
    3a5851c4
    unknown authored
    2016-08-24 18:02:14 +0530  
    Browse Code »
  • added images for texture
    71e75d87
    unknown authored
    2016-08-24 17:33:37 +0530  
    Browse Code »
  • Commit Changes For Erase Functionality and Canvas Opacity
    44cadc82
    unknown authored
    2016-08-24 17:29:54 +0530  
    Browse Code »
  • Male Medial fix
    950ab34e
    Amrita Vishnoi authored
    2016-08-24 16:52:48 +0530  
    Browse Code »
  • Null check on get image source
    5526609f
    Amrita Vishnoi authored
    2016-08-24 16:36:03 +0530  
    Browse Code »
  • medial arm was not loading in other than white skintone beacuse the data for bod… ...
    2145f310
    …yregion 1 was only for W skintone in json. Fixed now
    Nikita Kulshreshtha authored
    2016-08-24 16:02:30 +0530  
    Browse Code »
  • medial arm loading issue on settings change is fixed.
    a96e4e23
    Nikita Kulshreshtha authored
    2016-08-24 15:29:08 +0530  
    Browse Code »
  • issue in female view loading. this is because a randon text (highlightAfterExtra… ...
    748a5dd8
    …ctIssue)  is placed in between code after merging. after deleting this he issue is fixed.
    Nikita Kulshreshtha authored
    2016-08-24 11:28:37 +0530  
    Browse Code »
  • Merge branch 'ButtonFix' of http://52.6.196.163/ADAM/AIAHTML5 into GotoNavMan
    d98eaf17
    Amrita Vishnoi authored
    2016-08-24 10:02:39 +0530  
    Browse Code »

23 Aug, 2016
20 commits
  • Fixed to go-to and navigator button and also included images related with medial view.
    0482df3b
    Mitali Srivastava authored
    2016-08-23 19:51:52 +0530  
    Browse Code »
  • Merged code for fix ...
    5d0ea69a
    In normal mode click anywhere then extract, now highlight, in this case body gets gray but no highlight on selected portion.
    Amrita Vishnoi authored
    2016-08-23 17:57:48 +0530  
    Browse Code »
  • refs: #6951. ...
    535df5db
    handled asynchronous call to fix this issue
    Nikita Kulshreshtha authored
    2016-08-23 17:08:25 +0530  
    Browse Code »
  • Merge branch 'SearchNavButton' of http://52.6.196.163/ADAM/AIAHTML5 into ButtonFix ...
    f1194d9b
    Conflicts:
    	400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
    Mitali Srivastava authored
    2016-08-23 17:05:24 +0530  
    Browse Code »
  • Added images related with Medial view
    f89bc963
    Mitali Srivastava authored
    2016-08-23 16:53:47 +0530  
    Browse Code »
  • 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 Code »
  • Need fix
    9732e499
    Amrita Vishnoi authored
    2016-08-23 16:22:52 +0530  
    Browse Code »
  • commit changes after merge of ExtarctBlackIssueInLArm
    d4b77b35
    unknown authored
    2016-08-23 15:49:41 +0530  
    Browse Code »
  • merged Annotation tool bar code.
    90e94162
    Amrita Vishnoi authored
    2016-08-23 14:17:56 +0530  
    Browse Code »
  • Merge branch 'AnnotationPopupActiveButton' of http://52.6.196.163/ADAM/AIAHTML5 into ATMerge
    2751a4bc
    Amrita Vishnoi authored
    2016-08-23 14:04:34 +0530  
    Browse Code »
  • commit changes for freestyle paint
    169774c9
    unknown authored
    2016-08-23 13:33:27 +0530  
    Browse Code »
  • Commit changes after merging code with ExtarctBlackIssueInLArm
    2a0e00b6
    unknown authored
    2016-08-23 13:20:32 +0530  
    Browse Code »
  • Merge branch 'searchsettingBugFix' of http://52.6.196.163/ADAM/AIAHTML5 into HighLightIssues
    8f196ca9
    Amrita Vishnoi authored
    2016-08-23 13:01:51 +0530  
    Browse Code »
  • added new images in sln
    374ba191
    Amrita Vishnoi authored
    2016-08-23 12:48:57 +0530  
    Browse Code »
  • Merge branch 'highlightIssueOnLayerChange' of http://52.6.196.163/ADAM/AIAHTML5 into HighLightIssues
    eeb05264
    Amrita Vishnoi authored
    2016-08-23 12:43:27 +0530  
    Browse Code »
  • Modify button for search and navigator man as per new prototype
    3443dd42
    Amrita Vishnoi authored
    2016-08-23 12:40:54 +0530  
    Browse Code »
  • 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 Code »
  • Commit changes for TextArea and Free style drawing.
    bd3b8d2b
    unknown authored
    2016-08-23 12:01:13 +0530  
    Browse Code »
  • highlight issue on layer change is fixed.
    c0f761ff
    Nikita Kulshreshtha authored
    2016-08-23 11:56:03 +0530  
    Browse Code »
  • Bug #5775:Product code is displaying while clicking on go button. ...
    005bac88
    Bug #6656: Disectibel Anatomy > Modesty setting doesn't work correctly
    Bug #6697: Dissectible Anatomy > Gender doesn't change after changing the Skin Tone
    Bug #6591: Dissectible Anatomy > Correct the height of the search drop down box
    Mitali Srivastava authored
    2016-08-23 11:47:45 +0530  
    Browse Code »

22 Aug, 2016
8 commits
  • case: ...
    8ee1ce16
    Highlight on 0th layer> click anywhere to highlight> extract> again highlight and then layer change. It shows changed layer Body but in a while it comes back to the 0th layer view with previously highlighted portion.
    
    Fix: getting grayiamge data not from updated gray data fro layer change. this partially resolves issue. but the highloghtbody is called more than once. need to see.
    Nikita Kulshreshtha authored
    2016-08-22 18:29:42 +0530  
    Browse Code »
  • merge commit in Lateral arm fix
    914a4ac8
    Amrita Vishnoi authored
    2016-08-22 17:25:30 +0530  
    Browse Code »
  • removed commented code
    d712990c
    Amrita Vishnoi authored
    2016-08-22 17:16:01 +0530  
    Browse Code »
  • refs: #6856. lateral arm black issue fixed
    9de5833e
    Nikita Kulshreshtha authored
    2016-08-22 17:06:37 +0530  
    Browse Code »
  • when user select something and extract in Lateral arm, the transparenct area of … ...
    50cc6107
    …image of hand became black. This is fixed now.
    Nikita Kulshreshtha authored
    2016-08-22 17:04:36 +0530  
    Browse Code »
  • introduced new folder for annotation toolbar
    48c966dd
    Nikita Kulshreshtha authored
    2016-08-22 16:26:33 +0530  
    Browse Code »
  • prototype for annotation toolbar
    0c71d61f
    Nikita Kulshreshtha authored
    2016-08-22 16:24:28 +0530  
    Browse Code »
  • Modification in 9 body region count check based on body view
    0dcfe662
    Amrita Vishnoi authored
    2016-08-22 15:24:15 +0530  
    Browse Code »