Skip to content

Commit 32701e8

Browse files
committed
Merge branch 'main' into feat/audio-video-support
2 parents 0f951d8 + 6fb46dc commit 32701e8

File tree

246 files changed

+2981
-497
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+2981
-497
lines changed

demo/index.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<link rel="canonical" href="https://os.prozilla.dev/">
1010

1111
<!-- Favicon -->
12-
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=6">
13-
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?v=6">
14-
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?v=6">
15-
<link rel="icon" href="/favicon.ico?v=6" sizes="any">
16-
<link rel="icon" href="/icon.svg?v=6" type="image/svg+xml">
17-
<link rel="icon" href="/icon.png?v=6" type="image/png">
12+
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=7">
13+
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?v=7">
14+
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?v=7">
15+
<link rel="icon" href="/favicon.ico?v=7" sizes="any">
16+
<link rel="icon" href="/icon.svg?v=7" type="image/svg+xml">
17+
<link rel="icon" href="/icon.png?v=7" type="image/png">
1818
<link rel="manifest" href="/site.webmanifest?v=5">
1919
<meta name="apple-mobile-web-app-title" content="ProzillaOS">
2020
<meta name="application-name" content="ProzillaOS">
@@ -26,15 +26,15 @@
2626
<meta property="og:site_name" content="ProzillaOS"/>
2727
<meta property="og:description" content="ProzillaOS is an open-source web-based operating system inspired by Ubuntu Linux and Windows made with React.js by Prozilla."/>
2828
<meta property="og:type" content="website"/>
29-
<meta property="og:image" content="https://os.prozilla.dev/assets/banner-logo-title.png?v=6"/>
29+
<meta property="og:image" content="https://os.prozilla.dev/assets/banner-logo-title.png?v=7"/>
3030
<meta property="og:url" content="https://os.prozilla.dev/">
3131
<meta property="og:locale" content="en_US">
3232

3333
<!-- Twitter -->
3434
<meta name="twitter:title" content="ProzillaOS | Web-based Operating System"/>
3535
<meta name="twitter:description" content="ProzillaOS is an open-source web-based operating system inspired by Ubuntu Linux and Windows made with React.js by Prozilla."/>
3636
<meta name="twitter:card" content="summary_large_image"/>
37-
<meta name="twitter:image" content="https://os.prozilla.dev/assets/banner-logo-title.png?v=6"/>
37+
<meta name="twitter:image" content="https://os.prozilla.dev/assets/banner-logo-title.png?v=7"/>
3838
<meta name="twitter:url" content="https://os.prozilla.dev/">
3939

4040
<!-- Fonts -->

demo/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
"@fortawesome/fontawesome-svg-core": "^6.5.2",
2626
"@fortawesome/free-solid-svg-icons": "^6.5.2",
2727
"@fortawesome/react-fontawesome": "^0.2.2",
28-
"@prozilla-os/ball-maze": "latest",
28+
"@prozilla-os/ball-maze": "^1.0.7",
2929
"@prozilla-os/bliss-radio": "latest",
3030
"@prozilla-os/logic-sim": "workspace:*",
31-
"@prozilla-os/minesweeper": "latest",
31+
"@prozilla-os/minesweeper": "^1.0.7",
3232
"@prozilla-os/skins": "workspace:*",
33-
"@prozilla-os/wordle": "latest",
33+
"@prozilla-os/wordle": "^1.1.8",
3434
"@taygotfound/melodix": "latest",
3535
"prozilla-os": "workspace:*",
3636
"react": "^18.3.1",
2.5 KB
Loading
7.35 KB
Loading

demo/public/apple-touch-icon.png

1.63 KB
Loading
6 KB
Binary file not shown.
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
Copyright (c) <dates>, <Copyright Holder> (<URL|email>),
2+
with Reserved Font Name <Reserved Font Name>.
3+
Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>),
4+
with Reserved Font Name <additional Reserved Font Name>.
5+
Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>).
6+
7+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
8+
This license is copied below, and is also available with a FAQ at:
9+
http://scripts.sil.org/OFL
10+
11+
12+
-----------------------------------------------------------
13+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
14+
-----------------------------------------------------------
15+
16+
PREAMBLE
17+
The goals of the Open Font License (OFL) are to stimulate worldwide
18+
development of collaborative font projects, to support the font creation
19+
efforts of academic and linguistic communities, and to provide a free and
20+
open framework in which fonts may be shared and improved in partnership
21+
with others.
22+
23+
The OFL allows the licensed fonts to be used, studied, modified and
24+
redistributed freely as long as they are not sold by themselves. The
25+
fonts, including any derivative works, can be bundled, embedded,
26+
redistributed and/or sold with any software provided that any reserved
27+
names are not used by derivative works. The fonts and derivatives,
28+
however, cannot be released under any other type of license. The
29+
requirement for fonts to remain under this license does not apply
30+
to any document created using the fonts or their derivatives.
31+
32+
DEFINITIONS
33+
"Font Software" refers to the set of files released by the Copyright
34+
Holder(s) under this license and clearly marked as such. This may
35+
include source files, build scripts and documentation.
36+
37+
"Reserved Font Name" refers to any names specified as such after the
38+
copyright statement(s).
39+
40+
"Original Version" refers to the collection of Font Software components as
41+
distributed by the Copyright Holder(s).
42+
43+
"Modified Version" refers to any derivative made by adding to, deleting,
44+
or substituting -- in part or in whole -- any of the components of the
45+
Original Version, by changing formats or by porting the Font Software to a
46+
new environment.
47+
48+
"Author" refers to any designer, engineer, programmer, technical
49+
writer or other person who contributed to the Font Software.
50+
51+
PERMISSION & CONDITIONS
52+
Permission is hereby granted, free of charge, to any person obtaining
53+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
54+
redistribute, and sell modified and unmodified copies of the Font
55+
Software, subject to the following conditions:
56+
57+
1) Neither the Font Software nor any of its individual components,
58+
in Original or Modified Versions, may be sold by itself.
59+
60+
2) Original or Modified Versions of the Font Software may be bundled,
61+
redistributed and/or sold with any software, provided that each copy
62+
contains the above copyright notice and this license. These can be
63+
included either as stand-alone text files, human-readable headers or
64+
in the appropriate machine-readable metadata fields within text or
65+
binary files as long as those fields can be easily viewed by the user.
66+
67+
3) No Modified Version of the Font Software may use the Reserved Font
68+
Name(s) unless explicit written permission is granted by the corresponding
69+
Copyright Holder. This restriction only applies to the primary font name as
70+
presented to the users.
71+
72+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
73+
Software shall not be used to promote, endorse or advertise any
74+
Modified Version, except to acknowledge the contribution(s) of the
75+
Copyright Holder(s) and the Author(s) or with their explicit written
76+
permission.
77+
78+
5) The Font Software, modified or unmodified, in part or in whole,
79+
must be distributed entirely under this license, and must not be
80+
distributed under any other license. The requirement for fonts to
81+
remain under this license does not apply to any document created
82+
using the Font Software.
83+
84+
TERMINATION
85+
This license becomes null and void if any of the above conditions are
86+
not met.
87+
88+
DISCLAIMER
89+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
90+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
91+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
92+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
93+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
94+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
95+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
96+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
97+
OTHER DEALINGS IN THE FONT SOFTWARE.
42.4 KB
Binary file not shown.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Questions about license?
2+
See more details at https://fontsarena.com/licenses-explained/

0 commit comments

Comments
 (0)