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
  • views
  • da
  • da-view.html.orig
16 Aug, 2016
2 commits
  • Merge branch 'AnnotationToolBar_DrawingOptions' of http://52.6.196.163/ADAM/AIAH… ...
    e26e5495
    …TML5 into AnnotationToolBar_latest
    
    # Conflicts:
    #	400-SOURCECODE/AIAHTML5.Web/Web.config
    #	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
    #	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
    #	400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
    #	400-SOURCECODE/AIAHTML5.Web/index.html
    unknown authored
    2016-08-16 16:43:03 +0530  
    Browse File »
  • Merge branch 'DefectFix' of http://52.6.196.163/ADAM/AIAHTML5 into AnnotationToolBar_latest ...
    3dc489d1
    # Conflicts:
    #	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
    #	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
    #	400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
    #	400-SOURCECODE/AIAHTML5.Web/index.html
    unknown authored
    2016-08-16 16:33:38 +0530  
    Browse File »