Skip to content

Commit b0e47d7

Browse files
committed
Update dependencies, adjust readme and other config files
1 parent e9bab0f commit b0e47d7

9 files changed

+290
-310
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ body:
5656
id: linkace-version
5757
attributes:
5858
label: LinkAce version
59-
placeholder: v1.10.1
59+
placeholder: v2.0.2
6060
validations:
6161
required: true
6262
- type: dropdown

.github/dependabot.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ updates:
2929
- "patch"
3030

3131
- package-ecosystem: "docker"
32-
directory: "/"
32+
directory: "/resources/docker/dockerfiles"
3333
target-branch: "2.x"
34+
ignore:
35+
- dependency-name: "node"
3436
schedule:
3537
interval: "weekly"
3638
groups:

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ docker compose exec -it php composer install
4848
docker compose exec -it php php artisan key:generate
4949
```
5050

51-
Last step: compile all assets. Node 16 LTS is the minimum version required and recommended to use. You may use either
51+
Last step: compile all assets. Node 20 LTS is the minimum version required and recommended to use. You may use either
5252
NPM or Yarn for installing the asset dependencies.
5353

5454
```bash

README.md

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<p align="center"><b>:warning: CAUTION! THIS IS A DEVELOPMENT VERSION OF LINKACE! :warning:</b></p>
1+
<p align="center"><b>:warning: CAUTION! THIS IS A BETA VERSION OF LINKACE! :warning:</b></p>
22

33
<p align="center">
44
<img src="https://www.linkace.org/images/linkace-social.jpg" title="Linkace">
@@ -37,20 +37,21 @@ LinkAce ia a powerful, self-hosted solution for managing your personal link arch
3737

3838
#### Feature Highlights
3939

40+
* Multi-user support
4041
* Save links with automatic title and description generation.
4142
* Automated link monitoring informs you when any links become unavailable or were moved.
4243
* Automated archiving of saved sites via the [Internet Archive](https://web.archive.org/).
4344
* Organize bookmarks with the help of lists and tags.
4445
* A full REST API offers access to all features of LinkAce from other apps and services.
4546
* LinkAce is also [available on Zapier](https://zapier.com/apps/linkace/integrations) and integrates with over 2500+ applications.
47+
* OAuth and OIDC are supported for SSO login to LinkAce.
4648
* LinkAce ships with a light and dark theme, that can be toggled or changes automatically.
49+
* An advanced search including different filters and ordering.
4750
* A bookmarklet to quickly save links from any browser.
4851
* Links can be private or public, so friends or internet strangers may see your collection.
4952
* Both private and public links are accessible via RSS feeds.
50-
* Add notes to links to add thoughts or other relevant information.
51-
* An advanced search including different filters and ordering.
52-
* Import and export of bookmarks from HTML.
53-
* Support for complete database and application backups to any AWS S3 storage.
53+
* Import and export of bookmarks from and to HTML.
54+
* Support for complete database and application backups to any AWS S3-compatible storage.
5455

5556
More screenshots of the app and further details about the features can be found on the [LinkAce Website](https://www.linkace.org/).
5657

@@ -60,10 +61,10 @@ More screenshots of the app and further details about the features can be found
6061

6162
### :gear: Setup
6263

63-
LinkAce provides multiple ways of installing it on your server. The complete documentation for all installation methods can be found [**in the wiki**](https://www.linkace.org/docs/v1/setup/).
64+
LinkAce provides multiple ways of installing it on your server. The complete documentation for all installation methods can be found [**in the wiki**](https://www.linkace.org/docs/v2/setup/).
6465

65-
* [Setup with Docker](https://www.linkace.org/docs/v1/setup/setup-with-docker/) (_recommended_)
66-
* [Setup without Docker](https://www.linkace.org/docs/v1/setup/setup-without-docker/)
66+
* [Setup with Docker](https://www.linkace.org/docs/v2/setup/setup-with-docker/) (_recommended_)
67+
* [Setup without Docker](https://www.linkace.org/docs/v2/setup/setup-without-docker/)
6768

6869

6970
&nbsp;

composer.lock

+32-32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker-compose.production.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
version: "3"
2-
1+
---
32
services:
43

54
# --- MariaDB
65
db:
7-
image: docker.io/library/mariadb:11.2
6+
image: docker.io/library/mariadb:11.5
87
restart: unless-stopped
98
command: mariadbd --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
109
environment:
@@ -36,7 +35,7 @@ services:
3635

3736
# --- Redis
3837
redis:
39-
image: docker.io/bitnami/redis:7.2
38+
image: docker.io/bitnami/redis:7.4
4039
restart: unless-stopped
4140
environment:
4241
- REDIS_PASSWORD=${REDIS_PASSWORD}

docker-compose.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
---
2-
version: "3"
3-
42
services:
53

64
# --- MariaDB
75
db:
8-
image: docker.io/library/mariadb:11.2
6+
image: docker.io/library/mariadb:11.5
97
command: mariadbd --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
108
environment:
119
- MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
@@ -52,7 +50,7 @@ services:
5250

5351
# --- Redis
5452
redis:
55-
image: docker.io/bitnami/redis:7.2
53+
image: docker.io/bitnami/redis:7.4
5654
environment:
5755
- REDIS_PASSWORD=${REDIS_PASSWORD}
5856
ports:

0 commit comments

Comments
 (0)