Skip to content

Commit

Permalink
Merge pull request #41 from growilabs/support/release-july-first
Browse files Browse the repository at this point in the history
support: Release July first
  • Loading branch information
satof3 authored Jul 1, 2024
2 parents 3da9e8a + 916a55f commit 841b267
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 43 deletions.
42 changes: 21 additions & 21 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
MIT License
Copyright (c) 2018 WESEEK, Inc.
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.
MIT License

Copyright (c) 2024 GROWI, Inc.

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.
12 changes: 6 additions & 6 deletions docs/.vuepress/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,20 @@ module.exports = ctx => ({
['meta', { name: 'viewport', content: 'width=device-width, initial-scale=1'}],
['meta', { name: 'description', content: 'Team Collaboration Software using markdown'}],
['meta', { name: 'keywords', content: 'markdown, wiki, javascript, react, growi, crowi'}],
['meta', { name: 'author', content: 'WESEEK, Inc.'}],
['meta', { name: 'author', content: 'GROWI, Inc.'}],
// OGP
['meta', { property: 'og:title', content: 'OSS開発wikiツールのGROWI | 快適な情報共有を、全ての人へ'}],
['meta', { property: 'og:description', content: 'GROWIはWESEEKが開発を行い、MITライセンスで公開しているオープンソースソフトウェアです。 dockerへのインストールやオンプレ対応も可能です。 開発を手伝っていただけるコントリビューター、開発してみたいインターン生も募集しています。'}],
['meta', { property: 'og:description', content: 'GROWIはGROWI, Inc.が開発を行い、MITライセンスで公開しているオープンソースソフトウェアです。 dockerへのインストールやオンプレ対応も可能です。 開発を手伝っていただけるコントリビューター、開発してみたいインターン生も募集しています。'}],
['meta', { property: 'og:image', content: 'https://growi.org/assets/images/ogp-logo.png'}],
// Twitter
['meta', { name: 'twitter:card', content: 'summary'}],
['meta', { name: 'twitter:title', content: 'OSS開発wikiツールのGROWI | 快適な情報共有を、全ての人へ'}],
['meta', { name: 'twitter:description', content: 'GROWIはWESEEKが開発を行い、MITライセンスで公開しているオープンソースソフトウェアです。 dockerへのインストールやオンプレ対応も可能です。 開発を手伝っていただけるコントリビューター、開発してみたいインターン生も募集しています。'}],
['meta', { name: 'twitter:description', content: 'GROWIはGROWI, Inc.が開発を行い、MITライセンスで公開しているオープンソースソフトウェアです。 dockerへのインストールやオンプレ対応も可能です。 開発を手伝っていただけるコントリビューター、開発してみたいインターン生も募集しています。'}],
['meta', { name: 'twitter:image', content: 'https://growi.org/assets/images/ogp-logo.png'}],
['link', { href: 'https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.2/animate.min.css', rel: 'stylesheet'}],
// Fonts
['link', { href: 'https://fonts.googleapis.com/css?family=Lato:300,400,400italic,700', rel: 'stylesheet', type: 'text/css'}],
['link', { href: 'https://use.fontawesome.com/releases/v6.2.0/css/all.css', rel: 'stylesheet'}],
['link', { href: 'https://use.fontawesome.com/releases/v6.5.2/css/all.css', rel: 'stylesheet'}],
['link', { href: 'https://cdn.linearicons.com/free/1.0.0/icon-font.min.css', rel: 'stylesheet'}],
['link', { href: 'https://fonts.googleapis.com/css2?family=Montserrat:wght@400;600&display=swap', rel: 'stylesheet', type: 'text/css'}],
['link', { href: 'https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@100;300;400;500;700;900&display=swap', rel: 'stylesheet'}],
Expand All @@ -60,12 +60,12 @@ module.exports = ctx => ({
'/en/': {
lang: 'en-US',
title: 'OSS wiki tool GROWI | Easy and Smooth Information Sharing For Everyone',
description: 'GROWI is open source software developed by WESEEK and released under the MIT license. Installation on docker and on-premise support are also possible. We are also looking for contributors who can help with the development and internship students who want to develop.'
description: 'GROWI is open source software developed by GROWI, Inc. and released under the MIT license. Installation on docker and on-premise support are also possible. We are also looking for contributors who can help with the development and internship students who want to develop.'
},
'/ja/': {
lang: 'ja',
title: 'OSS開発wikiツールのGROWI | 快適な情報共有を、全ての人へ',
description: 'GROWIはWESEEKが開発を行い、MITライセンスで公開しているオープンソースソフトウェアです。 dockerへのインストールやオンプレ対応も可能です。 開発を手伝っていただけるコントリビューター、開発してみたいインターン生も募集しています。'
description: 'GROWIはGROWI, Inc.が開発を行い、MITライセンスで公開しているオープンソースソフトウェアです。 dockerへのインストールやオンプレ対応も可能です。 開発を手伝っていただけるコントリビューター、開発してみたいインターン生も募集しています。'
}
},
themeConfig: {
Expand Down
2 changes: 1 addition & 1 deletion docs/.vuepress/public/assets/js/map.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $(function () {
});

var contentString = '<div class="info-window">' +
'<h4>WESEEK, Inc.</h4>' +
'<h4>GROWI, Inc.</h4>' +
'<div class="info-content">' +
'<p>あそびにきてね</p>' +
'</div>' +
Expand Down
10 changes: 6 additions & 4 deletions docs/.vuepress/theme/components/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -261,13 +261,12 @@
<li><a href="https://github.com/weseek/growi-docker-compose" target="_blank"><i class="fab fa-github me-1"></i> weseek/growi-docker-compose</a></li>
<li><a href="https://hub.docker.com/r/weseek/growi/" target="_blank"><i class="fab fa-docker me-1"></i>Docker Hub</a></li>
<li><a href="https://demo.growi.org" target="_blank">demo.growi.org</a></li>
<li><a href="https://weseek.co.jp/tech/category/growi/" target="_blank">Tech Blog</a></li>
</ul>
<p></p>
</div>
<div class="col-sm-6 col-md-4 mt-4 mt-md-0">
<div class="widget-title">
<h3 class="mb-3">WESEEK,Inc.</h3>
<h3 class="mb-3">GROWI, Inc.</h3>
<h4 class="fs-6 text-white mb-0">CONTACT US</h4>
</div>
<ul class="mt-4">
Expand All @@ -293,9 +292,12 @@
<!-- footer social icons right -->
<footer class="d-flex justify-content-between align-items-center">
<p class="ms-3">
© 2018 GROWI - produced by <a :href="data.links.weseek" target="_blank">WESEEK, Inc.</a>
© 2024 GROWI - produced by <a :href="data.links.growi" target="_blank">GROWI, Inc.</a>
</p>
<a href="https://github.com/weseek" class="ms-auto me-3" target="_blank"><i class="fab fa-github fs-4"></i></a>
<div class="d-flex">
<a href="https://github.com/weseek" class="ms-auto me-3" target="_blank"><i class="fab fa-github fs-4"></i></a>
<a href="https://x.com/GrowiDev" class="ms-auto me-3" target="_blank"><i class="fab fa-x-twitter fs-4"></i></a>
</div>
</footer><!-- / footer social icons right -->

<!-- javascript -->
Expand Down
2 changes: 1 addition & 1 deletion docs/.vuepress/theme/components/NavLinks.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/>
</div>
<div class="nav-item">
<a href="https://github.com/weseek/growi/" target="_blank">
<a href="https://github.com/weseek/growi" target="_blank">
<i class="fab fa-lg fa-github"></i><a class="d-md-none ms-2">GitHub</a>
</a>
<a :href="data.links.admin_guide" target="_blank" class="btn btn-bg-green-gradient text-white fw-bold ms-4 mt-5 mt-md-0 rounded-1">
Expand Down
2 changes: 1 addition & 1 deletion docs/.vuepress/theme/components/Navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ $navbar-vertical-padding = 0.7rem
$navbar-horizontal-padding = 1.5rem
.navbar
// WESEEK Custom
// GROWI Custom
padding $navbar-vertical-padding $navbar-horizontal-padding
line-height $navbarHeight - 1.4rem
box-shadow 0px 0px 3px #808080
Expand Down
2 changes: 1 addition & 1 deletion docs/.vuepress/theme/styles/index.styl
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ body

a
font-weight 500
// WESEEK Custom
// GROWI Custom
color #185FA5
text-decoration none

Expand Down
8 changes: 4 additions & 4 deletions docs/en/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ heroButtons:
links:
admin_guide: https://docs.growi.org/en/admin-guide/
docs: https://docs.growi.org/en/
weseek: https://weseek.co.jp/en/
growi: https://growi.co.jp/
sections:
introduction:
title: Open Source GROWI
text: GROWI.cloud is open software developed by WESEEK, Inc. <br class="d-none d-md-block" /> And released under MIT license.
text: GROWI.cloud is open software developed by GROWI, Inc. <br class="d-none d-md-block" /> And released under MIT license.
community:
title: Community-support
text: We are accepting questions, request and report of bug on our GItHub or Slack.
Expand All @@ -40,10 +40,10 @@ sections:
button_text: Here is more details
joinus:
title: JOIN US
descriptions: GROWI is open source software developed by <a href="https://weseek.co.jp/en" target="_blank">WESEEK, Inc</a> . and released under the MIT license. We are looking for contributors who can help with development and interns who want to develop. <br/> First join Slack and feel free to talk to the WESEEK members.
descriptions: GROWI is open source software developed by <a href="https://growi.co.jp" target="_blank">GROWI, Inc</a> . and released under the MIT license. We are looking for contributors who can help with development and interns who want to develop. <br/> First join Slack and feel free to talk to the GROWI members.
contact_us:
address: Takadanobaba Access 10F, 2-20-15 Nishiwaseda, <br /> Shinjuku-ku, Tokyo, Japan
email: info@weseek.co.jp
email: contact@growi.co.jp
button:
start: Starting GROWI
features:
Expand Down
8 changes: 4 additions & 4 deletions docs/ja/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ heroButtons:
links:
admin_guide: https://docs.growi.org/ja/admin-guide/
docs: https://docs.growi.org/ja/
weseek: https://weseek.co.jp/ja/
growi: https://growi.co.jp/
sections:
introduction:
title: オープンソース GROWI
text: GROWI は、WESEEK, Inc. が開発を行い、<br class="d-none d-md-block" /> MITライセンスで公開しているオープンソースソフトウェアです。 <br class="d-none d-md-block" /> ユーザーの方も加わった開発が日々活発に行われています。
text: GROWI は、GROWI, Inc. が開発を行い、<br class="d-none d-md-block" /> MITライセンスで公開しているオープンソースソフトウェアです。 <br class="d-none d-md-block" /> ユーザーの方も加わった開発が日々活発に行われています。
community:
title: コミュニティ・サポート
text: GROWIに関する質問・要望・バグの報告は、 <br /> GitHubまたはSlackにて受け付けております。
Expand All @@ -40,13 +40,13 @@ sections:
button_text: 詳細はこちら
joinus:
title: JOIN US
descriptions: GROWI の開発を手伝っていただけるコントリビューター、開発してみたいインターン生を募集しています。 <br /> まずは Slack に参加し、気軽にWESEEKメンバーに声をかけてください
descriptions: GROWI の開発を手伝っていただけるコントリビューター、開発してみたいインターン生を募集しています。 <br /> まずは Slack に参加し、気軽にGROWIメンバーに声をかけてください
contact_us:
address: 東京都新宿区西早稲田2-20-15 <br /> 高田馬場アクセス10F
tel:
text: 03-6233-9447
link: 0362339447
email: info@weseek.co.jp
email: contact@growi.co.jp
button:
start: GROWIを始める
features:
Expand Down

0 comments on commit 841b267

Please sign in to comment.