Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Source Management API #26

Merged
merged 86 commits into from
Jun 19, 2017
Merged
Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
ccab782
Add new InventoryApi Module and implement Interfaces
May 20, 2017
15b377d
magento-engcom/magento2#25 Update dependencies
vadimjustus May 20, 2017
4a96bad
magento-engcom/magento2#25 Add new Inventory Module
May 20, 2017
0720a6d
magento-engcom/magento2#25: Update dependencies between inventory and…
vadimjustus May 20, 2017
930a520
magento-engcom/magento2#25 remove chagnes from .gitignore file
vadimjustus May 20, 2017
e16e339
magento-engcom/magento2#24: Implement web API route configuration
vadimjustus May 20, 2017
2b0a551
magento-engcom/magento2#25: Source API Implementation
ishakhsuvarov May 20, 2017
7eb1711
magento-engcom/magento2#24: Move ACL and WebApi routes to InterfaceAp…
vadimjustus May 20, 2017
2acced5
magento-engcom/magento2#25: Remove \Magento\InventoryApi\Api\Data\Sou…
vadimjustus May 20, 2017
d4f8c89
Merge branch 'mni/source-management' of github.com:magento-engcom/mag…
vadimjustus May 20, 2017
c2efa1b
magento-engcom/magento2#25: Source API Implementation
ishakhsuvarov May 20, 2017
bb10b2a
magento-engcom/magento2#7 Add missing empty interface class
nhp May 20, 2017
36e3d56
Filled SourceCarrierLinkInterface with some methods
nhp May 20, 2017
4999f0d
magento-engcom/magento2#25 Implemented Resourcemodel, Collection and …
May 20, 2017
6ad264e
Merge branch 'mni/source-management' of https://github.com/magento-en…
May 20, 2017
17a3cde
magento-engcom/magento2#25: Implement repository model for inventory …
vadimjustus May 20, 2017
a9983a3
Merge branch 'mni/source-management' of github.com:magento-engcom/mag…
vadimjustus May 20, 2017
8e26b84
magento-engcom/magento2#25: Implement get() method in SourceRepository
vadimjustus May 20, 2017
8eaeb06
magento-engcom/magento2#25: Change protected properties to private
vadimjustus May 20, 2017
fce8cc4
magento-engcom/magento2#25: Source API Implementation
May 20, 2017
de622ff
magento-engcom/magento2#25: Update docblock for method in order to fo…
vadimjustus May 20, 2017
ecc3f1c
magento-engcom/magento2#25: Update interfaces in order to use USE sta…
vadimjustus May 20, 2017
e12f95c
Merge branch 'mni/source-management' of github.com:magento-engcom/mag…
vadimjustus May 20, 2017
0206830
Wip
May 20, 2017
7d0c54b
magento-engcom/magento2#25 Implemented Resourcemodel, Collection and …
May 20, 2017
777d875
magento-engcom/magento2#25 solved mergeconfilcts
May 20, 2017
79e052e
Merge branch 'mni/source-management' of https://github.com/magento-en…
May 20, 2017
8c86f69
Merge branch 'mni/source-management' of https://github.com/magento-en…
May 20, 2017
deb909d
magento-engcom/magento2#25: Source API Implementation
ishakhsuvarov May 20, 2017
28970bf
magento-engcom/magento2#25: Implement SourceSearchResults
vadimjustus May 20, 2017
8e1dd4b
magento-engcom/magento2#25: Add di.xml and define preferences for int…
vadimjustus May 20, 2017
afe210b
magento-engcom/magento2#25: Implement unit tests for SourceRepository
vadimjustus May 20, 2017
6ffd2c9
Merge branch 'mni/source-management' of github.com:magento-engcom/mag…
vadimjustus May 20, 2017
b7072f7
magento-engcom/magento2#25 added unit tests for source and sourcecarr…
May 20, 2017
72d6298
Merge branch 'mni/source-management' of https://github.com/magento-en…
May 20, 2017
34eb6a2
magento-engcom/magento2#25: Source API Implementation
ishakhsuvarov May 20, 2017
1fc9560
magento-engcom/magento2#25 added fixed typo in test and added di conf…
May 20, 2017
0b46fdb
magento-engcom/magento2#25 fixed unit tests for source and sourcecarr…
May 20, 2017
78cff10
Merge remote-tracking branch 'origin/mni/source-management-api-tests'…
May 20, 2017
7913059
magento-engcom/magento2#25: Implement rests for SourceRepository
vadimjustus May 20, 2017
d3a3ac9
Merge branch 'mni/source-management' of github.com:magento-engcom/mag…
vadimjustus May 20, 2017
2443c2b
magento-engcom/magento2#25: Fix unit tests
vadimjustus May 20, 2017
b4a7aed
magento-engcom/magento2#25: Code styles
vadimjustus May 20, 2017
c2af5e5
magento-engcom/magento2#25: Source API Implementation
May 20, 2017
df90ef3
magento-engcom/magento2#25 added missing unit tests in sourcetest
May 21, 2017
c1fe56b
Merge branch 'mni/source-management' of https://github.com/magento-en…
May 21, 2017
fc4dcba
Remove obsolete DocBloc
nhp May 21, 2017
d2bc7b7
magento-engcom/magento2#25: WIP api-functional tests
vadimjustus May 21, 2017
dce3d9c
Merge branch 'mni/source-management' of github.com:magento-engcom/mag…
vadimjustus May 21, 2017
d9aefac
magento-engcom/magento2#25 made changes from codereview in pull request
May 21, 2017
a8d094c
magento-engcom/magento2#25 merged changes
May 21, 2017
f0d8ee8
magento-engcom/magento2#25: Implement first api functional test for c…
vadimjustus May 21, 2017
1b7dc20
Merge branch 'mni/source-management' of github.com:magento-engcom/mag…
vadimjustus May 21, 2017
a437a20
magento-engcom/magento2#25: WIP api functional tests
vadimjustus May 21, 2017
42e3cce
magento-engcom/magento2#25: Source API Implementation
ishakhsuvarov May 24, 2017
13ddff2
magento-engcom/magento2#25: Source API Implementation
ishakhsuvarov May 24, 2017
1e9da30
magento-engcom/magento2#25: WIP api-functional tests
vadimjustus May 28, 2017
1ab218a
Merge branch 'mni/source-management' of github.com:magento-engcom/mag…
vadimjustus May 28, 2017
3712ecf
magento-engcom/magento2#25: Finish first api-functional test
vadimjustus May 28, 2017
a3599a4
magento-engcom/magento2#25: wip: Implement further api-functional tests
vadimjustus May 28, 2017
2ce2684
magento-engcom/magento2#25: Source Management API Implementation
ishakhsuvarov May 28, 2017
385132a
magento-engcom/magento2#25: Source Management API Implementation
ishakhsuvarov May 29, 2017
8c094fd
magento-engcom/magento2#25: Source Management API Implementation
ishakhsuvarov May 29, 2017
ac987a1
magento-engcom/magento2#25: Merge branch 'develop' of github.com:mage…
ishakhsuvarov Jun 2, 2017
31f49a6
Review Fixes
Jun 5, 2017
fe5ced8
magento-engcom/magento2#25 Add Bugfix for testGetSourcesList test and…
Jun 5, 2017
385541a
magento-engcom/magento2#25 Add new testcases and bugfix for SourceRep…
Jun 5, 2017
9aae5e1
magento-engcom/magento2#25 Add testcase for GetSourcesList with Carri…
Jun 5, 2017
73d6442
magento-engcom/magento2#25 Add Fixes for Review Coments
Jun 5, 2017
203320b
magento-engcom/magento2#25: Source API implementation
ishakhsuvarov Jun 6, 2017
16e06dd
magento-engcom/magento2#25: Merge branch 'develop' of github.com:mage…
ishakhsuvarov Jun 6, 2017
bceb81b
magento-engcom/magento2#25: Source API implementation
ishakhsuvarov Jun 6, 2017
9abf23d
magento-engcom/magento2#25: Source API implementation
ishakhsuvarov Jun 6, 2017
705c758
magento-engcom/magento2#25: Source API Implementation
Jun 6, 2017
f3849cc
magento-engcom/magento2#25: Source API Implementation
Jun 6, 2017
ee0201a
magento-engcom/magento2#25: Source API Implementation
Jun 6, 2017
8a9de28
magento-engcom/magento2#25: Source API Implementation
Jun 7, 2017
73877d2
magento-engcom/magento2#25: Source API Implementation
Jun 7, 2017
a0df2b9
magento-engcom/magento2#25: Source API Implementation
Jun 7, 2017
2eb0a77
magento-engcom/magento2#25: Source API Implementation
Jun 7, 2017
2e2f443
magento-engcom/magento2#25: Source API Implementation
Jun 7, 2017
7860aed
magento-engcom/magento2#25: Source API Implementation
Jun 7, 2017
82ce7ef
magento-engcom/magento2#25: Source API Implementation
Jun 7, 2017
759c935
magento-engcom/magento2#25: Source API Implementation
Jun 7, 2017
49619de
magento-engcom/magento2#25: Merge branch 'develop' of github.com:mage…
ishakhsuvarov Jun 7, 2017
9eb37ab
magento-engcom/magento2#25: Source API Implementation
Jun 8, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions app/code/Magento/Inventory/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@

Open Software License ("OSL") v. 3.0

This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:

Licensed under the Open Software License version 3.0

1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:

1. to reproduce the Original Work in copies, either alone or as part of a collective work;

2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;

3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;

4. to perform the Original Work publicly; and

5. to display the Original Work publicly.

2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.

3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.

4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.

5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).

6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.

7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.

8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.

9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).

10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.

11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.

12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.

13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.

14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.

15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.

16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
Loading