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
  • CAController.js
06 Apr, 2017
1 commit
  • Code rectified for annotation ui issue. Refs: #16723
    bca264e9
    Utkarsh Singh authored
    2017-04-06 13:43:13 +0530  
    Browse File »

31 Mar, 2017
2 commits
  • Merge branch 'CI_CA_BottomIssue' into Develop
    08bb041a
    Amrita Vishnoi authored
    2017-03-31 14:11:23 +0530  
    Browse File »
  • Committed code regarding black border issue in CI and CA.
    4cbb62b0
    Utkarsh Singh authored
    2017-03-31 13:04:39 +0530  
    Browse File »

30 Mar, 2017
1 commit
  • Committed changes regarding bottom black border issue
    beeeae1a
    Utkarsh Singh authored
    2017-03-30 18:39:56 +0530  
    Browse File »

29 Mar, 2017
1 commit
  • 3DAnatomy changes
    3ef56e11
    Amrita Vishnoi authored
    2017-03-29 15:13:01 +0530  
    Browse File »

17 Jan, 2017
2 commits
  • login integration
    7ab9aefb
    Amrita Vishnoi authored
    2017-01-17 16:34:59 +0530  
    Browse File »
  • Earlier Merge Request #278 ...
    2aeeeee4
    Bug #12233:Clinical Illustration > "Show All" button is not working.
    Mitali Srivastava authored
    2017-01-17 13:32:12 +0530  
    Browse File »

12 Jan, 2017
1 commit
  • now title of module is dynamic. ...
    aa922a08
    issue in selection color.
    Nikita Kulshreshtha authored
    2017-01-12 18:27:32 +0530  
    Browse File »

06 Jan, 2017
1 commit
  • Merge branch 'CICANewBugs' into Develop
    e16a659d
    Amrita Vishnoi authored
    2017-01-06 13:23:51 +0530  
    Browse File »

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 File »

13 Dec, 2016
1 commit
  • 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 File »

09 Dec, 2016
1 commit
  • 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 File »

06 Dec, 2016
1 commit
  • Merge branch 'CACI_8680' into Develop
    dc9f600d
    Nikita Kulshreshtha authored
    2016-12-06 14:04:00 +0530  
    Browse File »

22 Nov, 2016
1 commit
  • Bug #8680: CI > List View> State should be maintained if we open and close any of the image
    db0190c6
    Mitali Srivastava authored
    2016-11-22 13:51:15 +0530  
    Browse File »

17 Nov, 2016
1 commit
  • Bug #8679: CI > List View> Image should be selected in the list if we click on any of it
    d0198fd5
    Mitali Srivastava authored
    2016-11-17 13:45:10 +0530  
    Browse File »

15 Nov, 2016
1 commit
  • Commit changes for Issue Ref #10122:Clinical Animation > Annotation Toolbar gets… ...
    87e7d110
    … enable when List Manager is opened and closed in CA detail page.
    unknown authored
    2016-11-15 16:26:37 +0530  
    Browse File »

08 Nov, 2016
1 commit
  • Commit changes for Issue ref: ...
    77cf2dee
    #9037:Clinical Animation > Annotation's Tools, Modes, Edit shape Style should be disable on CA's detail page.
    #9016: Annotation > When text box is opened, view page should get disabled.
    unknown authored
    2016-11-08 12:44:28 +0530  
    Browse File »

02 Nov, 2016
1 commit
  • Commit changes for issue ref : #9037 Clinical Animation > Annotation's Tools, Mo… ...
    c104acf4
    …des, Edit shape Style should be disable on CA's detail page.
    unknown authored
    2016-11-02 17:48:44 +0530  
    Browse File »

20 Oct, 2016
1 commit
  • Change HTML5 player for CA
    7be430f5
    Mitali Srivastava authored
    2016-10-20 19:01:15 +0530  
    Browse File »

07 Oct, 2016
2 commits
  • Merge branch 'CICAMaintainState' into Develop
    f7ea690c
    Nikita Kulshreshtha authored
    2016-10-07 13:05:32 +0530  
    Browse File »
  • Extra condition to maintain combo selection in CI CA
    763fb739
    Mitali Srivastava authored
    2016-10-07 12:53:54 +0530  
    Browse File »

