mirror of https://github.com/LemmyNet/lemmy
Merge branch 'master' into federation_merge_from_master_2
commit
dc94e58cbf
@ -1 +1 @@
|
|||||||
v0.6.71
|
v0.7.0
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
[defaults]
|
[defaults]
|
||||||
inventory=inventory
|
inventory=inventory
|
||||||
|
interpreter_python=/usr/bin/python3
|
||||||
|
|
||||||
[ssh_connection]
|
[ssh_connection]
|
||||||
pipelining = True
|
pipelining = True
|
||||||
|
@ -1,79 +0,0 @@
|
|||||||
FROM node:10-jessie as node
|
|
||||||
|
|
||||||
WORKDIR /app/ui
|
|
||||||
|
|
||||||
# Cache deps
|
|
||||||
COPY ui/package.json ui/yarn.lock ./
|
|
||||||
RUN yarn install --pure-lockfile
|
|
||||||
|
|
||||||
# Build
|
|
||||||
COPY ui /app/ui
|
|
||||||
RUN yarn build
|
|
||||||
|
|
||||||
|
|
||||||
# contains qemu-*-static for cross-compilation
|
|
||||||
FROM multiarch/qemu-user-static as qemu
|
|
||||||
|
|
||||||
|
|
||||||
FROM arm64v8/rust:1.40-buster as rust
|
|
||||||
|
|
||||||
COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin
|
|
||||||
#COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
|
|
||||||
|
|
||||||
|
|
||||||
# Install musl
|
|
||||||
#RUN apt-get update && apt-get install -y mc
|
|
||||||
#RUN apt-get install -y musl-tools mc
|
|
||||||
#libpq-dev mc
|
|
||||||
#RUN rustup target add ${TARGET}
|
|
||||||
|
|
||||||
# Cache deps
|
|
||||||
WORKDIR /app
|
|
||||||
RUN USER=root cargo new server
|
|
||||||
WORKDIR /app/server
|
|
||||||
COPY server/Cargo.toml server/Cargo.lock ./
|
|
||||||
RUN mkdir -p ./src/bin \
|
|
||||||
&& echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
|
|
||||||
RUN cargo build --release
|
|
||||||
# RUN cargo build
|
|
||||||
COPY server/src ./src/
|
|
||||||
COPY server/migrations ./migrations/
|
|
||||||
RUN rm -f ./target/release/deps/lemmy_server* ; rm -f ./target/debug/deps/lemmy_server*
|
|
||||||
|
|
||||||
|
|
||||||
# build for release
|
|
||||||
RUN cargo build --frozen --release
|
|
||||||
# RUN cargo build --frozen
|
|
||||||
|
|
||||||
# Get diesel-cli on there just in case
|
|
||||||
# RUN cargo install diesel_cli --no-default-features --features postgres
|
|
||||||
|
|
||||||
# RUN cp /app/server/target/debug/lemmy_server /app/server/ready
|
|
||||||
RUN cp /app/server/target/release/lemmy_server /app/server/ready
|
|
||||||
|
|
||||||
#FROM alpine:3.10
|
|
||||||
# debian because build with dynamic linking with debian:buster
|
|
||||||
FROM arm64v8/debian:buster-slim as lemmy
|
|
||||||
|
|
||||||
#COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
|
|
||||||
COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin
|
|
||||||
|
|
||||||
# Install libpq for postgres
|
|
||||||
#RUN apk add libpq
|
|
||||||
RUN apt-get update && apt-get install -y libpq5
|
|
||||||
|
|
||||||
RUN addgroup --gid 1000 lemmy
|
|
||||||
# for alpine
|
|
||||||
#RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
|
|
||||||
# for debian
|
|
||||||
RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy
|
|
||||||
|
|
||||||
# Copy resources
|
|
||||||
COPY server/config/defaults.hjson /config/defaults.hjson
|
|
||||||
COPY --from=rust /app/server/ready /app/lemmy
|
|
||||||
COPY --from=node /app/ui/dist /app/dist
|
|
||||||
|
|
||||||
RUN chown lemmy:lemmy /app/lemmy
|
|
||||||
USER lemmy
|
|
||||||
EXPOSE 8536
|
|
||||||
CMD ["/app/lemmy"]
|
|
@ -1,79 +0,0 @@
|
|||||||
FROM node:10-jessie as node
|
|
||||||
|
|
||||||
WORKDIR /app/ui
|
|
||||||
|
|
||||||
# Cache deps
|
|
||||||
COPY ui/package.json ui/yarn.lock ./
|
|
||||||
RUN yarn install --pure-lockfile
|
|
||||||
|
|
||||||
# Build
|
|
||||||
COPY ui /app/ui
|
|
||||||
RUN yarn build
|
|
||||||
|
|
||||||
|
|
||||||
# contains qemu-*-static for cross-compilation
|
|
||||||
FROM multiarch/qemu-user-static as qemu
|
|
||||||
|
|
||||||
|
|
||||||
FROM arm32v7/rust:1.37-buster as rust
|
|
||||||
|
|
||||||
#COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin
|
|
||||||
COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
|
|
||||||
|
|
||||||
|
|
||||||
# Install musl
|
|
||||||
#RUN apt-get update && apt-get install -y mc
|
|
||||||
#RUN apt-get install -y musl-tools mc
|
|
||||||
#libpq-dev mc
|
|
||||||
#RUN rustup target add ${TARGET}
|
|
||||||
|
|
||||||
# Cache deps
|
|
||||||
WORKDIR /app
|
|
||||||
RUN USER=root cargo new server
|
|
||||||
WORKDIR /app/server
|
|
||||||
COPY server/Cargo.toml server/Cargo.lock ./
|
|
||||||
RUN mkdir -p ./src/bin \
|
|
||||||
&& echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
|
|
||||||
#RUN cargo build --release
|
|
||||||
# RUN cargo build
|
|
||||||
RUN RUSTFLAGS='-Ccodegen-units=1' cargo build
|
|
||||||
COPY server/src ./src/
|
|
||||||
COPY server/migrations ./migrations/
|
|
||||||
RUN rm -f ./target/release/deps/lemmy_server* ; rm -f ./target/debug/deps/lemmy_server*
|
|
||||||
|
|
||||||
|
|
||||||
# build for release
|
|
||||||
#RUN cargo build --frozen --release
|
|
||||||
RUN cargo build --frozen
|
|
||||||
|
|
||||||
# Get diesel-cli on there just in case
|
|
||||||
# RUN cargo install diesel_cli --no-default-features --features postgres
|
|
||||||
|
|
||||||
RUN cp /app/server/target/debug/lemmy_server /app/server/ready
|
|
||||||
#RUN cp /app/server/target/release/lemmy_server /app/server/ready
|
|
||||||
|
|
||||||
#FROM alpine:3.10
|
|
||||||
# debian because build with dynamic linking with debian:buster
|
|
||||||
FROM arm32v7/debian:buster-slim as lemmy
|
|
||||||
|
|
||||||
COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
|
|
||||||
|
|
||||||
# Install libpq for postgres
|
|
||||||
#RUN apk add libpq
|
|
||||||
RUN apt-get update && apt-get install -y libpq5
|
|
||||||
|
|
||||||
RUN addgroup --gid 1000 lemmy
|
|
||||||
# for alpine
|
|
||||||
#RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
|
|
||||||
# for debian
|
|
||||||
RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy
|
|
||||||
|
|
||||||
# Copy resources
|
|
||||||
COPY server/config/defaults.hjson /config/defaults.hjson
|
|
||||||
COPY --from=rust /app/server/ready /app/lemmy
|
|
||||||
COPY --from=node /app/ui/dist /app/dist
|
|
||||||
|
|
||||||
RUN chown lemmy:lemmy /app/lemmy
|
|
||||||
USER lemmy
|
|
||||||
EXPOSE 8536
|
|
||||||
CMD ["/app/lemmy"]
|
|
@ -1,88 +0,0 @@
|
|||||||
# can be build on x64, arm32, arm64 platforms
|
|
||||||
# to build on target platform run
|
|
||||||
# docker build -f Dockerfile.libc -t dessalines/lemmy:version ../..
|
|
||||||
#
|
|
||||||
# to use docker buildx run
|
|
||||||
# docker buildx build --platform linux/amd64,linux/arm64 -f Dockerfile.libc -t YOURNAME/lemmy --push ../..
|
|
||||||
|
|
||||||
FROM node:12-buster as node
|
|
||||||
# use this if use docker buildx
|
|
||||||
#FROM --platform=$BUILDPLATFORM node:12-buster as node
|
|
||||||
|
|
||||||
WORKDIR /app/ui
|
|
||||||
|
|
||||||
# Cache deps
|
|
||||||
COPY ui/package.json ui/yarn.lock ./
|
|
||||||
RUN yarn install --pure-lockfile --network-timeout 100000
|
|
||||||
|
|
||||||
# Build
|
|
||||||
COPY ui /app/ui
|
|
||||||
RUN yarn build
|
|
||||||
|
|
||||||
|
|
||||||
FROM rust:1.42 as rust
|
|
||||||
|
|
||||||
# Cache deps
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
RUN USER=root cargo new server
|
|
||||||
WORKDIR /app/server
|
|
||||||
COPY server/Cargo.toml server/Cargo.lock ./
|
|
||||||
RUN mkdir -p ./src/bin \
|
|
||||||
&& echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
|
|
||||||
|
|
||||||
|
|
||||||
RUN cargo build --release
|
|
||||||
#RUN cargo build && \
|
|
||||||
# rm -f ./target/release/deps/lemmy_server* ; rm -f ./target/debug/deps/lemmy_server*
|
|
||||||
COPY server/src ./src/
|
|
||||||
COPY server/migrations ./migrations/
|
|
||||||
|
|
||||||
|
|
||||||
# build for release
|
|
||||||
# workaround for https://github.com/rust-lang/rust/issues/62896
|
|
||||||
#RUN RUSTFLAGS='-Ccodegen-units=1' cargo build --release
|
|
||||||
RUN cargo build --release --frozen
|
|
||||||
#RUN cargo build --frozen
|
|
||||||
|
|
||||||
# Get diesel-cli on there just in case
|
|
||||||
# RUN cargo install diesel_cli --no-default-features --features postgres
|
|
||||||
|
|
||||||
# make result place always the same for lemmy container
|
|
||||||
RUN cp /app/server/target/release/lemmy_server /app/server/ready
|
|
||||||
#RUN cp /app/server/target/debug/lemmy_server /app/server/ready
|
|
||||||
|
|
||||||
|
|
||||||
FROM rust:1.42 as docs
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Build docs
|
|
||||||
COPY docs ./docs
|
|
||||||
RUN cargo install mdbook
|
|
||||||
RUN mdbook build docs/
|
|
||||||
|
|
||||||
|
|
||||||
#FROM alpine:3.10
|
|
||||||
# debian because build with dynamic linking with debian:buster
|
|
||||||
FROM debian:buster as lemmy
|
|
||||||
|
|
||||||
# Install libpq for postgres
|
|
||||||
#RUN apk add libpq
|
|
||||||
RUN apt-get update && apt-get install -y libpq5
|
|
||||||
RUN addgroup --gid 1000 lemmy
|
|
||||||
# for alpine
|
|
||||||
#RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
|
|
||||||
# for debian
|
|
||||||
RUN adduser --disabled-password --shell /bin/sh --uid 1000 --ingroup lemmy lemmy
|
|
||||||
|
|
||||||
# Copy resources
|
|
||||||
COPY server/config/defaults.hjson /config/defaults.hjson
|
|
||||||
COPY --from=node /app/ui/dist /app/dist
|
|
||||||
COPY --from=docs /app/docs/book/ /app/dist/documentation/
|
|
||||||
COPY --from=rust /app/server/ready /app/lemmy
|
|
||||||
|
|
||||||
RUN chown lemmy:lemmy /app/lemmy
|
|
||||||
USER lemmy
|
|
||||||
EXPOSE 8536
|
|
||||||
CMD ["/app/lemmy"]
|
|
@ -1,2 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
export COMPOSE_DOCKER_CLI_BUILD=1
|
||||||
|
export DOCKER_BUILDKIT=1
|
||||||
docker-compose up -d --no-deps --build
|
docker-compose up -d --no-deps --build
|
||||||
|
@ -0,0 +1,64 @@
|
|||||||
|
ARG RUST_BUILDER_IMAGE=shtripok/rust-musl-builder:arm
|
||||||
|
|
||||||
|
FROM $RUST_BUILDER_IMAGE as rust
|
||||||
|
|
||||||
|
#ARG RUSTRELEASEDIR="debug"
|
||||||
|
ARG RUSTRELEASEDIR="release"
|
||||||
|
|
||||||
|
# Cache deps
|
||||||
|
WORKDIR /app
|
||||||
|
RUN sudo chown -R rust:rust .
|
||||||
|
RUN USER=root cargo new server
|
||||||
|
WORKDIR /app/server
|
||||||
|
COPY --chown=rust:rust server/Cargo.toml server/Cargo.lock ./
|
||||||
|
#RUN sudo chown -R rust:rust .
|
||||||
|
RUN mkdir -p ./src/bin \
|
||||||
|
&& echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
|
||||||
|
RUN cargo build --release
|
||||||
|
RUN rm -f ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/deps/lemmy_server*
|
||||||
|
COPY --chown=rust:rust server/src ./src/
|
||||||
|
COPY --chown=rust:rust server/migrations ./migrations/
|
||||||
|
|
||||||
|
# build for release
|
||||||
|
# workaround for https://github.com/rust-lang/rust/issues/62896
|
||||||
|
RUN cargo build --frozen --release
|
||||||
|
|
||||||
|
# reduce binary size
|
||||||
|
RUN strip ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server
|
||||||
|
|
||||||
|
RUN cp ./target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR/lemmy_server /app/server/
|
||||||
|
|
||||||
|
FROM $RUST_BUILDER_IMAGE as docs
|
||||||
|
WORKDIR /app
|
||||||
|
COPY --chown=rust:rust docs ./docs
|
||||||
|
RUN mdbook build docs/
|
||||||
|
|
||||||
|
FROM node:12-buster as node
|
||||||
|
|
||||||
|
WORKDIR /app/ui
|
||||||
|
|
||||||
|
# Cache deps
|
||||||
|
COPY ui/package.json ui/yarn.lock ./
|
||||||
|
RUN yarn install --pure-lockfile --network-timeout 600000
|
||||||
|
|
||||||
|
# Build
|
||||||
|
COPY ui /app/ui
|
||||||
|
RUN yarn build
|
||||||
|
|
||||||
|
FROM alpine:3.12 as lemmy
|
||||||
|
|
||||||
|
# Install libpq for postgres
|
||||||
|
RUN apk add libpq
|
||||||
|
RUN addgroup -g 1000 lemmy
|
||||||
|
RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
|
||||||
|
|
||||||
|
# Copy resources
|
||||||
|
COPY --chown=lemmy:lemmy server/config/defaults.hjson /config/defaults.hjson
|
||||||
|
COPY --chown=lemmy:lemmy --from=rust /app/server/lemmy_server /app/lemmy
|
||||||
|
COPY --chown=lemmy:lemmy --from=docs /app/docs/book/ /app/dist/documentation/
|
||||||
|
COPY --chown=lemmy:lemmy --from=node /app/ui/dist /app/dist
|
||||||
|
|
||||||
|
RUN chown lemmy:lemmy /app/lemmy
|
||||||
|
USER lemmy
|
||||||
|
EXPOSE 8536
|
||||||
|
CMD ["/app/lemmy"]
|
@ -0,0 +1,60 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
if [[ $(id -u) != 0 ]]; then
|
||||||
|
echo "This migration needs to be run as root"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ! -f docker-compose.yml ]]; then
|
||||||
|
echo "No docker-compose.yml found in current directory. Is this the right folder?"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Fixing pictrs permissions
|
||||||
|
mkdir -p volumes/pictrs
|
||||||
|
sudo chown -R 991:991 volumes/pictrs
|
||||||
|
|
||||||
|
echo "Restarting docker-compose, making sure that pictrs is started and pictshare is removed"
|
||||||
|
docker-compose up -d --remove-orphans
|
||||||
|
|
||||||
|
if [[ -z $(docker-compose ps | grep pictrs) ]]; then
|
||||||
|
echo "Pict-rs is not running, make sure you update Lemmy first"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
# echo "Stopping Lemmy so that users dont upload new images during the migration"
|
||||||
|
# docker-compose stop lemmy
|
||||||
|
|
||||||
|
pushd volumes/pictshare/
|
||||||
|
echo "Importing pictshare images to pict-rs..."
|
||||||
|
IMAGE_NAMES=*
|
||||||
|
for image in $IMAGE_NAMES; do
|
||||||
|
IMAGE_PATH="$(pwd)/$image/$image"
|
||||||
|
if [[ ! -f $IMAGE_PATH ]]; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
echo -e "\nImporting $IMAGE_PATH"
|
||||||
|
ret=0
|
||||||
|
curl --silent --fail -F "images[]=@$IMAGE_PATH" http://127.0.0.1:8537/import || ret=$?
|
||||||
|
if [[ $ret != 0 ]]; then
|
||||||
|
echo "Error for $IMAGE_PATH : $ret"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "Fixing permissions on pictshare folder"
|
||||||
|
find . -type d -exec chmod 755 {} \;
|
||||||
|
find . -type f -exec chmod 644 {} \;
|
||||||
|
|
||||||
|
popd
|
||||||
|
|
||||||
|
echo "Rewrite image links in Lemmy database"
|
||||||
|
docker-compose exec -u postgres postgres psql -U lemmy -c "UPDATE user_ SET avatar = REPLACE(avatar, 'pictshare', 'pictrs/image') WHERE avatar is not null;"
|
||||||
|
docker-compose exec -u postgres postgres psql -U lemmy -c "UPDATE post SET url = REPLACE(url, 'pictshare', 'pictrs/image') WHERE url is not null;"
|
||||||
|
|
||||||
|
echo "Moving pictshare data folder to pictshare_backup"
|
||||||
|
mv volumes/pictshare volumes/pictshare_backup
|
||||||
|
|
||||||
|
echo "Migration done, starting Lemmy again"
|
||||||
|
echo "If everything went well, you can delete ./volumes/pictshare_backup/"
|
||||||
|
docker-compose start lemmy
|
@ -1,31 +1,67 @@
|
|||||||
#### Requirements
|
### Ubuntu
|
||||||
|
|
||||||
- [Rust](https://www.rust-lang.org/)
|
|
||||||
- [Yarn](https://yarnpkg.com/en/)
|
|
||||||
- [Postgres](https://www.postgresql.org/)
|
|
||||||
|
|
||||||
#### Set up Postgres DB
|
#### Build requirements:
|
||||||
|
```
|
||||||
|
sudo apt install git cargo libssl-dev pkg-config libpq-dev yarn curl gnupg2 git
|
||||||
|
# install yarn
|
||||||
|
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
|
||||||
|
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
|
||||||
|
sudo apt update && sudo apt install yarn
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Get the source code
|
||||||
|
```
|
||||||
|
git clone https://github.com/LemmyNet/lemmy.git
|
||||||
|
# or alternatively from gitea
|
||||||
|
# git clone https://yerbamate.dev/LemmyNet/lemmy.git
|
||||||
|
```
|
||||||
|
|
||||||
|
All the following commands need to be run either in `lemmy/server` or `lemmy/ui`, as indicated
|
||||||
|
by the `cd` command.
|
||||||
|
|
||||||
```bash
|
#### Build the backend (Rust)
|
||||||
|
```
|
||||||
cd server
|
cd server
|
||||||
./db-init.sh
|
cargo build
|
||||||
|
# for development, use `cargo check` instead)
|
||||||
```
|
```
|
||||||
|
|
||||||
Or run the commands manually:
|
#### Build the frontend (Typescript)
|
||||||
|
```
|
||||||
|
cd ui
|
||||||
|
yarn
|
||||||
|
yarn build
|
||||||
|
```
|
||||||
|
|
||||||
```bash
|
#### Setup postgresql
|
||||||
psql -c "create user lemmy with password 'password' superuser;" -U postgres
|
```
|
||||||
psql -c 'create database lemmy with owner lemmy;' -U postgres
|
sudo apt install postgresql
|
||||||
|
sudo systemctl start postgresql
|
||||||
|
# initialize postgres database
|
||||||
|
sudo -u postgres psql -c "create user lemmy with password 'password' superuser;" -U postgres
|
||||||
|
sudo -u postgres psql -c 'create database lemmy with owner lemmy;' -U postgres
|
||||||
export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
|
export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
|
||||||
|
# or execute server/db-init.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Running
|
#### Run a local development instance
|
||||||
|
```
|
||||||
|
# run each of these in a seperate terminal
|
||||||
|
cd server && cargo run
|
||||||
|
ui & yarn start
|
||||||
|
```
|
||||||
|
|
||||||
```bash
|
Then open [localhost:4444](http://localhost:4444) in your browser. It will auto-refresh if you edit
|
||||||
git clone https://github.com/LemmyNet/lemmy
|
any frontend files. For backend coding, you will have to rerun `cargo run`. You can use
|
||||||
cd lemmy
|
`cargo check` as a faster way to find compilation errors.
|
||||||
./install.sh
|
|
||||||
# For live coding, where both the front and back end, automagically reload on any save, do:
|
To speed up incremental builds, you can add the following to `~/.cargo/config`:
|
||||||
# cd ui && yarn start
|
```
|
||||||
# cd server && cargo watch -x run
|
[target.x86_64-unknown-linux-gnu]
|
||||||
|
rustflags = ["-Clink-arg=-fuse-ld=lld"]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Note that this setup doesn't include image uploads or link previews (provided by pict-rs and
|
||||||
|
iframely respectively). If you want to test those, you should use the
|
||||||
|
[Docker development](contributing_docker_development.md).
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1 +1 @@
|
|||||||
pub const VERSION: &str = "v0.6.71";
|
pub const VERSION: &str = "v0.7.0";
|
||||||
|
@ -0,0 +1,30 @@
|
|||||||
|
|
||||||
|
$white: #ffffff;
|
||||||
|
$orange: #faa077;
|
||||||
|
$cyan: #02bdc2;
|
||||||
|
$green: #d4e9d7;
|
||||||
|
$secondary: $green;
|
||||||
|
$body-color: $gray-700;
|
||||||
|
$link-color: theme-color("danger");;
|
||||||
|
$primary: $orange;
|
||||||
|
$red: #d8486a;
|
||||||
|
$border-radius: 1.5rem;
|
||||||
|
$border-radius-lg: 1.5rem;
|
||||||
|
$border-radius-sm: 1rem;
|
||||||
|
$font-family-sans-serif: Guardian-EgypTT,serif,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
|
||||||
|
$headings-color: $gray-700;
|
||||||
|
$input-btn-focus-color: rgba($component-active-bg, .75);
|
||||||
|
$form-feedback-valid-color: theme-color("info");
|
||||||
|
$navbar-light-color: $gray-600;
|
||||||
|
$black: #222222;
|
||||||
|
$navbar-dark-toggler-border-color: rgba($black, .1);
|
||||||
|
$navbar-light-active-color: $gray-900;
|
||||||
|
$card-color: $gray-700;
|
||||||
|
$card-cap-color: $gray-700;
|
||||||
|
$info: darken($green, 25%);;
|
||||||
|
$body-bg: #f2f0f0;
|
||||||
|
$success: darken($green, 25%);;
|
||||||
|
$danger: darken($primary, 25%);
|
||||||
|
$navbar-light-hover-color: $gray-900;
|
||||||
|
$card-bg: $gray-100;
|
||||||
|
$border-color: $gray-700;
|
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
|||||||
export const version: string = 'v0.6.71';
|
export const version: string = 'v0.7.0';
|
||||||
|
@ -1 +1,107 @@
|
|||||||
{}
|
{
|
||||||
|
"post": "Elküld",
|
||||||
|
"remove_post": "Bejegyzés eltávolítása",
|
||||||
|
"no_posts": "Nincs bejegyzés.",
|
||||||
|
"create_post": "Bejegyzés létrehozása",
|
||||||
|
"create_a_post": "Bejegyzés létrehozása",
|
||||||
|
"number_of_posts": "{{count}} bejegyzés",
|
||||||
|
"number_of_posts_plural": "{{count}} bejegyzés",
|
||||||
|
"posts": "Bejegyzések",
|
||||||
|
"related_posts": "Ezek a bejegyzések kapcsolódhatnak",
|
||||||
|
"cross_posts": "Ez a hivatkozás itt is be lett küldve:",
|
||||||
|
"cross_post": "keresztbejegyzés",
|
||||||
|
"comments": "Hozzászólások",
|
||||||
|
"remove_comment": "Hozzászólások eltávolítása",
|
||||||
|
"cross_posted_to": "beküldve ide is: ",
|
||||||
|
"number_of_comments": "{{count}} hozzászólás",
|
||||||
|
"number_of_comments_plural": "{{count}} hozzászólás",
|
||||||
|
"communities": "Közösségek",
|
||||||
|
"users": "Felhasználók",
|
||||||
|
"create_a_community": "Közösség létrehozása",
|
||||||
|
"select_a_community": "Közösség kiválasztása",
|
||||||
|
"create_community": "Közösség létrehozása",
|
||||||
|
"remove_community": "Közösség eltávolítása",
|
||||||
|
"trending_communities": "Népszerű <1>közösségek</1>",
|
||||||
|
"list_of_communities": "Közösségek listája",
|
||||||
|
"community_reqs": "Kisbetű és alsóvonás megengedett, szóköz nem.",
|
||||||
|
"create_private_message": "Privát üzenet létrehozása",
|
||||||
|
"send_secure_message": "Biztonságos üzenet küldése",
|
||||||
|
"send_message": "Üzenet küldése",
|
||||||
|
"message": "Üzenet",
|
||||||
|
"edit": "szerkesztés",
|
||||||
|
"reply": "válasz",
|
||||||
|
"more": "több",
|
||||||
|
"cancel": "Mégse",
|
||||||
|
"preview": "Előnézet",
|
||||||
|
"upload_image": "kép feltöltése",
|
||||||
|
"avatar": "Avatár",
|
||||||
|
"upload_avatar": "Avatár feltöltése",
|
||||||
|
"show_avatars": "Avatárok mutatása",
|
||||||
|
"show_context": "Összefüggés mutatása",
|
||||||
|
"sorting_help": "rendezési segítség",
|
||||||
|
"view_source": "forrás megtekintése",
|
||||||
|
"unlock": "zárolás feloldása",
|
||||||
|
"lock": "zárolás",
|
||||||
|
"sticky": "rögzítés",
|
||||||
|
"unsticky": "rögzítés feloldása",
|
||||||
|
"link": "hivatkozás",
|
||||||
|
"mod": "moderátor",
|
||||||
|
"mods": "moderátorok",
|
||||||
|
"moderates": "Moderált közösségek",
|
||||||
|
"settings": "Beállítások",
|
||||||
|
"admin_settings": "Adminisztrációs beállítások",
|
||||||
|
"remove_as_mod": "moderátori jog eltávolítása",
|
||||||
|
"appoint_as_mod": "kinevezés moderátornak",
|
||||||
|
"modlog": "Moderációs napló",
|
||||||
|
"admin": "admin",
|
||||||
|
"admins": "adminok",
|
||||||
|
"remove_as_admin": "adminjog eltávolítása",
|
||||||
|
"appoint_as_admin": "kinevezés adminnak",
|
||||||
|
"remove": "eltávolítás",
|
||||||
|
"locked": "zárolva",
|
||||||
|
"stickied": "rögzítve",
|
||||||
|
"reason": "Indok",
|
||||||
|
"mark_as_read": "megjelölés olvasottnak",
|
||||||
|
"mark_as_unread": "megjelölés olvasatlannak",
|
||||||
|
"delete": "törlés",
|
||||||
|
"deleted": "eltávolítva a szerző által",
|
||||||
|
"delete_account": "FIók törlése",
|
||||||
|
"restore": "visszaállítás",
|
||||||
|
"ban": "kitiltás",
|
||||||
|
"ban_from_site": "kitiltás az oldalról",
|
||||||
|
"unban": "kitiltás visszavonása",
|
||||||
|
"unban_from_site": "az oldalról történő kitiltás visszavonása",
|
||||||
|
"banned": "kitiltva",
|
||||||
|
"banned_users": "Kitiltott felhasználók",
|
||||||
|
"save": "mentés",
|
||||||
|
"unsave": "mentés visszavonása",
|
||||||
|
"create": "létrehozás",
|
||||||
|
"creator": "szerző",
|
||||||
|
"username": "Felhasználónév",
|
||||||
|
"number_of_points": "{{count}} pont",
|
||||||
|
"number_of_points_plural": "{{count}} pont",
|
||||||
|
"number_of_subscribers": "{{count}} feliratkozó",
|
||||||
|
"number_of_subscribers_plural": "{{count}} feliratkozó",
|
||||||
|
"name": "Név",
|
||||||
|
"title": "Cím",
|
||||||
|
"category": "Kategória",
|
||||||
|
"both": "Mindkettő",
|
||||||
|
"saved": "Mentve",
|
||||||
|
"unsubscribe": "Leiratkozás",
|
||||||
|
"subscribe": "Feliratkozás",
|
||||||
|
"subscribed": "Feliratkozva",
|
||||||
|
"subscribed_to_communities": "Követett <1>közösségek</1>",
|
||||||
|
"number_of_communities": "{{count}} közösség",
|
||||||
|
"number_of_communities_plural": "{{count}} közösség",
|
||||||
|
"formatting_help": "formázási segítség",
|
||||||
|
"archive_link": "hivatkozás archiválása",
|
||||||
|
"site_config": "Oldalbeállítások",
|
||||||
|
"removed": "eltávolítva egy mod által",
|
||||||
|
"delete_account_confirm": "Figyelmeztetés: ez véglegesen törölni fogja az összes adatodat. A megerősítéshez írd be a jelszavad!",
|
||||||
|
"email_or_username": "Email vagy felhasználónév",
|
||||||
|
"number_of_users": "{{count}} felhasználó",
|
||||||
|
"number_of_users_plural": "{{count}} felhasználó",
|
||||||
|
"number_online": "{{count}} online felhasználó",
|
||||||
|
"number_online_plural": "{{count}} online felhasználó",
|
||||||
|
"subscribers": "Feliratkozók"
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue