Tags: atitparajuli2020/make-sense_Soybean_Drought
Tags
Merge pull request SkalskiP#300 from SkalskiP/develop 1.11.0-alpha relese
Merge pull request SkalskiP#278 from SkalskiP/master 1.10.0-alpha relese
Merge pull request SkalskiP#265 from SkalskiP/master 1.9.0-alpha relese
1.8.0-alpha relese (SkalskiP#197) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats * README.md update (SkalskiP#78) (SkalskiP#79) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> * add cross hair (SkalskiP#90) * Piotr | Line labels creation and export (SkalskiP#89) * initial changes: adding line labels to redux + addling line tab to right side navigation bar * adding new lines and base rendering * up * line style + snapping to rect added * highlight logic added * line rendering engine is working * line rendering engine update + marking line labeled images added * serializing to CSV * up * after PR * after PR * quick fix * Piotr | Image recognition (SkalskiP#92) * image recognition initial commit * setup before image recognition tagging * base tag assignment added * default screen when empty label list * image recognition added * after CR * 1.6.0-alpha relese merge (SkalskiP#94) * README.md update (SkalskiP#78) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> * 1.6.0-alpha relese merge (SkalskiP#93) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats * README.md update (SkalskiP#78) (SkalskiP#79) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> * add cross hair (SkalskiP#90) * Piotr | Line labels creation and export (SkalskiP#89) * initial changes: adding line labels to redux + addling line tab to right side navigation bar * adding new lines and base rendering * up * line style + snapping to rect added * highlight logic added * line rendering engine is working * line rendering engine update + marking line labeled images added * serializing to CSV * up * after PR * after PR * quick fix * Piotr | Image recognition (SkalskiP#92) * image recognition initial commit * setup before image recognition tagging * base tag assignment added * default screen when empty label list * image recognition added * after CR Co-authored-by: PLE12366003 <piotr.skalski@tesco.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: PLE12366003 <piotr.skalski@tesco.com> * Update README.md * Update README.md * Update README.md * Add files via upload * Update README.md * Update README.md * Update README.md * MS-86 Coco format suppport (SkalskiP#107) * up * save refactor * coco exporter in progress * coco exporter in progress * Disable browser back buttons during labelling (SkalskiP#106) * done * up * Piotr | MS-96 | Can image suppored by multi labels (SkalskiP#109) * initial refactor * refactor in progress * update * csv export working * export tags as json Co-authored-by: PLE12366003 <piotr.skalski@tesco.com> * Update README.md * Piotr | MS-XXX | Import coco labels from file (SkalskiP#111) * initial refactor * initial changes * export popup refactored * refactor continues * style changes * base import popup added * new feature placeholder added * hide import button * up * drop zone in place * up * bug fixing cleanup * loading mechanism prepared * update * more tests and more refactor * base import created * almost done * basic error handling * done * done * Update README.md * Update README.md * quick fix * Update README.md * Piotr | MS-XXX | Import labels yolo format (SkalskiP#114) * initial refactor * popup prepared for other file formats * fix * fix * loading of yolo files in place * bug fix * loading labels from file * up * up * refactor * tests refactor * filtering file data * filterFilesData tests added * up * up * done * working code * up * after PR, part 1 * YOLOImporter refactor done * YOLOImporter refactor done * Piotr | MS-XXX | Drop down menu (SkalskiP#117) * initial work on dropdown * style and base actions * up * up * up * up * almost done * after PR * update dependencies fixing vulnerabilities (SkalskiP#119) * Resolves issue SkalskiP#44 (SkalskiP#120) * Resolves issue SkalskiP#44 * Abstracts handleKeyUp function in TextInput * Rename props to onKeyUp * Update README.md * up * 1.7.0-alpha relese (SkalskiP#122) (SkalskiP#123) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats * README.md update (SkalskiP#78) (SkalskiP#79) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> * add cross hair (SkalskiP#90) * Piotr | Line labels creation and export (SkalskiP#89) * initial changes: adding line labels to redux + addling line tab to right side navigation bar * adding new lines and base rendering * up * line style + snapping to rect added * highlight logic added * line rendering engine is working * line rendering engine update + marking line labeled images added * serializing to CSV * up * after PR * after PR * quick fix * Piotr | Image recognition (SkalskiP#92) * image recognition initial commit * setup before image recognition tagging * base tag assignment added * default screen when empty label list * image recognition added * after CR * 1.6.0-alpha relese merge (SkalskiP#94) * README.md update (SkalskiP#78) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> * 1.6.0-alpha relese merge (SkalskiP#93) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats * README.md update (SkalskiP#78) (SkalskiP#79) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> * add cross hair (SkalskiP#90) * Piotr | Line labels creation and export (SkalskiP#89) * initial changes: adding line labels to redux + addling line tab to right side navigation bar * adding new lines and base rendering * up * line style + snapping to rect added * highlight logic added * line rendering engine is working * line rendering engine update + marking line labeled images added * serializing to CSV * up * after PR * after PR * quick fix * Piotr | Image recognition (SkalskiP#92) * image recognition initial commit * setup before image recognition tagging * base tag assignment added * default screen when empty label list * image recognition added * after CR Co-authored-by: PLE12366003 <piotr.skalski@tesco.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: PLE12366003 <piotr.skalski@tesco.com> * Update README.md * Update README.md * Update README.md * Add files via upload * Update README.md * Update README.md * Update README.md * MS-86 Coco format suppport (SkalskiP#107) * up * save refactor * coco exporter in progress * coco exporter in progress * Disable browser back buttons during labelling (SkalskiP#106) * done * up * Piotr | MS-96 | Can image suppored by multi labels (SkalskiP#109) * initial refactor * refactor in progress * update * csv export working * export tags as json Co-authored-by: PLE12366003 <piotr.skalski@tesco.com> * Update README.md * Piotr | MS-XXX | Import coco labels from file (SkalskiP#111) * initial refactor * initial changes * export popup refactored * refactor continues * style changes * base import popup added * new feature placeholder added * hide import button * up * drop zone in place * up * bug fixing cleanup * loading mechanism prepared * update * more tests and more refactor * base import created * almost done * basic error handling * done * done * Update README.md * Update README.md * quick fix * Update README.md * Piotr | MS-XXX | Import labels yolo format (SkalskiP#114) * initial refactor * popup prepared for other file formats * fix * fix * loading of yolo files in place * bug fix * loading labels from file * up * up * refactor * tests refactor * filtering file data * filterFilesData tests added * up * up * done * working code * up * after PR, part 1 * YOLOImporter refactor done * YOLOImporter refactor done * Piotr | MS-XXX | Drop down menu (SkalskiP#117) * initial work on dropdown * style and base actions * up * up * up * up * almost done * after PR * update dependencies fixing vulnerabilities (SkalskiP#119) * Resolves issue SkalskiP#44 (SkalskiP#120) * Resolves issue SkalskiP#44 * Abstracts handleKeyUp function in TextInput * Rename props to onKeyUp * Update README.md * up Co-authored-by: PLE12366003 <piotr.skalski@tesco.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: Augusto L C Schnorr <alcsaw@hotmail.com> Co-authored-by: PLE12366003 <piotr.skalski@tesco.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: Augusto L C Schnorr <alcsaw@hotmail.com> * Implement hot keys (SkalskiP#134) * Added hotkeys for first 10 labels * updated readme Co-authored-by: Jordan Wagner <WagnerJJ@sunypoly.edu> * Change Manifest.json to reflect MakeSense Name (SkalskiP#145) * Change Manifest.json to reflect MakeSense Name * Update manifest.json * Update README.md * Update README.md * Fix importing images and labels with filenames with multiple dots (SkalskiP#160) * fix importing images and labels with filenames with multiple dots * fix typo (all test passing) * removed comments from FileUtils * added unit tests for filenames with multiple dots * fix develop build (SkalskiP#162) * test .nvmrc * test .node js 11 * small fixes * feature/msb-001-add_automatic_response_to_new_issues_using_github_actions (SkalskiP#173) * Bump path-parse from 1.0.6 to 1.0.7 (SkalskiP#170) Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * feature/msb-001-add_automatic_response_to_new_issues_using_github_actions_2 (SkalskiP#182) * feature/msb-002-add_code-cov_integration (SkalskiP#184) * feature/msb-002-add_code-cov_integration * upload test results to code-cov * add code-cov badge to README.md * feature/151_add_description_about_each_file_type (SkalskiP#185) * feature/151_add_description_about_each_file_type * gh action update * update documentation structure * initial documentation * initial documentation 2 * initial documentation 3 * initial documentation 4 * initial documentation 5 * initial documentation 6 * initial documentation 7 * initial documentation 8 * initial documentation 9 * initial documentation 10 * initial documentation 11 * initial documentation 12 * initial documentation 13 * feature/issue-171_invalid_YOLO_annotations_exported_for_bboxes_on_the… (SkalskiP#188) * feature/issue-171_invalid_YOLO_annotations_exported_for_bboxes_on_the_edge_of_an_image * done * feature/msb-003-bump_make-sense_dependencies (SkalskiP#189) * feature/msb-003-bump_make-sense_dependencies * package-lock.json * Bump url-parse from 1.4.7 to 1.5.3 (SkalskiP#179) Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.4.7 to 1.5.3. - [Release notes](https://github.com/unshiftio/url-parse/releases) - [Commits](unshiftio/url-parse@1.4.7...1.5.3) --- updated-dependencies: - dependency-name: url-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump dns-packet from 1.3.1 to 1.3.4 (SkalskiP#178) Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4. - [Release notes](https://github.com/mafintosh/dns-packet/releases) - [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md) - [Commits](mafintosh/dns-packet@v1.3.1...v1.3.4) --- updated-dependencies: - dependency-name: dns-packet dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump color-string from 1.5.3 to 1.6.0 (SkalskiP#177) Bumps [color-string](https://github.com/Qix-/color-string) from 1.5.3 to 1.6.0. - [Release notes](https://github.com/Qix-/color-string/releases) - [Changelog](https://github.com/Qix-/color-string/blob/master/CHANGELOG.md) - [Commits](https://github.com/Qix-/color-string/commits/1.6.0) --- updated-dependencies: - dependency-name: color-string dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix/dockerfile can be built with current develop branch (SkalskiP#191) * Update README.md * Update issue-greetings.yml * Update mkdocs.yml * Update README.md * Update README.md * initial integration with GTM (SkalskiP#192) * feature/141_per-class_coloration (SkalskiP#190) * initial commit - refactor + color palette list + color added to LabelName type + color initiation * use material ui text field * label creation and edit is working * refresh button is working * color labels work in progress * render settings refactor * render rect works * done * feature/msb-004_orchestrated_error_reporting_system (SkalskiP#193) * initial commit - refactor + color palette list + color added to LabelName type + color initiation * use material ui text field * label creation and edit is working * refresh button is working * color labels work in progress * render settings refactor * render rect works * done * initial commit with Redux store setup * initial notifications view plugin * notifications view is ready to use * refactor * refactor 2 * Update README.md * Update README.md * feature/167_click_outside_the_image_line (SkalskiP#194) * feature/164_respect_directory_structure_or_at_least_provide_warning (SkalskiP#195) * initial refactor * empty labels validation * non unique labels validation * issue/87_tooltips_for_action_bar_buttons (SkalskiP#196) * tf.js models fix Co-authored-by: Piotr Skalski <SkalskiP@users.noreply.github.com> Co-authored-by: PLE12366003 <piotr.skalski@tesco.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: Augusto L C Schnorr <alcsaw@hotmail.com> Co-authored-by: jaaywags <38050123+jaaywags@users.noreply.github.com> Co-authored-by: Jordan Wagner <WagnerJJ@sunypoly.edu> Co-authored-by: Muhammad Fahmi Rasyid <ufarasfa@gmail.com> Co-authored-by: Héctor A <h3ct0r.ml@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: David Bensoussan <david@bensoussan.xyz>
1.7.0-alpha relese (SkalskiP#122) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats * README.md update (SkalskiP#78) (SkalskiP#79) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> * add cross hair (SkalskiP#90) * Piotr | Line labels creation and export (SkalskiP#89) * initial changes: adding line labels to redux + addling line tab to right side navigation bar * adding new lines and base rendering * up * line style + snapping to rect added * highlight logic added * line rendering engine is working * line rendering engine update + marking line labeled images added * serializing to CSV * up * after PR * after PR * quick fix * Piotr | Image recognition (SkalskiP#92) * image recognition initial commit * setup before image recognition tagging * base tag assignment added * default screen when empty label list * image recognition added * after CR * 1.6.0-alpha relese merge (SkalskiP#94) * README.md update (SkalskiP#78) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> * 1.6.0-alpha relese merge (SkalskiP#93) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats * README.md update (SkalskiP#78) (SkalskiP#79) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> * add cross hair (SkalskiP#90) * Piotr | Line labels creation and export (SkalskiP#89) * initial changes: adding line labels to redux + addling line tab to right side navigation bar * adding new lines and base rendering * up * line style + snapping to rect added * highlight logic added * line rendering engine is working * line rendering engine update + marking line labeled images added * serializing to CSV * up * after PR * after PR * quick fix * Piotr | Image recognition (SkalskiP#92) * image recognition initial commit * setup before image recognition tagging * base tag assignment added * default screen when empty label list * image recognition added * after CR Co-authored-by: PLE12366003 <piotr.skalski@tesco.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: PLE12366003 <piotr.skalski@tesco.com> * Update README.md * Update README.md * Update README.md * Add files via upload * Update README.md * Update README.md * Update README.md * MS-86 Coco format suppport (SkalskiP#107) * up * save refactor * coco exporter in progress * coco exporter in progress * Disable browser back buttons during labelling (SkalskiP#106) * done * up * Piotr | MS-96 | Can image suppored by multi labels (SkalskiP#109) * initial refactor * refactor in progress * update * csv export working * export tags as json Co-authored-by: PLE12366003 <piotr.skalski@tesco.com> * Update README.md * Piotr | MS-XXX | Import coco labels from file (SkalskiP#111) * initial refactor * initial changes * export popup refactored * refactor continues * style changes * base import popup added * new feature placeholder added * hide import button * up * drop zone in place * up * bug fixing cleanup * loading mechanism prepared * update * more tests and more refactor * base import created * almost done * basic error handling * done * done * Update README.md * Update README.md * quick fix * Update README.md * Piotr | MS-XXX | Import labels yolo format (SkalskiP#114) * initial refactor * popup prepared for other file formats * fix * fix * loading of yolo files in place * bug fix * loading labels from file * up * up * refactor * tests refactor * filtering file data * filterFilesData tests added * up * up * done * working code * up * after PR, part 1 * YOLOImporter refactor done * YOLOImporter refactor done * Piotr | MS-XXX | Drop down menu (SkalskiP#117) * initial work on dropdown * style and base actions * up * up * up * up * almost done * after PR * update dependencies fixing vulnerabilities (SkalskiP#119) * Resolves issue SkalskiP#44 (SkalskiP#120) * Resolves issue SkalskiP#44 * Abstracts handleKeyUp function in TextInput * Rename props to onKeyUp * Update README.md * up Co-authored-by: PLE12366003 <piotr.skalski@tesco.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: Augusto L C Schnorr <alcsaw@hotmail.com>
1.6.0-alpha relese merge (SkalskiP#93) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats * README.md update (SkalskiP#78) (SkalskiP#79) * Merge pull request SkalskiP#70 from SkalskiP/develop (SkalskiP#71) * new gif with ssd and posenet * Add Docker Support (SkalskiP#74) * add Dockerfile for make-sense * Update README for Docker * README updated * README updated with docker logs * readme updated * Update Dockerfile * Update README.md * basic stats Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com> * add cross hair (SkalskiP#90) * Piotr | Line labels creation and export (SkalskiP#89) * initial changes: adding line labels to redux + addling line tab to right side navigation bar * adding new lines and base rendering * up * line style + snapping to rect added * highlight logic added * line rendering engine is working * line rendering engine update + marking line labeled images added * serializing to CSV * up * after PR * after PR * quick fix * Piotr | Image recognition (SkalskiP#92) * image recognition initial commit * setup before image recognition tagging * base tag assignment added * default screen when empty label list * image recognition added * after CR Co-authored-by: PLE12366003 <piotr.skalski@tesco.com> Co-authored-by: Fatih Baltacı <baltacifatih14@gmail.com>
Merge pull request SkalskiP#70 from SkalskiP/develop 1.5.0-alpha relese
Merge pull request SkalskiP#62 from SkalskiP/develop 1.4.0-alpha relese merge
Merge pull request SkalskiP#55 from SkalskiP/develop 1.3.0-alpha relese merge
PreviousNext