Merge branch 'main' into validate-attributed-to
This commit is contained in:
commit
5bf1e81f0b
@ -10,7 +10,7 @@ executors:
|
|||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
docker:
|
docker:
|
||||||
- image: plumeorg/plume-buildenv:v0.0.9
|
- image: plumeorg/plume-buildenv:v0.3.0
|
||||||
- image: <<#parameters.postgres>>circleci/postgres:9.6-alpine<</parameters.postgres>><<^parameters.postgres>>alpine:latest<</parameters.postgres>>
|
- image: <<#parameters.postgres>>circleci/postgres:9.6-alpine<</parameters.postgres>><<^parameters.postgres>>alpine:latest<</parameters.postgres>>
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_USER: postgres
|
POSTGRES_USER: postgres
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM debian:stretch-20190326
|
FROM debian:buster-20201117
|
||||||
ENV PATH="/root/.cargo/bin:${PATH}"
|
ENV PATH="/root/.cargo/bin:${PATH}"
|
||||||
|
|
||||||
#install native/circleci/build dependancies
|
#install native/circleci/build dependancies
|
||||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -18,3 +18,4 @@ tags.*
|
|||||||
search_index
|
search_index
|
||||||
.buildconfig
|
.buildconfig
|
||||||
__pycache__
|
__pycache__
|
||||||
|
.vscode/
|
||||||
|
158
CHANGELOG.md
Normal file
158
CHANGELOG.md
Normal file
@ -0,0 +1,158 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
<!-- next-header -->
|
||||||
|
|
||||||
|
## [Unreleased] - No release date
|
||||||
|
|
||||||
|
## [0.5.0] - 2020-06-21
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Email blocklisting (#718)
|
||||||
|
- Syntax highlighting (#691)
|
||||||
|
- Persian localization (#782)
|
||||||
|
- Switchable tokenizer - enables Japanese full-text search (#776)
|
||||||
|
- Make database connections configurable by environment variables (#768)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Display likes and boost on post cards (#744)
|
||||||
|
- Rust 2018 (#726)
|
||||||
|
- Bump to LLVM to 9.0.0 to fix ARM builds (#737)
|
||||||
|
- Remove dependency on runtime-fmt (#773)
|
||||||
|
- Drop the -alpha suffix in release names, it is implied that Plume is not stable yet because of the 0 major version (Plume 1.0.0 will be the first stable release).
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fix parsing of mentions inside a Markdown code block (be430c6)
|
||||||
|
- Fix RSS issues (#720)
|
||||||
|
- Fix Atom feed (#764)
|
||||||
|
- Fix default theme (#746)
|
||||||
|
- Fix shown password on remote interact pages (#741)
|
||||||
|
- Allow unicode hashtags (#757)
|
||||||
|
- Fix French grammar for for 0 (#760)
|
||||||
|
- Don't show boosts and likes for "all" and "local" in timelines (#781)
|
||||||
|
- Fix liking and boosting posts on remote instances (#762)
|
||||||
|
|
||||||
|
## [0.4.0] - 2019-12-23
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Add support for generic timeline (#525)
|
||||||
|
- Federate user deletion (#551)
|
||||||
|
- import migrations and don't require diesel_cli for admins (#555)
|
||||||
|
- Cache local instance (#572)
|
||||||
|
- Initial RTL support #575 (#577)
|
||||||
|
- Confirm deletion of blog (#602)
|
||||||
|
- Make a distinction between moderators and admins (#619)
|
||||||
|
- Theming (#624)
|
||||||
|
- Add clap to plume in order to print help and version (#631)
|
||||||
|
- Add Snapcraft metadata and install/maintenance hooks (#666)
|
||||||
|
- Add environmental variable to control path of media (#683)
|
||||||
|
- Add autosaving to the editor (#688)
|
||||||
|
- CI: Upload artifacts to pull request deploy environment (#539)
|
||||||
|
- CI: Upload artifact of wasm binary (#571)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Update follow_remote.rs.html grammar (#548)
|
||||||
|
- Add some feedback when performing some actions (#552)
|
||||||
|
- Theme update (#553)
|
||||||
|
- Remove the new index lock tantivy uses (#556)
|
||||||
|
- Reduce reqwest timeout to 5s (#557)
|
||||||
|
- Improve notification management (#561)
|
||||||
|
- Fix occurrences of 'have been' to 'has been' (#578) + Direct follow-up to #578 (#603)
|
||||||
|
- Store password reset requests in database (#610)
|
||||||
|
- Use futures and tokio to send activities (#620)
|
||||||
|
- Don't ignore dotenv errors (#630)
|
||||||
|
- Replace the input! macro with an Input builder (#646)
|
||||||
|
- Update default license (#659)
|
||||||
|
- Paginate the outbox responses. Fixes #669 (#681)
|
||||||
|
- Use the "classic" editor by default (#697)
|
||||||
|
- Fix issue #705 (#708)
|
||||||
|
- Make comments in styleshhets a bit clearer (#545)
|
||||||
|
- Rewrite circleci config (#558)
|
||||||
|
- Use openssl instead of sha256sum for build.rs (#568)
|
||||||
|
- Update dependencies (#574)
|
||||||
|
- Refactor code to use Shrinkwraprs and diesel-derive-newtype (#598)
|
||||||
|
- Add enum containing all successful route returns (#614)
|
||||||
|
- Update dependencies which depended on nix -- fixes arm32 builds (#615)
|
||||||
|
- Update some documents (#616)
|
||||||
|
- Update dependencies (#643)
|
||||||
|
- Make the comment syntax consistent across all CSS (#487)
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Remove r (#535)
|
||||||
|
- Fix certain improper rendering of forms (#560)
|
||||||
|
- make hashtags work in profile summary (#562)
|
||||||
|
- Fix some federation issue (#573)
|
||||||
|
- Prevent comment form submit button distortion on iOS (#592)
|
||||||
|
- Update textarea overflow to scroll (#609)
|
||||||
|
- Fix arm builds (#612)
|
||||||
|
- Fix theme caching (#647)
|
||||||
|
- Fix issue #642, frontend not in English if the user language does not exist (#648)
|
||||||
|
- Don't index drafts (#656)
|
||||||
|
- Fill entirely user on creation (#657)
|
||||||
|
- Delete notification on user deletion (#658)
|
||||||
|
- Order media so that latest added are top (#660)
|
||||||
|
- Fix logo URL (#664)
|
||||||
|
- Snap: Ensure cargo-web doesn't erroneously adopt our workspace. (#667)
|
||||||
|
- Snap: Another fix for building (#668)
|
||||||
|
- Snap: Fix build for non-Tier-1 Rust platforms (#672)
|
||||||
|
- Don't split sentences for translations (#677)
|
||||||
|
- Escape href quotation marks (#678)
|
||||||
|
- Re-add empty strings in translation (#682)
|
||||||
|
- Make the search index creation during migration respect SEARCH_INDEX (#689)
|
||||||
|
- Fix the navigation menu not opening on touch (#690)
|
||||||
|
- Make search items optional (#693)
|
||||||
|
- Various snap fixes (#698)
|
||||||
|
- Fix #637 : Markdown footnotes (#700)
|
||||||
|
- Fix lettre (#706)
|
||||||
|
- CI: Fix Crowdin upload (#576)
|
||||||
|
|
||||||
|
### Removed
|
||||||
|
|
||||||
|
- Remove the Canapi dependency (#540)
|
||||||
|
- Remove use of Rust in migrations (#704)
|
||||||
|
|
||||||
|
## [0.3.0] - 2019-04-19
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Cover for articles (#299, #387)
|
||||||
|
- Password reset (#448)
|
||||||
|
- New editor (#293, #458, #482, #483, #486, #530)
|
||||||
|
- Search (#324, #375, #445)
|
||||||
|
- Edit blogs (#460, #494, #497)
|
||||||
|
- Hashtags in articles (#283, #295)
|
||||||
|
- API endpoints (#245, #285, #307)
|
||||||
|
- A bunch of new translations! (#479, #501, #506, #510, #512, #514)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Federation improvements (#216, #217, #357, #364, #399, #443, #446, #455, #502, #519)
|
||||||
|
- Improved build process (#281, #374, #392, #402, #489, #498, #503, #511, #513, #515, #528)
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
|
||||||
|
- UI usability fixes (#370, #386, #401, #417, #418, #444, #452, #480, #516, #518, #522, #532)
|
||||||
|
|
||||||
|
## [0.2.0] - 2018-09-12
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Article publishing, or save as a draft
|
||||||
|
- Like, or boost an article
|
||||||
|
- Basic Markdown editor
|
||||||
|
- Federated commenting system
|
||||||
|
- User account creation
|
||||||
|
- Limited federation on other platforms and subscribing to users
|
||||||
|
- Ability to create multiple blogs
|
||||||
|
|
||||||
|
<!-- next-url -->
|
||||||
|
[Unreleased]: https://github.com/Plume-org/Plume/compare/0.5.0...HEAD
|
||||||
|
[0.5.0]: https://github.com/Plume-org/Plume/compare/0.4.0-alpha-4...0.5.0
|
||||||
|
[0.4.0]: https://github.com/Plume-org/Plume/compare/0.3.0-alpha-2...0.4.0-alpha-4
|
||||||
|
[0.3.0]: https://github.com/Plume-org/Plume/compare/0.2.0-alpha-1...0.3.0-alpha-2
|
||||||
|
[0.2.0]: https://github.com/Plume-org/Plume/releases/tag/0.2.0-alpha-1
|
@ -1,7 +1,7 @@
|
|||||||
[package]
|
[package]
|
||||||
authors = ["Plume contributors"]
|
authors = ["Plume contributors"]
|
||||||
name = "plume"
|
name = "plume"
|
||||||
version = "0.4.0"
|
version = "0.5.0"
|
||||||
repository = "https://github.com/Plume-org/Plume"
|
repository = "https://github.com/Plume-org/Plume"
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
|
@ -10,7 +10,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||||||
gcc \
|
gcc \
|
||||||
make \
|
make \
|
||||||
openssl \
|
openssl \
|
||||||
libssl-dev
|
libssl-dev\
|
||||||
|
clang
|
||||||
|
|
||||||
WORKDIR /scratch
|
WORKDIR /scratch
|
||||||
COPY script/wasm-deps.sh .
|
COPY script/wasm-deps.sh .
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
"project_identifier": "plume"
|
"project_id": 352097
|
||||||
"api_key_env": CROWDIN_API_KEY
|
"api_token_env": "CROWDIN_API_KEY"
|
||||||
preserve_hierarchy: true
|
preserve_hierarchy: true
|
||||||
files:
|
files:
|
||||||
- source: /po/plume/plume.pot
|
- source: /po/plume/plume.pot
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "plume-api"
|
name = "plume-api"
|
||||||
version = "0.4.0"
|
version = "0.5.0"
|
||||||
authors = ["Plume contributors"]
|
authors = ["Plume contributors"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
|
1
plume-api/release.toml
Normal file
1
plume-api/release.toml
Normal file
@ -0,0 +1 @@
|
|||||||
|
pre-release-replacements = []
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "plume-cli"
|
name = "plume-cli"
|
||||||
version = "0.4.0"
|
version = "0.5.0"
|
||||||
authors = ["Plume contributors"]
|
authors = ["Plume contributors"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
|
1
plume-cli/release.toml
Normal file
1
plume-cli/release.toml
Normal file
@ -0,0 +1 @@
|
|||||||
|
pre-release-replacements = []
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "plume-common"
|
name = "plume-common"
|
||||||
version = "0.4.0"
|
version = "0.5.0"
|
||||||
authors = ["Plume contributors"]
|
authors = ["Plume contributors"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
|
1
plume-common/release.toml
Normal file
1
plume-common/release.toml
Normal file
@ -0,0 +1 @@
|
|||||||
|
pre-release-replacements = []
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "plume-front"
|
name = "plume-front"
|
||||||
version = "0.4.0"
|
version = "0.5.0"
|
||||||
authors = ["Plume contributors"]
|
authors = ["Plume contributors"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
|
1
plume-front/release.toml
Normal file
1
plume-front/release.toml
Normal file
@ -0,0 +1 @@
|
|||||||
|
pre-release-replacements = []
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "plume-macro"
|
name = "plume-macro"
|
||||||
version = "0.4.0"
|
version = "0.5.0"
|
||||||
authors = ["Trinity Pointard <trinity.pointard@insa-rennes.fr>"]
|
authors = ["Trinity Pointard <trinity.pointard@insa-rennes.fr>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
description = "Plume procedural macros"
|
description = "Plume procedural macros"
|
||||||
|
1
plume-macro/release.toml
Normal file
1
plume-macro/release.toml
Normal file
@ -0,0 +1 @@
|
|||||||
|
pre-release-replacements = []
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "plume-models"
|
name = "plume-models"
|
||||||
version = "0.4.0"
|
version = "0.5.0"
|
||||||
authors = ["Plume contributors"]
|
authors = ["Plume contributors"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
|
1
plume-models/release.toml
Normal file
1
plume-models/release.toml
Normal file
@ -0,0 +1 @@
|
|||||||
|
pre-release-replacements = []
|
17
release.toml
Normal file
17
release.toml
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
# we don't have a crate yet, so
|
||||||
|
disable-publish = true
|
||||||
|
# change when we all have gpg keys
|
||||||
|
sign-commit = false
|
||||||
|
dev-version-ext = 'dev'
|
||||||
|
# update all crates in plume at once:
|
||||||
|
consolidate-commits = true
|
||||||
|
|
||||||
|
pre-release-hook = ["crowdin", "pull"]
|
||||||
|
|
||||||
|
pre-release-replacements = [
|
||||||
|
{file="CHANGELOG.md", search="Unreleased", replace="[{{version}}]"},
|
||||||
|
{file="CHANGELOG.md", search="\\.\\.\\.HEAD", replace="...{{tag_name}}", exactly=1},
|
||||||
|
{file="CHANGELOG.md", search="No release date", replace="{{date}}"},
|
||||||
|
{file="CHANGELOG.md", search="<!-- next-header -->", replace="<!-- next-header -->\n\n## [Unreleased] - ReleaseDate", exactly=1},
|
||||||
|
{file="CHANGELOG.md", search="<!-- next-url -->", replace="<!-- next-url -->\n[Unreleased]: https://github.com/Plume-org/Plume/compare/{{tag_name}}...HEAD", exactly=1},
|
||||||
|
]
|
@ -63,7 +63,10 @@ impl<'r> Responder<'r> for Ructe {
|
|||||||
let etag = format!("{:x}", hasher.finish());
|
let etag = format!("{:x}", hasher.finish());
|
||||||
if r.headers()
|
if r.headers()
|
||||||
.get("If-None-Match")
|
.get("If-None-Match")
|
||||||
.any(|s| s[1..s.len() - 1] == etag)
|
// This check matches both weak and strong ETags
|
||||||
|
// NGINX (and maybe other software) sometimes sends ETags with a
|
||||||
|
// "W/" prefix, that we ignore here
|
||||||
|
.any(|s| s[1..s.len() - 1] == etag || s[3..s.len() - 1] == etag)
|
||||||
{
|
{
|
||||||
Response::build()
|
Response::build()
|
||||||
.status(Status::NotModified)
|
.status(Status::NotModified)
|
||||||
|
Loading…
Reference in New Issue
Block a user