06 Oct, 2016
2 commits
  • Bug #5263: Maintain combo box selection after detailpage is unloaded and CI is loaded
    1feaaddf
    Mitali Srivastava authored
    2016-10-06 17:03:57 +0530  
    Browse File »
  • Bug #5262 Maintain state after detail page is closed ...
    dcc1d382
    Bug #7960 CI > Maintain state of the List View
    Bug #7962 CA > Maintain state of the List View
    Bug #2316 Navigation to Clinical Illustrations Module
    
    Listview and grid view state have to be maintained in all the modules which show it in the main menu. 3danatomy should not have listview and gridview so removed from it.
    Mitali Srivastava authored
    2016-10-06 11:53:10 +0530  
    Browse File »

04 Oct, 2016
1 commit
  • Maintain combo selection of CA
    51b75071
    Mitali Srivastava authored
    2016-10-04 19:29:54 +0530  
    Browse File »

30 Sep, 2016
2 commits
  • Merge branch 'CICAAlphabetical' into Develop
    b772c01c
    Amrita Vishnoi authored
    2016-09-30 14:41:43 +0530  
    Browse File »
  • Comment for adding "_BodyRegion": "None" in json file
    388d57c7
    Amrita Vishnoi authored
    2016-09-30 14:35:31 +0530  
    Browse File »

23 Sep, 2016
3 commits
  • commented consolelog
    2e5c4938
    Mitali Srivastava authored
    2016-09-23 17:56:54 +0530  
    Browse File »
  • Bug #7909:CI > Arrange all the illustrations in alphabetical order ...
    4a4176cb
    also fixed it in CA as well
    Mitali Srivastava authored
    2016-09-23 17:37:26 +0530  
    Browse File »
  • Bug #7520: Clinical Animation: Message is missing! when no items are found after search. ...
    f46129b2
    Bug #7707:CI and CA Search > The search button should work in case no criteria is selected.
    
    also comment ui-grid link on index page as ui-grid library is not used to remove console error.
    Mitali Srivastava authored
    2016-09-23 16:53:27 +0530  
    Browse File »

16 Sep, 2016
1 commit
  • Merge branch 'Ipadissue' into Develop
    1f740ed6
    Nikita Kulshreshtha authored
    2016-09-16 15:42:32 +0530  
    Browse File »

15 Sep, 2016
1 commit
  • 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 »

14 Sep, 2016
1 commit
  • Bug #7707:CI and CA Search > The search button should work in case no criteria is selected. ...
    c4ecf557
    Bug #7677:Clinical Animation> thumbnails are not displayed
    Bug #7523:Clinical Illustration:Message is missing, when no items are found after search.
    Bug #7520:Clinical Animation:Message is missing! when no items are found after search.
    Mitali Srivastava authored
    2016-09-14 18:36:00 +0530  
    Browse File »

07 Sep, 2016
1 commit
  • #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 File »

12 Jul, 2016
1 commit
  • ca json modified for not available links and open jspanel from listview after search
    f0d6bc46
    Mitali Srivastava authored
    2016-07-12 13:45:35 +0530  
    Browse File »

05 Jul, 2016
2 commits
  • removed alert
    62c3747a
    Mitali Srivastava authored
    2016-07-05 16:40:18 +0530  
    Browse File »
  • CA JSpanel changes
    d289f44c
    Mitali Srivastava authored
    2016-07-05 16:07:59 +0530  
    Browse File »

29 Jun, 2016
2 commits
  • CA css issue
    28c7c459
    Mitali Srivastava authored
    2016-06-29 17:16:38 +0530  
    Browse File »
  • CA module changes
    742d6d60
    Mitali Srivastava authored
    2016-06-29 17:06:04 +0530  
    Browse File »

27 Jun, 2016
1 commit
  • CI Module jspanel and ca json and images
    ef481fa1
    Mitali Srivastava authored
    2016-06-27 19:30:19 +0530  
    Browse File »

26 May, 2016
1 commit
  • removed dependency on Modules from controllers
    be7d8a74
    Mitali Srivastava authored
    2016-05-26 16:46:30 +0530  
    Browse File »