Commit a4607de8 by Jonathan Thomas

Merge branch 'licensing-info' into 'develop'

Add MIT license and update About page

See merge request !1
parents 89e45178 d0bc9d3f
Pipeline #9009 passed with stage
in 35 seconds
...@@ -6,7 +6,7 @@ stages: ...@@ -6,7 +6,7 @@ stages:
except: except:
- tags - tags
only: only:
- master - develop
deploy-to-aws: deploy-to-aws:
<<: *template <<: *template
......
MIT License
Copyright (c) 2022 OpenShot Studios, LLC
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
\ No newline at end of file
simple-editor simple-editor
============= =============
This is a very simple demo application for OpenShot Cloud API. You can log-in, upload files, This is a very simple demo application for OpenShot Cloud API. You can log-in, upload files,
create/edit clips, move clips (up/down), and export / download a video. create/edit clips, move clips (up/down), and export, and download a video.
You can also check out the **hosted** version of this app: You can also check out the **hosted** version of this app:
https://cloud.openshot.org/apps/simple-editor/ https://cloud.openshot.org/apps/simple-editor/
...@@ -20,6 +20,14 @@ Features: ...@@ -20,6 +20,14 @@ Features:
- **Preview**: file & clips supported, play/pause, simple timeline w/ trimming, add-clip button - **Preview**: file & clips supported, play/pause, simple timeline w/ trimming, add-clip button
- **Export**: progress bar, cancel, download, preview (show last export) - **Export**: progress bar, cancel, download, preview (show last export)
## Source Code
The source code is hosted on OpenShot Studio's GitLab server:
http://gitlab.openshot.org/public-projects/simple-editor. It is licensed under the MIT license,
and can be used in both open-source and commercial projects.
```
git clone git@gitlab.openshot.org:public-projects/simple-editor.git
```
## Project setup ## Project setup
``` ```
npm install npm install
......
{ {
"name": "simple-editor", "name": "simple-editor",
"version": "0.1.0", "version": "0.1.0",
"description": "A simple video editor built with JavaScript, Node.js, and Vue 3 (powered by OpenShot Cloud API)",
"homepage": "http://gitlab.openshot.org/public-projects/simple-editor",
"license": "MIT",
"author": {
"name" : "OpenShot Studios, LLC",
"email" : "cloud-support@openshot.org",
"url" : "https://openshot.org/cloud-api/"
},
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<div class="row"> <div class="row">
<div class="col-md-12 m-5 text-center"> <div class="col-md-12 m-5 text-center">
<div class="call-to-action-content" style="width: 50%; float: left;"> <div class="call-to-action-content" style="width: 50%; float: left;">
<h3><strong>Powered</strong> by OpenShot Cloud API</h3> <h3><strong>simple-editor</strong></h3>
<p>Fast, easy, and affordable cloud video editing!</p> <p>Free & Open-Source Cloud Video Editor</p>
</div> </div>
<!-- Learn more buttons --> <!-- Learn more buttons -->
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
<a class="btn btn-lg btn-primary" href="//openshot.org/cloud-api/" target="_blank" style="margin: 5px;"><i class="fa fa-compass"></i> <a class="btn btn-lg btn-primary" href="//openshot.org/cloud-api/" target="_blank" style="margin: 5px;"><i class="fa fa-compass"></i>
<strong>Learn More</strong> <strong>Learn More</strong>
</a> </a>
<a class="btn btn-lg btn-primary launch-instance" href="http://gitlab.openshot.org/public-projects/simple-editor/" target="_blank" style="margin: 5px; background-color: #ffffff;" title="Source Code"><img src="//gitlab.openshot.org/assets/favicon-075eba76312e8421991a0c1f89a89ee81678bcde72319dd3e8047e2a47cd3a42.ico"></a>
<a class="btn btn-lg btn-primary launch-instance" href="https://aws.amazon.com/marketplace/pp/B074H87FSJ/" target="_blank" style="margin: 5px; background-color: #ffffff;" title="Launch Instance: AWS"><img src="//cdn.openshot.org/static/img/icons/aws.png"></a> <a class="btn btn-lg btn-primary launch-instance" href="https://aws.amazon.com/marketplace/pp/B074H87FSJ/" target="_blank" style="margin: 5px; background-color: #ffffff;" title="Launch Instance: AWS"><img src="//cdn.openshot.org/static/img/icons/aws.png"></a>
<a class="btn btn-lg btn-primary launch-instance" href="https://azuremarketplace.microsoft.com/en-us/marketplace/apps/openshotstudiosllc.openshot-cloud-api" target="_blank" style="margin: 5px; background-color: #ffffff;" title="Launch Instance: Azure"><img src="//cdn.openshot.org/static/img/icons/azure.png"> <a class="btn btn-lg btn-primary launch-instance" href="https://azuremarketplace.microsoft.com/en-us/marketplace/apps/openshotstudiosllc.openshot-cloud-api" target="_blank" style="margin: 5px; background-color: #ffffff;" title="Launch Instance: Azure"><img src="//cdn.openshot.org/static/img/icons/azure.png">
</a> </a>
...@@ -23,10 +25,17 @@ ...@@ -23,10 +25,17 @@
<div class="row"> <div class="row">
<div class="col-md-12 ms-5 me-5"> <div class="col-md-12 ms-5 me-5">
<p class="lead"> <p class="lead">
Simple <strong>RESTful</strong> interface, <strong>pay-as-you-go</strong> pricing, and industry leading video A simple video editor built with JavaScript, Node.js, and Vue 3 (powered by
editing capabilities. Easily create video templates in <a href="//openshot.org" target="_blank">OpenShot Video Editor</a>, our <a href="https://www.openshot.org/cloud-api/">OpenShot Cloud API</a>).
<strong>award-winning</strong> free, open-source desktop video editor, and modify them using our Cloud API.
Editing videos <strong>in the cloud</strong> has never been easier! This is a demo application for OpenShot Cloud API. You can log-in, upload files,
create/edit clips, move clips (up/down), export, and download a video.
</p>
<p class="lead">
You can check out the hosted version of this app:
<a href="https://cloud.openshot.org/apps/simple-editor/">https://cloud.openshot.org/apps/simple-editor/</a><br/>
You can also clone the source code (MIT license), or contribute to this project:
<a href="http://gitlab.openshot.org/public-projects/simple-editor">http://gitlab.openshot.org/public-projects/simple-editor/</a>
</p> </p>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment