ADAM / AIAHTML5

Open
Merge Request #236 · created by Amit Kumar

Test stash

Please merge the branch "Test_stash" into "Develop".

From Test_stash into Develop
Download as
This can't be merged automatically, even if it could be merged you don't have the permission to do so.
This can be merged automatically but you don't have the permission to do so.
2 participants
  • Link here  
    Amrita Vishnoi @amrita.vishnoi

    user machine specific changes are not allowed in merge request.

    Edit in fullscreen
    Comments are parsed with GitLab Flavored Markdown
    Attach files by dragging & dropping or selecting them.
    Cancel
  • Link here  
    Amit Kumar @kumar.amit

    Added 56 commits:

    • c63816c6 - created form for Atlas Anatomy xml rename utility.
    • 06bc223f - config file
    • b8cbcf15 - AA integration
    • d5b85e0c - All images are of different size so created a class to make all of them in same size.
    • d856c12a - extr4acted out common code for CI AND CA
    • 02852240 - showing data in filter
    • 06ba67f6 - Apply search function is pasted.
    • e0a5604f - Merge conflicts after taking Atlas Anatomy pull.
    • 07fb9e1d - renamed view and controller name for AA and also fixed the issues created due to this...
    • 335ea50b - changes for renaming related.
    • b83d55f0 - Fix toggle button position in DA
    • d9702b98 - In between code for calling module service
    • e062a9fc - reached call to the service...
    • 26c18336 - added modified file and also put all opened modules into array...
    • f6a824ab - Able to send data to the service
    • 896dee6f - able to send multiple data to service
    • 641bd20f - whole data is not passing to openModuleItem
    • b7a2d826 - scrum status
    • 1ddea18e - Removed xml files. Mistakenly I have added xmlFiles.
    • e0acb637 - scrum meeting points.
    • bf4202a2 - removed xml files from solution
    • 5142b6fe - AA work in progress
    • e4aed70b - 10-Nov-2016 scrum
    • fe0ccb07 - Module Service work in progress...
    • c293f6fb - Taken AA branch
    • 6e9b06b6 - Added json Files and moved Tile load code in service but returning tile view HTML is pending...
    • e7b3194d - have some issue...
    • c0ab4784 - Able to get data from module service to controller...
    • 537b6020 - Able to bind data with ng-repeat for all tile views
    • af5e7e6a - open Module view is in progress
    • 40551497 - Open View implementation is in progress
    • 6dff4700 - Able to open the AA Open view but not the dynamic one.
    • 439a22b9 - AIA documentation related audit
    • 4fe4aaff - Documentation
    • eec21253 - 2 local files added in git ignore, will remove later on
    • 48abc380 - Atlas anatomy test files
    • 80f22b17 - scrum update
    • cdb4b6ef - code till not introduced the JSPannel.
    • 2001b71d - JSPannel introduced in common place for all module, but AA detail view formatting is pending
    • b46881b3 - unable to bind open view image from html to controller
    • a011cf07 - Integrated jsPanel but still not getting scope is not accessible and also able to get pindata
    • a71ebd7f - Merge branch 'JsPannelInAA' of http://52.6.196.163/ADAM/AIAHTML5 into PinInAA
    • c309ed1f - in progress show pin poc
    • fadaa871 - Line is inprogress
    • 8de220fa - Trying to resolve scope Issue on AA
    • 321d39b4 - in progress
    • 939bc127 - in progress for jsPanel
    • 84d49e96 - Getting success in accessing image name on open View
    • cd0eb9e1 - inProgress...
    • d1408db5 - Able to show image dynamically on jsPanel
    • e4f882e8 - Bind image path through jQuery removed the inline image tag from controler
    • ecd05990 - in progress
    • 598c0f4c - inprogress
    • 09472e8d - POC is going on for Pin
    • 33a30137 - Merge branch 'compleSwichToDA' of http://52.6.196.163/ADAM/AIAHTML5 into Test_stash
    • 24bbf68f - test
    Edit in fullscreen
    Comments are parsed with GitLab Flavored Markdown
    Attach files by dragging & dropping or selecting them.
    Cancel
  • Link here  
    Amit Kumar @kumar.amit

    Added 1 commit:

    Edit in fullscreen
    Comments are parsed with GitLab Flavored Markdown
    Attach files by dragging & dropping or selecting them.
    Cancel
  • Link here  
    Amit Kumar @kumar.amit

    Added 91 commits:

    Edit in fullscreen
    Comments are parsed with GitLab Flavored Markdown
    Attach files by dragging & dropping or selecting them.
    Cancel
  • Link here  
    Amit Kumar @kumar.amit

    Added 1 commit:

    Edit in fullscreen
    Comments are parsed with GitLab Flavored Markdown
    Attach files by dragging & dropping or selecting them.
    Cancel
  • Link here  
    Amrita Vishnoi @amrita.vishnoi

    Code will not merge into develop until or unless will not in shape of deployment.

    Edit in fullscreen
    Comments are parsed with GitLab Flavored Markdown
    Attach files by dragging & dropping or selecting them.
    Cancel
  • Link here  
    Amit Kumar @kumar.amit

    Added 1 commit:

    Edit in fullscreen
    Comments are parsed with GitLab Flavored Markdown
    Attach files by dragging & dropping or selecting them.
    Cancel