aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay A <vraravam@users.noreply.github.com>2022-05-03 13:34:12 -0500
committerLibravatar Vijay A <vraravam@users.noreply.github.com>2022-05-03 13:34:12 -0500
commit6b0c5aa8a455f571e58040a5dee04f917bb87c1e (patch)
treef7e039a357df153d4766f54410320a9d0b751074
parentRenamed 'master' branch to 'main' for the 'recipes' submodule (diff)
downloadferdium-server-6b0c5aa8a455f571e58040a5dee04f917bb87c1e.tar.gz
ferdium-server-6b0c5aa8a455f571e58040a5dee04f917bb87c1e.tar.zst
ferdium-server-6b0c5aa8a455f571e58040a5dee04f917bb87c1e.zip
Renamed 'master' branch to 'main'
-rw-r--r--.do/deploy.template.yaml2
-rw-r--r--.github/workflows/docker.yml2
-rw-r--r--README.md4
-rw-r--r--docker/README.md8
-rw-r--r--resources/views/layouts/v2.edge2
-rw-r--r--resources/views/others/new.edge2
6 files changed, 10 insertions, 10 deletions
diff --git a/.do/deploy.template.yaml b/.do/deploy.template.yaml
index f4321fd..eae9e22 100644
--- a/.do/deploy.template.yaml
+++ b/.do/deploy.template.yaml
@@ -13,7 +13,7 @@ spec:
13 services: 13 services:
14 - dockerfile_path: Dockerfile 14 - dockerfile_path: Dockerfile
15 git: 15 git:
16 branch: master 16 branch: main
17 repo_clone_url: https://github.com/ferdium/ferdium-server.git 17 repo_clone_url: https://github.com/ferdium/ferdium-server.git
18 envs: 18 envs:
19 - key: DB_HOST 19 - key: DB_HOST
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index bc9b3f4..a06726b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -3,7 +3,7 @@ name: Docker Build and Publish
3on: 3on:
4 push: 4 push:
5 branches: 5 branches:
6 - 'master' 6 - 'main'
7 7
8jobs: 8jobs:
9 docker: 9 docker:
diff --git a/README.md b/README.md
index 1189c8a..0031e5f 100644
--- a/README.md
+++ b/README.md
@@ -134,7 +134,7 @@ Please refer to <https://github.com/getferdi/ferdi/wiki/Transferring-data-betwee
134<summary>Creating and using custom recipes</summary> 134<summary>Creating and using custom recipes</summary>
135Ferdium-server allows to extends the Franz/Ferdi recipe catalogue with custom Ferdium recipes. 135Ferdium-server allows to extends the Franz/Ferdi recipe catalogue with custom Ferdium recipes.
136 136
137For documentation on how to create a recipe, please visit [the official guide](https://github.com/ferdium/ferdium-recipes/blob/master/docs/integration.md). 137For documentation on how to create a recipe, please visit [the official guide](https://github.com/ferdium/ferdium-recipes/blob/main/docs/integration.md).
138 138
139To add your recipe to Ferdium-server, open `http://[YOUR FERDIUM-SERVER]/new` in your browser. You can now define the following settings: 139To add your recipe to Ferdium-server, open `http://[YOUR FERDIUM-SERVER]/new` in your browser. You can now define the following settings:
140 140
@@ -142,7 +142,7 @@ To add your recipe to Ferdium-server, open `http://[YOUR FERDIUM-SERVER]/new` in
142- `Name`: Name for your new service. Can contain spaces and unicode characters 142- `Name`: Name for your new service. Can contain spaces and unicode characters
143- `Service ID`: Unique ID for this recipe. Does not contain spaces or special characters (e.g. `google-drive`) 143- `Service ID`: Unique ID for this recipe. Does not contain spaces or special characters (e.g. `google-drive`)
144- `Link to SVG image`: Direct link to a 1024x1024 SVG image that is used as a logo inside the store. Please use jsDelivr when using a file uploaded to GitHub as raw.githubusercontent files won't load 144- `Link to SVG image`: Direct link to a 1024x1024 SVG image that is used as a logo inside the store. Please use jsDelivr when using a file uploaded to GitHub as raw.githubusercontent files won't load
145- `Recipe files`: Recipe files that you created using the [recipe creation guide](https://github.com/ferdium/ferdium-recipes/blob/master/docs/integration.md). Please do _not_ package your files beforehand - upload the raw files (you can drag and drop multiple files). Ferdium-server will automatically package and store the recipe in the right format. Please also do not drag and drop or select the whole folder, select the individual files. 145- `Recipe files`: Recipe files that you created using the [recipe creation guide](https://github.com/ferdium/ferdium-recipes/blob/main/docs/integration.md). Please do _not_ package your files beforehand - upload the raw files (you can drag and drop multiple files). Ferdium-server will automatically package and store the recipe in the right format. Please also do not drag and drop or select the whole folder, select the individual files.
146 146
147</details> 147</details>
148<details> 148<details>
diff --git a/docker/README.md b/docker/README.md
index fd5debb..2db02cb 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -63,7 +63,7 @@ To create the docker container with the proper parameters:
63 63
64### docker-compose 64### docker-compose
65 65
66You can use the provided sample [docker-compose.yml](https://github.com/ferdium/ferdium-server/tree/master/docker/docker-compose.yml) if you are happy with the default environment variables. This will pull the latest image from Docker Hub or use a local copy of the image, which you can build using the instructions provided in the [Building locally section](#building-locally). 66You can use the provided sample [docker-compose.yml](https://github.com/ferdium/ferdium-server/tree/main/docker/docker-compose.yml) if you are happy with the default environment variables. This will pull the latest image from Docker Hub or use a local copy of the image, which you can build using the instructions provided in the [Building locally section](#building-locally).
67 67
68To start the application, use `docker-compose -f docker/docker-compose.yml up -d`. 68To start the application, use `docker-compose -f docker/docker-compose.yml up -d`.
69The server will be launched at [http://localhost:3333/](http://localhost:3333/) address. 69The server will be launched at [http://localhost:3333/](http://localhost:3333/) address.
@@ -188,14 +188,14 @@ Please refer to <https://github.com/getferdi/ferdi/wiki/Transferring-data-betwee
188 188
189Ferdium-server allows to extends the Franz recipe catalogue with custom Ferdi recipes. 189Ferdium-server allows to extends the Franz recipe catalogue with custom Ferdi recipes.
190 190
191For documentation on how to create a recipe, please visit [the official guide](https://github.com/ferdium/ferdium-recipes/blob/master/docs/integration.md). 191For documentation on how to create a recipe, please visit [the official guide](https://github.com/ferdium/ferdium-recipes/blob/main/docs/integration.md).
192 192
193To add your recipe to Ferdium-server, open `http://[YOUR FERDIUM-SERVER]/new` in your browser. You can now define the following settings: 193To add your recipe to Ferdium-server, open `http://[YOUR FERDIUM-SERVER]/new` in your browser. You can now define the following settings:
194- `Author`: Author who created the recipe 194- `Author`: Author who created the recipe
195- `Name`: Name for your new service. Can contain spaces and unicode characters 195- `Name`: Name for your new service. Can contain spaces and unicode characters
196- `Service ID`: Unique ID for this recipe. Does not contain spaces or special characters (e.g. `google-drive`) 196- `Service ID`: Unique ID for this recipe. Does not contain spaces or special characters (e.g. `google-drive`)
197- `Link to PNG/SVG image`: Direct link to a 1024x1024 PNG image and SVG that is used as a logo inside the store. Please use jsDelivr when using a file uploaded to GitHub as raw.githubusercontent files won't load 197- `Link to PNG/SVG image`: Direct link to a 1024x1024 PNG image and SVG that is used as a logo inside the store. Please use jsDelivr when using a file uploaded to GitHub as raw.githubusercontent files won't load
198- `Recipe files`: Recipe files that you created using the [recipe creation guide](https://github.com/ferdium/ferdium-recipes/blob/master/docs/integration.md). Please do *not* package your files beforehand - upload the raw files (you can drag and drop multiple files). Ferdium-server will automatically package and store the recipe in the right format. Please also do not drag and drop or select the whole folder, select the individual files. 198- `Recipe files`: Recipe files that you created using the [recipe creation guide](https://github.com/ferdium/ferdium-recipes/blob/main/docs/integration.md). Please do *not* package your files beforehand - upload the raw files (you can drag and drop multiple files). Ferdium-server will automatically package and store the recipe in the right format. Please also do not drag and drop or select the whole folder, select the individual files.
199 199
200### Listing custom recipes 200### Listing custom recipes
201 201
@@ -227,7 +227,7 @@ Below are the instructions for updating the container to get the most recent ver
227 227
228## Building locally 228## Building locally
229 229
230If you want to build this image locally, please run this command from root of [Ferdium-server repository](https://github.com/ferdium/ferdium-server/tree/master/): 230If you want to build this image locally, please run this command from root of [Ferdium-server repository](https://github.com/ferdium/ferdium-server/tree/main/):
231``` 231```
232docker build \ 232docker build \
233 --no-cache \ 233 --no-cache \
diff --git a/resources/views/layouts/v2.edge b/resources/views/layouts/v2.edge
index 312ed67..38af29f 100644
--- a/resources/views/layouts/v2.edge
+++ b/resources/views/layouts/v2.edge
@@ -16,7 +16,7 @@
16 <div class="flex flex-col h-screen"> 16 <div class="flex flex-col h-screen">
17 <div class="bg-black"> 17 <div class="bg-black">
18 <div class="flex flex-row items-center container px-20 mx-auto"> 18 <div class="flex flex-row items-center container px-20 mx-auto">
19 <a href="/"><img width="50" class="my-4 mr-10" src="https://github.com/ferdium/ferdium-server/raw/master/logo.png"></a> 19 <a href="/"><img width="50" class="my-4 mr-10" src="https://github.com/ferdium/ferdium-server/raw/main/logo.png"></a>
20 <a class="github-button" href="https://github.com/ferdium/ferdium-server" data-icon="octicon-star" data-show-count="true" aria-label="Star ferdium/ferdium-server on GitHub">Star</a> 20 <a class="github-button" href="https://github.com/ferdium/ferdium-server" data-icon="octicon-star" data-show-count="true" aria-label="Star ferdium/ferdium-server on GitHub">Star</a>
21 </div> 21 </div>
22 </div> 22 </div>
diff --git a/resources/views/others/new.edge b/resources/views/others/new.edge
index 1bfd46f..ed97a34 100644
--- a/resources/views/others/new.edge
+++ b/resources/views/others/new.edge
@@ -2,7 +2,7 @@
2 2
3@section('content') 3@section('content')
4<h1>Create a new recipe</h1> 4<h1>Create a new recipe</h1>
5<p>Please create a recipe using <a href="https://github.com/ferdium/ferdium-recipes/blob/master/docs/integration.md">the 5<p>Please create a recipe using <a href="https://github.com/ferdium/ferdium-recipes/blob/main/docs/integration.md">the
6 official guide</a>, then publish it here.</p> 6 official guide</a>, then publish it here.</p>
7<form action="new" method="post" enctype="multipart/form-data"> 7<form action="new" method="post" enctype="multipart/form-data">
8 <label for="author">Author</label><br /> 8 <label for="author">Author</label><br />