2 participants
-
Added 6 commits:
- c97fc7d1 - some changes came after : git checkout -b AIAAdminApi origin/AIAAdminApi
- 9d9835cd - some changes came after : git checkout -b AIAAdminApi origin/AIAAdminApi
- 3110b119 - Add dist folder
- 3170a2e4 - some changes came after : git checkout -b AIAAdminApi origin/AIAAdminApi
- 991f51b4 - Merge branch 'AIAAdminApi' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC
- 69432ce5 - Merge branch 'Develop-IPAD-MAC' of http://52.6.196.163/ADAM/AIAHTML5 into PreQA
-
Added 1 commit:
- 36a11e91 - modified path in index.html on dist folder
-
Added 9 commits:
- 1a5f0330 - new files came from develop
- 519b7396 - files came after resettimg to Develop-IPAD-MAc
- 63560c2e - manually merged CALandscapeIssue into develop.
- 2decd299 - Commit Changes
- 2b8b72c8 - Commit Changes
- 57e58c04 - Horizontal Text Issue
- d5881720 - Commit Changes
- 406ea973 - manually merged textHorizontalIssue
- a37cd195 - Merge branch 'Develop-IPAD-MAC' of http://52.6.196.163/ADAM/AIAHTML5 into PreQA
-
Added 10 commits:
- 3484b5c4 - this is solution for bug redirect admin url
- 3f7510bb - manually merged AdminredirectUrl branch
- d6374634 - this is solution for the bug table image is not in middle
- b3053ef7 - this is the solution for the bug tab dropdown
- e1a2dba2 - this is the solution for loader for list manager system
- 13294ebb - this is solution for the bug highlight issue with list manager system in AA
- 1d7653c6 - this is the solution for AOD IPAD scroll
- 32f7b93e - Merge branch 'bugfix5' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC
- 4bfd9579 - manulayy merged bugfix5 branch which is having code of #822,#823 ,#824, #825
- a3e88410 - Merge branch 'Develop-IPAD-MAC' of http://52.6.196.163/ADAM/AIAHTML5 into PreQA
-
Added 1 commit:
- 90a1d997 - added AIA technical document
-
Added 36 commits:
- 1f7a3f6b - space changes
- 11e8e1e0 - space changes
- b8364a4b - this is solution for the bug 24858
- 1096aae3 - manually merged yearupdateissue(Merge Request #845)
- 26e1133e - Merge branch 'ATToolbar_2' into Develop-IPAD-MAC
- db798846 - 26672 : First time Addressed>CI and CA > Selected illustration and Animation is …
- 0ad05f5f - commit Changes
- e1a24cf7 - Merge branch '26672' into Develop-IPAD-MAC
- a2a99e48 - Develop-IPAD-MAC code
- 60d57fa8 - manually merged AODScrollIissue
- ff2e54b0 - manually merged AIAAdminApi
- 8097e01d - this is the solution for the bug 26606
- 47490a04 - Merge branch 'loaderIssueAAIE' into Develop-IPAD-MAC
- 3484b5c4 - this is solution for bug redirect admin url
- 3f7510bb - manually merged AdminredirectUrl branch
- d6374634 - this is solution for the bug table image is not in middle
- b3053ef7 - this is the solution for the bug tab dropdown
- e1a2dba2 - this is the solution for loader for list manager system
- 13294ebb - this is solution for the bug highlight issue with list manager system in AA
- 1d7653c6 - this is the solution for AOD IPAD scroll
- 32f7b93e - Merge branch 'bugfix5' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC
- 4bfd9579 - manulayy merged bugfix5 branch which is having code of #822,#823 ,#824, #825
- 2d11f8ba - 26596 : Atlas Anatomy > The searched body annotation is not highlighted
- 588249d5 - 11132 : DA > Annotation search from Search List is not highlight in the List manager
- f6fdbf6b - Merge branch 'Anno_searchListIsse' into Develop-IPAD-MAC
- 155cd133 - manually merged tapIssue_2(Merge Request #843 )
- 1f278fbc - User List Add user and Unblock User and Edit User screen done
- dbb58c8a - add dist folder
- c2e13af5 - Procedure commit
- 19dea4d4 - Sp commit
- 727c3dbf - Dist commit
- ed2a7c28 - space remove
- ba16ae3b - manually merged AIAAdminApi(Merge Request #847)
- cdc825de - All original stored procedures from 52.6.219.114 database.
- 7cf6d0ab - modified procedures by Jyoti
- 9ca89f6d - Merge branch 'Develop-IPAD-MAC' of http://52.6.196.163/ADAM/AIAHTML5 into PreQA
-
Added 1 commit:
- b8a6475a - Global.asax and cs file names were misspalled
-
Added 6 commits:
- a3e88410 - Merge branch 'Develop-IPAD-MAC' of http://52.6.196.163/ADAM/AIAHTML5 into PreQA
- e0e10ba3 - Files changes came on switching o PreQA
- d88fb2b4 - merged Develop-IPAD-MAC into PreQA
- 6570266f - replaced js files from Develop-IPAD-MAC and replaced assests path in index.html
- 6092423f - space changes
- 79c33a20 - Merge branch 'Develop-IPAD-MAC' of http://52.6.196.163/ADAM/AIAHTML5 into PreQA
-
Added 89 commits:
- 73a58ef3 - got POC on preset on preqa
- 15e424b0 - in PreQA
- 35be9f46 - POC project came after taking Develop-IPAD-MAC
- ab1b6261 - added new json files
- 122e15b3 - added json
- 75263b72 - prepared object for save . need to get score and move code in functions.
- 4e2908ee - added back-end code fro lab execrice save
- 465cc446 - lab exercise save is complete
- a567ba42 - lab exercise save
- fa9a03ff - ui
- f63480a5 - Getting saved data and showing first question as per saved data,
- 9cec3e39 - showing saved labexercise data for the last question saved in database
- 33046d8e - save question data also showing on next and prev.
- 4f6b93d2 - reset is working fine with saved data
- 9e84e369 - getting saved data but need to work on next previous if user dragged the answers…
- 788cc440 - save and get are working fine
- 8380e2e5 - added sql scripts
- 6e536be6 - chnaged ids
- cc635ed7 - AIA daily status
- 0e92b32e - on next and previous user can see the attempted choice.
- 76537963 - added wait cursor
- f0c81cf2 - File Pushed
- f0d26939 - Commit Changes
- 36e83098 - Commit Changes
- 99fd7a45 - Bug #28577: Google Chrome > Lab Exercise > The User should be able to see the pr…
- 335f4bd9 - Implemented Submit Btn Functionality
- 4147a3d3 - Commit Changes
- b0665952 - Commit Changes
- 15aaa43e - Commit Changes
- 0663ce5c - lab exercise save ., get, submit functionalities are merged
- 207f0331 - Submit Functionality
- 5efb41e2 - Report is complete. On;y nned to do sorting in showing question numbers.
- cee3de39 - questions are in ascending order
- d743069f - all is working
- 4bb33976 - everything is working except email
- 9cc1336e - Changed position
- f3126dae - Commit Changes
- d0fe2dca - changes in json
- 7ccbfe36 - merged lab exercise code
- a2f46b0a - merged bug fix 28632 barnch: OverlappingIssue
- 688d144e - 25035 : Atlas Anatomy > Variation in the structure and number of structures of the List Manager
- debd7484 - merged 25035
- e373c250 - merged 25270_1
- 40eacec0 - merged 25065
- a62e274b - Merge branch '24925' of http://gitlab.ebix.com/ADAM/AIAHTML5 into Develop-IPAD-MAC
- 6f5c9c6c - 8093 : iPad > All the buttons are working on two taps
- 9c3d052b - Commit Changes
- 337a8b1f - Commit Changes
- 865d8839 - 25270 : Atlas Anatomy > Thumbnail filter state is not maintained.(win)
- e2acf51a - Commit Changes
- 6a859856 - Commit Changes
- 4ee8111d - 24918 : Atlas Anatomy > List Manager > The selected pin highlight goes away when…
- ac9fca59 - Atlas Anatomy > All the pins are appear on the system even when Show Selected Pi…
- 0acaea80 - textarea text issue
- 3ecfd1eb - 24411 : iPad > DA > Both gender selection button appears selected.
- 83559d99 - mergd #853
- 22fa7186 - Merge branch 'loaderIssue' of http://gitlab.ebix.com/ADAM/AIAHTML5 into Develop-IPAD-MAC
- 7f6ef4e5 - 25382 : loader keeps on loading on selection of skin
- 27193915 - Commit Changes
- 7b288748 - lGlobal > iPad > The drop-downs are not working in all the modules.
- d6828313 - 28578 : IE 11 > Lab Exercise > Unable to drop the answer in the drop-box.
- 23aef373 - #862
- 2c25cff6 - this is sol for the bug 28602
- 0c25e254 - merged labimagesourceissue
- 763d187a - this is solution for the bug 28603
- 77827e1d - mregd laboverlapans_1
- a13bd9e8 - correction in Lab Exercise
- 68c17380 - New stored procedures in Admin
- 4f9f830c - test change
- d8f491a8 - Merge branch 'Develop-IPAD-MAC' of http://gitlab.ebix.com/ADAM/AIAHTML5 into Develop-IPAD-MAC
- e7cd3044 - this is solution of bug 25066
- 05d6bb26 - Merge branch 'listmanagersystemallissue' into Develop-IPAD-MAC
- 30854434 - this is the solution for the bug 25385
- 8818690b - Merge branch 'printpreviewlogoissuetab' into Develop-IPAD-MAC
- 28569def - this is solution for the bug 25496
- b9674f89 - Merge branch 'layerchangeTBModesty' into Develop-IPAD-MAC
- 3f130a51 - this is solution for the bug 13469
- 87559244 - Merge branch 'loderwithextractissue' into Develop-IPAD-MAC
- d5d1e9f6 - this is the solution for the bug 25150
- c06077d8 - Merge branch 'ipadidentify' into Develop-IPAD-MAC
- f2a5fd0a - this is the solution for the bug 28624
- 06ff946d - Merge branch 'LabexWrongModuleName' into Develop-IPAD-MAC
- 56f0fe04 - this is solution for the bug 28586
- cc4e92fb - Merge branch 'labdisabledmodels' into Develop-IPAD-MAC
- f3d687a1 - this is solution for the bug 28580
- 6059d537 - Merge branch 'minmaxlabexissue' into Develop-IPAD-MAC
- 81f751c7 - this is solution for the bug 28784
- 8ac9b026 - merged labelAASlider
- 7eab21cb - Merge branch 'Develop-IPAD-MAC' of http://gitlab.ebix.com/ADAM/AIAHTML5 into PreQA
-
Added 8 commits:
- b4440c6b - this is pdf on LabEx
- e501d9dd - update link with pdf labEx
- 49eebfac - Merge branch 'LAbEXPDF' into Develop
- 3ec79f83 - Bug#28579 is fixed
- a7eab5c5 - json data issue
- 000be126 - changed options poition from left-right to bottom.
- 7fc35df6 - commit .csproj
- 785253ad - Manulal merge Merge Request #880
-
Added 19 commits:
- 0726f7cb - uncommented rewrite module
- 9b618102 - issue was in duplicate text options in save
- 866e0064 - issue in fill in the blanks is fixed.
- d6ad3a7b - removed unused line
- cc911266 - Merge branch 'LabExerciseFillBlanks' into Develop
- 315946b3 - changes for save data
- 74140fb6 - fixed issue when 2 options are same than one disappear while dropping
- 0ae97439 - changes in coordinates to fix the location of box
- 0e636958 - Merge branch 'SaveDropIssueLabEx' into Develop
- 7e16be0d - this is solution for bug AA
- 96751b7c - Merge branch 'ListmanagerAAselectissue' into Develop
- cff34450 - some fixes
- 1de6f5f9 - annotation erase fix
- c22be0eb - in saved question the duplicate options appear in dropbox and also in answer options-fixed
- 2c9d1f04 - Commit Changes
- 3abdbb49 - Merge branch 'labEx' of http://gitlab.ebix.com/ADAM/AIAHTML5 into LabExSavedDup
- 52f05f20 - Merge branch 'LabExSavedDup' into Develop
- 7bb9a43c - this is solution for the bug AA listmanager sorting after system select
- 5fd27848 - Merge branch 'listmagershorting' into Develop
-
Added 22 commits:
- 6f424710 - Commit Changes
- 44e22bfa - Commit Changes
- d0e38872 - Merge branch 'labEx' into Develop
- c57d3500 - commnet code
- 6979fb87 - fill in the blanks drop position was not correct in last 2 moules
- 3aec8ffb - modified json
- 4317a65d - 1. after current structire selection, we click on highlight, call should not go …
- 86d63172 - fixed this bug.
- c26ccc8c - Merge branch 'Bug#24894_3' into Develop
- 1cc4b293 - this is solution for the bug 29654
- 4105a5ca - Merge branch 'AATableScroll' into Develop
- ed33850c - this is solution for the bug AOD not open in ie at local
- 7d2e4b6b - Merge branch 'AODIEIssue' into Develop
- 49f3be7b - increased the head size for mobile devices
- 9352d10a - Merge branch 'AAPinHeadSize' into Develop
- e9497eda - User Group And Manage Rights
- e5cdf18d - Merge code
- 4d2db931 - Merge Code
- 4b818987 - deleted files
- e3e725ed - Testing on AIA Admin
- 2a4b7280 - Manually merged AdminProdChanges in Develop
- 0466a02a - Merge branch 'Develop' of http://gitlab.ebix.com/ADAM/AIAHTML5 into PreQA
-
loading bodysystem data on view load as sometimes data was not found. on multiple bodystsetm selection the body became white as highiltbody was called multiple times. on changing skintone on 0tgreter than 0 layer the loader kept on loading.
-
…on the hoghlightbybodysystemselection. 2. need to check why ishighlight was false on line 3048
-
This fixes the issue of dropping back options and also ipad ovelap options on image issue
-
Need to change json and for text questions as the dropped option is not positioned at exact point.
-
currently questions are not shown in ascending order. Email is pending
-
save function call was missing during previous merge. added that
-
Added json and images for lymphatic questions
-
added logs
-
… so need to show the next prev question as per user attaempt
-
…eview while dragging the answer.
-
Need to why see the drag is not working
-
Need to jump to the last opted questionan and show as per saved data
-
…ns button is selected.
-
… zoom-in/zoom-out the slider.
-
…not loaded in the below scenario
-
# Conflicts: # 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js # 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
Changes view for this comparison is extremely large.
You can download it instead.