-
Conflicts: .gitignore 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
-
2. POC project. 3. changes after merge
-
Conflicts: .gitignore
-
1. utilities folder is created in side 100-PROJECTS\001-AIAHTML5. 2. POC folder is created inside :\100-PROJECTS\001-AIAHTML5\300-PROTOTYPES\POC 3. Extract images window utility added in POC folder 4. Translation estimation v1 and v2 document added. 5. Some inprogress work in DA for highlight functionality.
-
all is working fine. also added daimage panel close functionality to open parent page.