kaniini
3448b434f5
Merge branch 'update-pleroma-frontend' into 'develop'
...
update pleroma frontend
See merge request pleroma/pleroma!298
6 years ago
kaniini
7faed99450
Merge branch 'improve-example-caddyfile' into 'develop'
...
Improve example Caddyfile
See merge request pleroma/pleroma!296
6 years ago
kaniini
d802903c15
Merge branch 'remove-unused-settings' into 'develop'
...
Remove unused settings
See merge request pleroma/pleroma!297
6 years ago
hakabahitoyo
ce8c7e77a1
update pleroma frontend
6 years ago
hakabahitoyo
946a0769c4
remove unused settings from /api/statusnet/config
6 years ago
hakabahitoyo
89e2cb0828
remove unused settings
6 years ago
shibayashi
bff5ed154f
Improve example Caddyfile
6 years ago
Ekaterina Vaartis
540cce5d10
When logging in, try treating the login as an email
...
Closes #245
6 years ago
kaniini
ffa552f1a4
Merge branch 'feature/twitterapi-object-description' into 'develop'
...
twitter api: provide object descriptions as attachment description field
See merge request pleroma/pleroma!293
6 years ago
William Pitcock
aab2bdddf4
twitter api: provide object descriptions as attachment description field
6 years ago
kaniini
66bc37925e
Merge branch 'update/pleroma-fe-20180824' into 'develop'
...
update pleroma frontend
See merge request pleroma/pleroma!292
6 years ago
William Pitcock
47661ce44b
update pleroma frontend
6 years ago
kaniini
ae0e41fd8b
Merge branch 'feature/tls-sni-support' into 'develop'
...
http: fix TLS server name indication
Closes #261
See merge request pleroma/pleroma!291
6 years ago
William Pitcock
290798b821
http: fix TLS server name indication
...
by default, hackney only sent TLS server name indication if TLS was locked
to TLS 1.2.
since there are many instances out there not speaking TLS 1.2, it is not
acceptable to lock SNI to TLS 1.2.
closes #261
6 years ago
kaniini
be7a6db1f5
Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'
...
formatter: fix single char local nicknames
Closes #163
See merge request pleroma/pleroma!290
6 years ago
William Pitcock
a8bd120ea6
tests: formatting
6 years ago
kaniini
9ded0ee1a5
Merge branch 'config/fe-collapse-subject' into 'develop'
...
fe config: add collapse_message_with_subject fe option
See merge request pleroma/pleroma!289
6 years ago
William Pitcock
3e10d13909
formatter: adjust regexp captures to match local users with single character nicknames ( closes #163 )
6 years ago
William Pitcock
14d1187702
test: add testcase for formatter issue #163
6 years ago
William Pitcock
09cb402203
fe config: add collapse_message_with_subject fe option
6 years ago
kaniini
cac0bd6d51
Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'"
...
This reverts merge request !288
6 years ago
kaniini
265fba7e01
Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'
...
add collapseMessageWithSubject in config
See merge request pleroma/pleroma!288
6 years ago
hakabahitoyo
661a985cb9
add collapseMessageWithSubject in config
6 years ago
kaniini
8b9fe0c7a1
Merge branch 'fix/suggestions-api-error-handling' into 'develop'
...
Better error handling in /api/v1/suggestions
See merge request pleroma/pleroma!287
6 years ago
Haelwenn
ab85fef076
Merge branch 'develop' into 'develop'
...
Add an OpenRC service
See merge request pleroma/pleroma!285
6 years ago
Jorty
ba6e3eba33
Move invite task to pleroma namespace
...
Some other minor changes were made to make it consistent with the behavior of
other tasks both within Pleroma and the conventions set by dependencies such as
Phoenix. Namely, the task is named `gen.invite` and `IO.puts` has been replaced
with references to `Mix.shell()` where appropriate.
6 years ago
vaartis
9c5ca9e15e
Add an OpenRC service
6 years ago
Jorty
76ed9ca1e9
Update README.md for refactored Mix tasks
6 years ago
Jorty
8a1dc0de92
Refactor Mix tasks
...
1. Move Mix tasks into a `pleroma` namespace, to avoid
collisions with dependent packages.
2. Rename and condense tasks into two `pleroma.user` and
`pleroma.gen.instance` tasks for consistency with Hex and Phoenix.
3. Add additional functionality to the tasks to make them more
user-friendly. Arguments with sensible defaults were demoted to flags
and in the interactive `generate_config` (renamed to
`pleroma.gen.instance`), flags were added to allow non-interactive
use, though interactive use remains the primary interface. That task
also now prompts the user for database parameters.
4. Documentation has been added to both tasks such that `mix help` now
shows useful information.
5. Finally, use of IO.puts in tasks has been replaced with Mix.shell()
equivalents to make the behavior more consistent with Mix tasks in
other packages, and such that variables like MIX_QUIET are respected.
The only exception is in `mix pleroma.user reset_password`, wherein
the URL must always be printed regardless of the value of MIX_QUIET
since that's its entire purpose.
6 years ago
hakabahitoyo
bf9f68b681
debug
6 years ago
kaniini
e416469a40
Merge branch 'security/activitypub-reject-bogus-ids' into 'develop'
...
security: activitypub: reject activities with bogus ids
See merge request pleroma/pleroma!286
6 years ago
William Pitcock
a909fe45a6
formatting
6 years ago
William Pitcock
bc36d40bee
tests: add a testcase for verifying that objects without a valid ID are always rejected
6 years ago
William Pitcock
52b44184b4
transmogrifier: reject activities lacking a valid ID
6 years ago
Henry Jameson
9b046d2a84
fixed notifications API completely breaking if there's a like for
...
missing (deleted) post.
6 years ago
Haelwenn (lanodan) Monnier
643f373514
Run mix format
6 years ago
Haelwenn (lanodan) Monnier
d5bdd55b5d
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil
6 years ago
Haelwenn (lanodan) Monnier
5dde6e4a00
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos
6 years ago
kaniini
f6b06d2ac8
Merge branch 'feature/peertube_2' into 'develop'
...
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
6 years ago
kaniini
a6d4cc8917
Merge branch 'sanitize-bio' into 'develop'
...
mastodon api: sanitize the bio HTML
See merge request pleroma/pleroma!282
6 years ago
kaniini
5a8bb3cb3b
Merge branch 'twitter-api-bios' into 'develop'
...
Twitter API: Support Mastodon-style bios
See merge request pleroma/pleroma!283
6 years ago
Haelwenn (lanodan) Monnier
046741c60d
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles
6 years ago
Haelwenn (lanodan) Monnier
f5b056e3ce
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likes
6 years ago
Haelwenn (lanodan) Monnier
3b8ef24532
Fix attachement rendering
6 years ago
lain
a6b021a52b
Render peertube videos in mastodon.
6 years ago
lain
c381d0b577
Use activitypub to fetch posts.
...
This falls back to ostatus.
6 years ago
Haelwenn (lanodan) Monnier
74c74decf5
Basic peertube support.
6 years ago
Haelwenn (lanodan) Monnier
ef4f982e2c
Pleroma.Web.ActivityPub.Transmogrifier: Fix actor being a list of objects (Peertube)
6 years ago
ensra
2b5db840ee
attempt to add html validation to mastodon api test case
6 years ago
ensra
e883587cc3
this should be looking at the follower's bio, not the user's bio.
...
fixes test.
6 years ago