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
  • DAController.js
08 Sep, 2016
1 commit
  • Made changes reported in review.
    6b49383e
    Mukul Rajput authored
    2016-09-08 14:25:06 +0530  
    Browse File »

07 Sep, 2016
3 commits
  • #7244,#7240,#6731
    2d231089
    Mukul Rajput authored
    2016-09-07 18:04:59 +0530  
    Browse File »
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into enableDisablebuttons
    337c7cb1
    Mukul Rajput authored
    2016-09-07 14:52:23 +0530  
    Browse File »
  • tooltips
    88cc8796
    Mukul Rajput authored
    2016-09-07 14:07:52 +0530  
    Browse File »

02 Sep, 2016
1 commit
  • UserStory:2923 and bugs 6983 and 6980 and modifyxml utility added
    bea3d6cd
    Mitali Srivastava authored
    2016-09-02 18:43:08 +0530  
    Browse File »

01 Sep, 2016
4 commits
  • Added revised json files and some code in DAController and Home controller
    2410adf7
    Amrita Vishnoi authored
    2016-09-01 15:36:00 +0530  
    Browse File »
  • Files Merged with branch DisableATBarOnPopUp
    c78cfb13
    Mukul Rajput authored
    2016-09-01 13:15:12 +0530  
    Browse File »
  • Merge branch 'DisableATBarOnPopUp' of http://52.6.196.163/ADAM/AIAHTML5 into Settingsfix ...
    e505ef83
    Conflicts:
    	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
    Mitali Srivastava authored
    2016-09-01 12:46:16 +0530  
    Browse File »
  • unwanted commit
    3b6fce4d
    Amrita Vishnoi authored
    2016-09-01 11:01:18 +0530  
    Browse File »

31 Aug, 2016
5 commits
  • Merged EditShape_Modal_Changes branch and modified after code review
    5fc7c2b4
    Amrita Vishnoi authored
    2016-08-31 17:08:33 +0530  
    Browse File »
  • merged with blackIssueInTb
    784d99f9
    Mitali Srivastava authored
    2016-08-31 16:44:24 +0530  
    Browse File »
  • Commit Changes For Pencil (Removed Scaling)
    a1d80475
    unknown authored
    2016-08-31 12:31:48 +0530  
    Browse File »
  • EditShape Modal Chnages and merged branch blackIssueInTb
    cc7a9a9d
    unknown authored
    2016-08-31 12:19:49 +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 »

30 Aug, 2016
2 commits
  • black issue in transparency box is fixed.
    06dca758
    Nikita Kulshreshtha authored
    2016-08-30 12:42:34 +0530  
    Browse File »
  • anootation toolbar edit shape style code. ...
    c935ddfc
    fixed duplicate entry in body system in list manager.
    Nikita Kulshreshtha authored
    2016-08-30 11:20:19 +0530  
    Browse File »

29 Aug, 2016
10 commits
  • removing annotation on zoom in/out. ...
    925fe9f5
    wrote some comments.
    Nikita Kulshreshtha authored
    2016-08-29 16:17:43 +0530  
    Browse File »
  • setting default value of layer change textinput ...
    5f00d818
    removing annotation on list manager selection.
    Nikita Kulshreshtha authored
    2016-08-29 16:15:05 +0530  
    Browse File »
  • after cahngeing layerNumber from scope to rootscope , there was issue in layerch… ...
    1381a9da
    …ange so reverted that zand fix skintone settings issue by setting layerNumber again on event which is called by skintonechane
    Nikita Kulshreshtha authored
    2016-08-29 15:44:04 +0530  
    Browse File »
  • resolved exception on view change and then close jspanel and open any view.
    c5a293c8
    Nikita Kulshreshtha authored
    2016-08-29 14:30:45 +0530  
    Browse File »
  • skintone setting issue is fixed. made layer number as rootscope variable.
    f1ec9255
    Nikita Kulshreshtha authored
    2016-08-29 14:06:35 +0530  
    Browse File »
  • Merge branch 'AnnotationToolBar_latestMerge1' of http://52.6.196.163/ADAM/AIAHTM… ...
    00c11b3b
    …L5 into updatededitstyle
    Mukul Rajput authored
    2016-08-29 13:12:04 +0530  
    Browse File »
  • new edit style function
    4e2f1fe9
    Mukul Rajput authored
    2016-08-29 12:52:45 +0530  
    Browse File »
  • commit after AnnotationToolBar_latest merge. this branch is having issue in color option OK button.
    b4e8bf4e
    Nikita Kulshreshtha authored
    2016-08-29 12:51:52 +0530  
    Browse File »
  • merge new files
    384fed29
    Mukul Rajput authored
    2016-08-29 12:35:38 +0530  
    Browse File »
  • commit afrer ATBar merge. ...
    75a614bb
    handled some null checks.
    Nikita Kulshreshtha authored
    2016-08-29 12:03:23 +0530  
    Browse File »

26 Aug, 2016
3 commits
  • Commit changes for Fill option and Outline option (color and size)
    2d9fb1ad
    unknown authored
    2016-08-26 18:03:41 +0530  
    Browse File »
  • fixed list manager and search issue.
    82d9c42f
    Nikita Kulshreshtha authored
    2016-08-26 16:50:32 +0530  
    Browse File »
  • Issue fixed. ...
    aa9dd83b
    duplicate entries in body system filter is removed.
    also terms are filtered as per body system selection.
    Nikita Kulshreshtha authored
    2016-08-26 12:57:56 +0530  
    Browse File »

24 Aug, 2016
7 commits
  • 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 File »
  • Commit Changes For Erase Functionality and Canvas Opacity
    44cadc82
    unknown authored
    2016-08-24 17:29:54 +0530  
    Browse File »
  • Male Medial fix
    950ab34e
    Amrita Vishnoi authored
    2016-08-24 16:52:48 +0530  
    Browse File »
  • Null check on get image source
    5526609f
    Amrita Vishnoi authored
    2016-08-24 16:36:03 +0530  
    Browse File »
  • 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 File »
  • medial arm loading issue on settings change is fixed.
    a96e4e23
    Nikita Kulshreshtha authored
    2016-08-24 15:29:08 +0530  
    Browse File »
  • 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 File »

23 Aug, 2016
4 commits
  • 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 File »
  • refs: #6951. ...
    535df5db
    handled asynchronous call to fix this issue
    Nikita Kulshreshtha authored
    2016-08-23 17:08:25 +0530  
    Browse File »
  • merged Annotation tool bar code.
    90e94162
    Amrita Vishnoi authored
    2016-08-23 14:17:56 +0530  
    Browse File »
  • 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 File »