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
08 Sep, 2016
13 commits
  • Merge branch 'HighlightFunctionsBugsMerge' into Develop
    15ca083f
    Amrita Vishnoi authored
    2016-09-08 16:45:52 +0530  
    Browse Code »
  • Refs: #6740 ...
    ca97b013
    Dissectible Anatomy > Both the highlighted functions can't be active at the same time
    Amrita Vishnoi authored
    2016-09-08 16:37:08 +0530  
    Browse Code »
  • Merge branch 'temp' into Develop
    5f257280
    Amrita Vishnoi authored
    2016-09-08 15:20:55 +0530  
    Browse Code »
  • Removed unwanted files which had committed earlier
    0542c9e4
    Amrita Vishnoi authored
    2016-09-08 15:16:01 +0530  
    Browse Code »
  • Merge branch 'FixesAfterCodeReview' into Develop
    7c850638
    Amrita Vishnoi authored
    2016-09-08 15:02:09 +0530  
    Browse Code »
  • COMMITED .CSPROJ FILE
    e3504454
    Mukul Rajput authored
    2016-09-08 14:27:03 +0530  
    Browse Code »
  • Made changes reported in review.
    6b49383e
    Mukul Rajput authored
    2016-09-08 14:25:06 +0530  
    Browse Code »
  • #6740:Dissectible Anatomy > Both the highlighted functions can't be active at the same time ...
    453122b9
    #7424:Highlight button should not be active when user clicks on Extract button
    #7428:Only Highlight should be active
    #7429:Incorrect state of the button
    Mitali Srivastava authored
    2016-09-08 14:05:28 +0530  
    Browse Code »
  • Merge branch '7398IssueFix' into Develop
    1310aae7
    Amrita Vishnoi authored
    2016-09-08 14:05:03 +0530  
    Browse Code »
  • Refs: #7398 ...
    d2de8059
    Incorrect button gets active on search
    Amrita Vishnoi authored
    2016-09-08 13:58:17 +0530  
    Browse Code »
  • Merge branch 'LayerNoBug6593' into Develop
    521228f3
    Amrita Vishnoi authored
    2016-09-08 11:36:43 +0530  
    Browse Code »
  • Merge branch 'HighLightOptions' into Develop
    8e20363f
    Amrita Vishnoi authored
    2016-09-08 10:18:19 +0530  
    Browse Code »
  • AIA monthly report
    786293c2
    Amrita Vishnoi authored
    2016-09-08 10:04:08 +0530  
    Browse Code »

07 Sep, 2016
7 commits
  • Bug #6593:Dissectible Anatomy > Layer number should be visible
    e417a5fd
    Mitali Srivastava authored
    2016-09-07 19:48:02 +0530  
    Browse Code »
  • #7400: In settings, skin-tone images are disppearing everytime on selction of different skin tones.
    6763a8eb
    Mitali Srivastava authored
    2016-09-07 19:39:59 +0530  
    Browse Code »
  • #7244,#7240,#6731
    2d231089
    Mukul Rajput authored
    2016-09-07 18:04:59 +0530  
    Browse Code »
  • 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 Code »
  • Refs: #7226 ...
    6bc0da41
    Highlight Options > Highlight goes away if we change layers
    Amrita Vishnoi authored
    2016-09-07 14:46:23 +0530  
    Browse Code »
  • tooltips
    88cc8796
    Mukul Rajput authored
    2016-09-07 14:07:52 +0530  
    Browse Code »
  • Renamed function name
    d460ebff
    Amrita Vishnoi authored
    2016-09-07 13:16:05 +0530  
    Browse Code »

06 Sep, 2016
1 commit
  • Merge branch 'SettingAndSearchFix' into Develop
    25b9cb00
    Amrita Vishnoi authored
    2016-09-06 18:31:59 +0530  
    Browse Code »

02 Sep, 2016
3 commits
  • UserStory:2923 and bugs 6983 and 6980 and modifyxml utility added
    bea3d6cd
    Mitali Srivastava authored
    2016-09-02 18:43:08 +0530  
    Browse Code »
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into updatededitstyle ...
    c51417b5
    Conflicts:
    	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
    	400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
    Mukul Rajput authored
    2016-09-02 12:45:43 +0530  
    Browse Code »
  • this is work of edit style popup checkbox
    081a46c4
    Mukul Rajput authored
    2016-09-02 12:39:13 +0530  
    Browse Code »

01 Sep, 2016
12 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 Code »
  • One fix related to navigator man settings fix
    bad813cc
    Amrita Vishnoi authored
    2016-09-01 14:07:57 +0530  
    Browse Code »
  • changes for checkbox in edit style modal
    a19d5ae5
    Mukul Rajput authored
    2016-09-01 13:44:17 +0530  
    Browse Code »
  • DA updated and validated jsons. ...
    629d1743
    Homecontroller fix for setting after merge with branch DisableATBarOnPopUp
    Mitali Srivastava authored
    2016-09-01 13:33:56 +0530  
    Browse Code »
  • deleted home.orig
    2d7dd3e2
    Mukul Rajput authored
    2016-09-01 13:17:37 +0530  
    Browse Code »
  • Files Merged with branch DisableATBarOnPopUp
    c78cfb13
    Mukul Rajput authored
    2016-09-01 13:15:12 +0530  
    Browse Code »
  • AnnotationToolBar missing code merged in this.
    23a2156a
    Amrita Vishnoi authored
    2016-09-01 12:56:32 +0530  
    Browse Code »
  • this is edit style model checkbox
    22d7ec8a
    Mukul Rajput authored
    2016-09-01 12:56:20 +0530  
    Browse Code »
  • 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 Code »
  • After cherry pick of 3df42770ae i.e. fix for Bug 6983: Modesty change doesn't r… ...
    ec6ce39f
    …eflect on Navigator for the first time
    6980: Image doesn't update in Navigator
    Amrita Vishnoi authored
    2016-09-01 12:15:20 +0530  
    Browse Code »
  • commit after taking file from DisableATBarOnPopUp branch
    eb5fd6b2
    Amrita Vishnoi authored
    2016-09-01 11:12:44 +0530  
    Browse Code »
  • unwanted commit
    3b6fce4d
    Amrita Vishnoi authored
    2016-09-01 11:01:18 +0530  
    Browse Code »

31 Aug, 2016
4 commits
  • Merged EditShape_Modal_Changes branch and modified after code review
    5fc7c2b4
    Amrita Vishnoi authored
    2016-08-31 17:08:33 +0530  
    Browse Code »
  • merged with blackIssueInTb
    784d99f9
    Mitali Srivastava authored
    2016-08-31 16:44:24 +0530  
    Browse Code »
  • Merge branch 'blackIssueInTb' of http://52.6.196.163/ADAM/AIAHTML5 into Settingsfix
    9ac40e25
    Mitali Srivastava authored
    2016-08-31 16:28:11 +0530  
    Browse Code »
  • Merge branch 'blackIssueInTb' of http://52.6.196.163/ADAM/AIAHTML5 into blackIssueInTbMerge
    1e788ec3
    Amrita Vishnoi authored
    2016-08-31 16:25:39 +0530  
    Browse Code »