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
16 Sep, 2016
5 commits
  • Merge branch 'Ipadissue' into Develop
    1f740ed6
    Nikita Kulshreshtha authored
    2016-09-16 15:42:32 +0530  
    Browse File »
  • changed branch name as the previous branch name( DisableTBOnExtract&ViceVersa ) … ...
    2027a9c6
    …for enabling diabling TBox nad vice versa wa not recognised by git.
    Nikita Kulshreshtha authored
    2016-09-16 13:08:30 +0530  
    Browse File »
  • disable tbox on extract ...
    0a33dd98
    disable  extract on Tbox
    Nikita Kulshreshtha authored
    2016-09-16 12:29:01 +0530  
    Browse File »
  • maintain scroll on highlight to normal.
    3bbef99a
    Nikita Kulshreshtha authored
    2016-09-16 11:00:29 +0530  
    Browse File »
  • Refs: #7148
    15f7c07f
    Nikita Kulshreshtha authored
    2016-09-16 10:41:18 +0530  
    Browse File »

15 Sep, 2016
7 commits
  • in lateral arm LM and search loader icon was not going invisible.
    ebc80013
    Nikita Kulshreshtha authored
    2016-09-15 17:14:32 +0530  
    Browse File »
  • on gender change searched highlited portion is hilghlighted.
    66fc170f
    Nikita Kulshreshtha authored
    2016-09-15 16:47:34 +0530  
    Browse File »
  • renamed a variable which created issue. sometimes space is created between name. ...
    bd7fb618
    This created issue in opening view after closing jspanel sometimes.
    Nikita Kulshreshtha authored
    2016-09-15 15:51:05 +0530  
    Browse File »
  • loading icon was not visible on search and LM - Fixed.
    76312e57
    Nikita Kulshreshtha authored
    2016-09-15 15:12:44 +0530  
    Browse File »
  • title was Male Anterior always in LM - Fixed.
    71b6f72b
    Nikita Kulshreshtha authored
    2016-09-15 12:02:10 +0530  
    Browse File »
  • After list manager load removed the wait cursor.
    168aa89c
    Nikita Kulshreshtha authored
    2016-09-15 11:53:08 +0530  
    Browse File »
  • List manager/ search scroll fix with Develop stable code.
    e1e05093
    Nikita Kulshreshtha authored
    2016-09-15 11:32:07 +0530  
    Browse File »

14 Sep, 2016
2 commits
  • Bug #7114:Search is not showing correct result
    c3e32785
    Mitali Srivastava authored
    2016-09-14 16:44:44 +0530  
    Browse File »
  • Stabilized Develop branch back which has been disturbed after Nikita merge.
    00a3c44f
    Amrita Vishnoi authored
    2016-09-14 12:21:57 +0530  
    Browse File »

13 Sep, 2016
2 commits
  • removed commented code
    fbc6967e
    Amrita Vishnoi authored
    2016-09-13 14:19:42 +0530  
    Browse File »
  • Browser crash issue is resolved.now we are pushing data in ColoredImageSRC array
    1ecdea6b
    Amrita Vishnoi authored
    2016-09-13 14:16:20 +0530  
    Browse File »

12 Sep, 2016
5 commits
  • crash issue is In progress , we need to catch the enter event as well we can't fix it by ng-change.
    aafbcbc0
    Amrita Vishnoi authored
    2016-09-12 18:29:32 +0530  
    Browse File »
  • tem changes
    40f57f51
    Amrita Vishnoi authored
    2016-09-12 13:49:20 +0530  
    Browse File »
  • Refactor Code
    aa477e2a
    unknown authored
    2016-09-12 12:00:11 +0530  
    Browse File »
  • Merge branch 'thumbnailviewchange' into Develop
    efb210be
    Amrita Vishnoi authored
    2016-09-12 11:17:49 +0530  
    Browse File »
  • Merge branch 'LMInFemale' into Develop
    9baafbe6
    Amrita Vishnoi authored
    2016-09-12 11:02:57 +0530  
    Browse File »

09 Sep, 2016
9 commits
  • bug #6200,#6731,#7283,#5286
    9871bdc5
    Mukul Rajput authored
    2016-09-09 18:49:13 +0530  
    Browse File »
  • Merge branch 'bugs' into Develop
    a076bcf9
    Amrita Vishnoi authored
    2016-09-09 17:30:06 +0530  
    Browse File »
  • Refs: #7398
    84c06ae9
    Amrita Vishnoi authored
    2016-09-09 17:12:03 +0530  
    Browse File »
  • Commit Changes for Text Area
    7be22d6b
    unknown authored
    2016-09-09 16:28:23 +0530  
    Browse File »
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Annotation_Pencil ...
    5c7bfab2
    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-09-09 16:18:42 +0530  
    Browse File »
  • Implemented Text Area Edit, Identity and draw functionality.
    b402dbb3
    unknown authored
    2016-09-09 16:04:40 +0530  
    Browse File »
  • Refs: #7298
    8313a5d3
    Nikita Kulshreshtha authored
    2016-09-09 13:15:22 +0530  
    Browse File »
  • List manager is working in female gender also.
    a36a5126
    Nikita Kulshreshtha authored
    2016-09-09 13:13:59 +0530  
    Browse File »
  • Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into bugs
    0270d7e6
    unknown authored
    2016-09-09 10:04:58 +0530  
    Browse File »

08 Sep, 2016
10 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 File »
  • Merge branch 'ListManagerWorkingWIthUatCode' into Develop
    7fd1db7a
    Amrita Vishnoi authored
    2016-09-08 16:57:42 +0530  
    Browse File »
  • Commit changes for Ref: Issue#7286 ...
    bfca2cb9
    //Issue #7286 :Undefined annotation should not appear
    unknown authored
    2016-09-08 16:40:41 +0530  
    Browse File »
  • 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 File »
  • Merge branch 'FixesAfterCodeReview' into Develop
    7c850638
    Amrita Vishnoi authored
    2016-09-08 15:02:09 +0530  
    Browse File »
  • Made changes reported in review.
    6b49383e
    Mukul Rajput authored
    2016-09-08 14:25:06 +0530  
    Browse File »
  • Refs: #7098
    0f6ed55c
    Nikita Kulshreshtha authored
    2016-09-08 14:06:28 +0530  
    Browse File »
  • #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 File »
  • Refs: #7398 ...
    d2de8059
    Incorrect button gets active on search
    Amrita Vishnoi authored
    2016-09-08 13:58:17 +0530  
    Browse File »
  • Merge branch 'LayerNoBug6593' into Develop
    521228f3
    Amrita Vishnoi authored
    2016-09-08 11:36:43 +0530  
    Browse File »