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
  • app
  • controllers
06 Jan, 2017
5 commits
  • Fixed after conflict resolve
    538312a1
    Amrita Vishnoi authored
    2017-01-06 16:03:25 +0530  
    Browse Dir »
  • Renamed the function names
    5c37396d
    Amrita Vishnoi authored
    2017-01-06 15:52:11 +0530  
    Browse Dir »
  • merged Bugs_v15
    cee03d59
    Nikita Kulshreshtha authored
    2017-01-06 15:18:05 +0530  
    Browse Dir »
  • Merge branch 'CICANewBugs' into Develop
    e16a659d
    Amrita Vishnoi authored
    2017-01-06 13:23:51 +0530  
    Browse Dir »
  • merged Bugs_v10 into develop
    05cbcd96
    Nikita Kulshreshtha authored
    2017-01-06 12:54:45 +0530  
    Browse Dir »

05 Jan, 2017
1 commit
  • Bug #12388:Clinical Illustration > Double list are showing in List View in the below mention steps. ...
    6a8566fc
    Bug #12395:Clinical Animation > Double list are showing in List View in the below mention steps.
    Mitali Srivastava authored
    2017-01-05 18:47:56 +0530  
    Browse Dir »

29 Dec, 2016
1 commit
  • 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 Dir »

22 Dec, 2016
1 commit
  • 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 Dir »

16 Dec, 2016
5 commits
  • Merge branch 'AnnotationIssueInTB' into Develop
    414afdff
    Amrita Vishnoi authored
    2016-12-16 17:52:47 +0530  
    Browse Dir »
  • Merge branch 'zIndexIssueinModestyTB' into Develop
    e8674218
    Amrita Vishnoi authored
    2016-12-16 17:43:36 +0530  
    Browse Dir »
  • Merge branch 'Bug#10598' into Develop
    9339a58c
    Amrita Vishnoi authored
    2016-12-16 17:26:56 +0530  
    Browse Dir »
  • Merge branch 'DAOpenViewIssue' into Develop
    b8cff37e
    Amrita Vishnoi authored
    2016-12-16 17:15:02 +0530  
    Browse Dir »
  • Merge branch 'Erasetoolfunctionality' into Develop
    7cca942d
    Nikita Kulshreshtha authored
    2016-12-16 12:07:09 +0530  
    Browse Dir »

15 Dec, 2016
3 commits
  • Merge branch 'CanvasDivScrollPositionIssue' into Develop
    435997b1
    Nikita Kulshreshtha authored
    2016-12-15 16:38:48 +0530  
    Browse Dir »
  • Merge branch '#11132' into Develop
    d0ebde2a
    Nikita Kulshreshtha authored
    2016-12-15 16:33:27 +0530  
    Browse Dir »
  • Merge branch 'PinClickedIssueResolved' into Develop
    9a56818d
    Nikita Kulshreshtha authored
    2016-12-15 16:30:30 +0530  
    Browse Dir »

13 Dec, 2016
6 commits
  • Annotation issue is fixed in TB. ...
    7b9b01fd
    Now Modesty is implemented and also the annotations are correct on each place.
    Nikita Kulshreshtha authored
    2016-12-13 16:44:45 +0530  
    Browse Dir »
  • Annotations are working now in both mirror and non mirrored images in TBox. ...
    267f8bdd
    Need to implement annotations code on Modesty canva sin TB.
    Nikita Kulshreshtha authored
    2016-12-13 14:35:43 +0530  
    Browse Dir »
  • Scroll Position Defect
    213c1e2b
    unknown authored
    2016-12-13 12:46:05 +0530  
    Browse Dir »
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Bugs_v10 ...
    868ce8d7
    # Conflicts:
    #	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
    #	400-SOURCECODE/AIAHTML5.Web/index.html
    unknown authored
    2016-12-13 12:33:30 +0530  
    Browse Dir »
  • Commit changes for mukul impact issue . Removed utkarsh's code
    48f33248
    unknown authored
    2016-12-13 12:15:12 +0530  
    Browse Dir »
  • Refactor Code
    61c754de
    unknown authored
    2016-12-13 12:08:16 +0530  
    Browse Dir »

12 Dec, 2016
6 commits
  • need to see the modesty in mirror transparency region
    ce06658e
    Nikita Kulshreshtha authored
    2016-12-12 23:38:06 +0530  
    Browse Dir »
  • this is for erase functionality
    966a7a2c
    Mukul Rajput authored
    2016-12-12 19:38:45 +0530  
    Browse Dir »
  • Removed Scroll Code
    3a6e349a
    unknown authored
    2016-12-12 17:13:08 +0530  
    Browse Dir »
  • changed the zIndex of modestyTransparency canvas because this was the same as used for annotation.
    4bd51527
    Nikita Kulshreshtha authored
    2016-12-12 16:13:23 +0530  
    Browse Dir »
  • issue is fixed
    f224f941
    Nikita Kulshreshtha authored
    2016-12-12 12:54:00 +0530  
    Browse Dir »
  • DA > Annotation search from Search List is not highlight in the List manager.
    3d5dcdc4
    unknown authored
    2016-12-12 10:50:55 +0530  
    Browse Dir »

09 Dec, 2016
2 commits
  • open view issue is fixed. Need to check on server.
    e554bd8b
    Nikita Kulshreshtha authored
    2016-12-09 12:08:50 +0530  
    Browse Dir »
  • This commit contains change for Utkarash and Impact issue caused from mukul 's merge
    f0c0a72e
    unknown authored
    2016-12-09 11:56:56 +0530  
    Browse Dir »

07 Dec, 2016
6 commits
  • DA > Annotation > When Pin is selected and click on any where on the screen only… ...
    1423cfe2
    … head of the pin is displays.
    unknown authored
    2016-12-07 17:53:13 +0530  
    Browse Dir »
  • modesty in TB implementation is completed. Need to see the zIndex for resizing b… ...
    14c7b410
    …ecause TransModesty zIndex is greated then resizable so unable to rersize but if we lower the zIndex it is not visible properly
    Nikita Kulshreshtha authored
    2016-12-07 17:34:24 +0530  
    Browse Dir »
  • modesty image is set in all cases for both gender. ...
    a7f89312
    Need o work on transparency and z index for resizable
    Nikita Kulshreshtha authored
    2016-12-07 15:42:53 +0530  
    Browse Dir »
  • Commit Changes
    047c53c9
    unknown authored
    2016-12-07 11:57:07 +0530  
    Browse Dir »
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into 8137
    59814d20
    unknown authored
    2016-12-07 11:54:08 +0530  
    Browse Dir »
  • List in the List Manager is not select when press "Enter" button from the Keyboard.
    3ad07e0b
    unknown authored
    2016-12-07 11:51:36 +0530  
    Browse Dir »

06 Dec, 2016
3 commits
  • modesty image is set in normal case and on resize on right place but in Female 2… ...
    472ca016
    …nd image is not visible.
    Also need to work on change transparecy
    Nikita Kulshreshtha authored
    2016-12-06 21:26:40 +0530  
    Browse Dir »
  • Merge branch 'CACI_8680' into Develop
    dc9f600d
    Nikita Kulshreshtha authored
    2016-12-06 14:04:00 +0530  
    Browse Dir »
  • DA > Screen gets scrolled towards right if we minimize and maximize the window
    6436ddf2
    unknown authored
    2016-12-06 12:23:13 +0530  
    Browse Dir »

05 Dec, 2016
1 commit
  • Merge branch 'Bug#7243' into Develop
    2746e965
    Amrita Vishnoi authored
    2016-12-05 17:38:54 +0530  
    Browse Dir »