Skip to content

Commit

Permalink
Change LICENSE from AGPL-3.0-or-later to MIT. v5.15.8
Browse files Browse the repository at this point in the history
  • Loading branch information
winlinvip committed Jun 24, 2024
1 parent 4df058b commit edc8519
Show file tree
Hide file tree
Showing 70 changed files with 156 additions and 796 deletions.
1 change: 1 addition & 0 deletions DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -1189,6 +1189,7 @@ The following are the update records for the Oryx server.
* Camera: Support multiple camera streaming. [v5.15.5](https://github.com/ossrs/oryx/releases/tag/v5.15.5)
* Transcript: Upgrade the hls.js to 1.4 for WebVTT. v5.15.6
* Disable version query and check. v5.15.7
* Change LICENSE from AGPL-3.0-or-later to MIT. v5.15.8
* v5.14:
* Merge features and bugfix from releases. v5.14.1
* Dubbing: Support VoD dubbing for multiple languages. [v5.14.2](https://github.com/ossrs/oryx/releases/tag/v5.14.2)
Expand Down
681 changes: 20 additions & 661 deletions LICENSE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ The features that we're developing:

## License

Oryx is an open-source project, licensed under the [AGPL-3.0-or-later](https://spdx.org/licenses/AGPL-3.0-or-later.html) license.
Oryx is an open-source project, licensed under the [MIT](https://spdx.org/licenses/MIT.html) license.

## Developer

Expand Down
4 changes: 2 additions & 2 deletions platform/callback.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions platform/camera-live-stream.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions platform/candidate.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions platform/cert.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions platform/crontab.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions platform/dvr-local-disk.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions platform/dvr-tencent-cos.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions platform/dvr-tencent-vod.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions platform/fastcache.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import "context"
Expand Down
4 changes: 2 additions & 2 deletions platform/forward.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions platform/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions platform/ocr.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions platform/report.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions platform/service.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions platform/srs-errors.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
package main

Expand Down
4 changes: 2 additions & 2 deletions platform/srs-hooks.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
package main

Expand Down
4 changes: 2 additions & 2 deletions platform/trancode.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions platform/transcript.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions platform/utils.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions platform/version.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
package main

Expand Down
4 changes: 2 additions & 2 deletions platform/virtual-live-stream.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
package main

import (
Expand Down
4 changes: 2 additions & 2 deletions releases/main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
package main

Expand Down
4 changes: 2 additions & 2 deletions releases/version.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
package main

Expand Down
4 changes: 2 additions & 2 deletions ui/src/App.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import React from 'react';
import axios from "axios";
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/DvrStatus.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import React from "react";
import {useNavigate} from "react-router-dom";
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/FileUploader.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import React from "react";
import {useErrorHandler} from "react-error-boundary";
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/IsMobile.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import React from "react";

Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/LanguageSwitch.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import React from 'react';
import {Dropdown, Navbar} from "react-bootstrap";
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/PopoverConfirm.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import React from "react";
import {Button, OverlayTrigger, Popover} from "react-bootstrap";
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/SetupCamSecret.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import React from "react";
import {Button, Form} from "react-bootstrap";
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/SrsEnvContext.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import React from 'react';

Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/SrsErrorBoundary.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import React from "react";
import {ErrorBoundary} from 'react-error-boundary';
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/SrsErrorBoundary.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import '@testing-library/jest-dom';
import { render, screen } from '@testing-library/react';
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/SrsQRCode.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import React from "react";
import QRCode from "react-qr-code";
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/SrsQRCode.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import '@testing-library/jest-dom';
import { render, screen } from '@testing-library/react';
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/SwitchConfirmButton.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import React from "react";
import {Button, OverlayTrigger, Popover} from "react-bootstrap";
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/TutorialsButton.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import React from "react";
import {Col, Row, Toast} from "react-bootstrap";
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/TutorialsText.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import React from "react";
import {Toast} from "react-bootstrap";
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/UrlGenerator.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import React from "react";
import {Token, StreamName} from "../utils";
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/VideoSourceSelector.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Copyright (c) 2022-2023 Winlin
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: AGPL-3.0-or-later
// SPDX-License-Identifier: MIT
//
import React from "react";
import {useTranslation} from "react-i18next";
Expand Down
Loading

0 comments on commit edc8519

Please sign in to comment.