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
09 Sep, 2016
1 commit
  • Refs: #7398
    84c06ae9
    Amrita Vishnoi authored
    2016-09-09 17:12:03 +0530  
    Browse Dir »

08 Sep, 2016
14 commits
  • Merge branch 'ExtractAfterSearchOrLM' of http://52.6.196.163/ADAM/AIAHTML5 into ExtractFixMerge ...
    ec7fba62
    # Conflicts:
    #	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
    Amrita Vishnoi authored
    2016-09-08 17:36:22 +0530  
    Browse Dir »
  • Modified base uri as per server
    cfac7f46
    Amrita Vishnoi authored
    2016-09-08 17:03:47 +0530  
    Browse Dir »
  • Merge branch 'ListManagerWorkingWIthUatCode' into Develop
    7fd1db7a
    Amrita Vishnoi authored
    2016-09-08 16:57:42 +0530  
    Browse Dir »
  • 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 Dir »
  • changed baseref from AIAHTML5 to AIA
    6be46160
    Nikita Kulshreshtha authored
    2016-09-08 15:27:33 +0530  
    Browse Dir »
  • Removed unwanted files which had committed earlier
    0542c9e4
    Amrita Vishnoi authored
    2016-09-08 15:16:01 +0530  
    Browse Dir »
  • Merge branch 'FixesAfterCodeReview' into Develop
    7c850638
    Amrita Vishnoi authored
    2016-09-08 15:02:09 +0530  
    Browse Dir »
  • COMMITED .CSPROJ FILE
    e3504454
    Mukul Rajput authored
    2016-09-08 14:27:03 +0530  
    Browse Dir »
  • Made changes reported in review.
    6b49383e
    Mukul Rajput authored
    2016-09-08 14:25:06 +0530  
    Browse Dir »
  • Refs: #7098
    0f6ed55c
    Nikita Kulshreshtha authored
    2016-09-08 14:06:28 +0530  
    Browse Dir »
  • #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 Dir »
  • Refs: #7398 ...
    d2de8059
    Incorrect button gets active on search
    Amrita Vishnoi authored
    2016-09-08 13:58:17 +0530  
    Browse Dir »
  • Merge branch 'LayerNoBug6593' into Develop
    521228f3
    Amrita Vishnoi authored
    2016-09-08 11:36:43 +0530  
    Browse Dir »
  • Refs: #7245 ...
    5e186125
    Each functionality is working in this.
    Along with the list manager close on any button click in left toolbar.
    Nikita Kulshreshtha authored
    2016-09-08 11:11:37 +0530  
    Browse Dir »

07 Sep, 2016
12 commits
  • Bug #6593:Dissectible Anatomy > Layer number should be visible
    e417a5fd
    Mitali Srivastava authored
    2016-09-07 19:48:02 +0530  
    Browse Dir »
  • #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 Dir »
  • after develop branch merge. ...
    0746dd80
    it is having 7245 bug resolved.
    also have extarct aftyer search and list managervhighlight.
    IT IS HAVING ISSUE IN LIST MANAGER.
    Nikita Kulshreshtha authored
    2016-09-07 18:30:59 +0530  
    Browse Dir »
  • #7244,#7240,#6731
    2d231089
    Mukul Rajput authored
    2016-09-07 18:04:59 +0530  
    Browse Dir »
  • commit after merging develop branch DAController code.
    546e7b63
    Nikita Kulshreshtha authored
    2016-09-07 17:44:37 +0530  
    Browse Dir »
  • copied DAController code from git from BrowserCrashIssue
    3f39e1dc
    Nikita Kulshreshtha authored
    2016-09-07 17:18:56 +0530  
    Browse Dir »
  • commit after merge
    04a17755
    Nikita Kulshreshtha authored
    2016-09-07 15:10:11 +0530  
    Browse Dir »
  • 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 Dir »
  • Refs: #7226 ...
    6bc0da41
    Highlight Options > Highlight goes away if we change layers
    Amrita Vishnoi authored
    2016-09-07 14:46:23 +0530  
    Browse Dir »
  • tooltips
    88cc8796
    Mukul Rajput authored
    2016-09-07 14:07:52 +0530  
    Browse Dir »
  • Renamed function name
    d460ebff
    Amrita Vishnoi authored
    2016-09-07 13:16:05 +0530  
    Browse Dir »
  • reverted code of browser crash issue because it craeted black issue in search as… ...
    388b8aeb
    … the push in array executed and the draw was not done.
    Nikita Kulshreshtha authored
    2016-09-07 12:53:59 +0530  
    Browse Dir »

06 Sep, 2016
2 commits
  • Refs: #7087 commnetd log
    0ded53f9
    Nikita Kulshreshtha authored
    2016-09-06 18:31:13 +0530  
    Browse Dir »
  • Refs: #7087 ...
    1701aa14
    moved coloredImageSRC push code before onLoad of image in DrawImage nad DrawMirrorediMAGE function.
    maintaing scroll position after layer change.
    also commneted few logs..
    Nikita Kulshreshtha authored
    2016-09-06 18:29:31 +0530  
    Browse Dir »

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 Dir »
  • 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 Dir »
  • this is work of edit style popup checkbox
    081a46c4
    Mukul Rajput authored
    2016-09-02 12:39:13 +0530  
    Browse Dir »

01 Sep, 2016
8 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 Dir »
  • Added revised json files and some code in DAController and Home controller
    2410adf7
    Amrita Vishnoi authored
    2016-09-01 15:36:00 +0530  
    Browse Dir »
  • One fix related to navigator man settings fix
    bad813cc
    Amrita Vishnoi authored
    2016-09-01 14:07:57 +0530  
    Browse Dir »
  • changes for checkbox in edit style modal
    a19d5ae5
    Mukul Rajput authored
    2016-09-01 13:44:17 +0530  
    Browse Dir »
  • 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 Dir »
  • deleted home.orig
    2d7dd3e2
    Mukul Rajput authored
    2016-09-01 13:17:37 +0530  
    Browse Dir »
  • Files Merged with branch DisableATBarOnPopUp
    c78cfb13
    Mukul Rajput authored
    2016-09-01 13:15:12 +0530  
    Browse Dir »
  • AnnotationToolBar missing code merged in this.
    23a2156a
    Amrita Vishnoi authored
    2016-09-01 12:56:32 +0530  
    Browse Dir »