Commit graph

1994 commits

Author SHA1 Message Date
William Pitcock 1089d3658e user: fix up notification last calculation [NOT related to upstream] 2018-08-27 10:46:01 +00:00
lambda 46c7c2380c Merge branch 'feature/relay' into 'develop'
message relay

Closes #144

See merge request pleroma/pleroma!264
2018-08-27 08:29:25 +00:00
lambda 440b459cd1 Merge branch 'bugfix/announce-timeline-flooding' into 'develop'
activitypub: filter destination list for announce activities differently than normal (closes #164)

Closes #164

See merge request pleroma/pleroma!227
2018-08-27 08:25:27 +00:00
kaniini 63094cfd3e Merge branch 'feature/emoji-in-local-users' into 'develop'
Add emoji to local user profiles.

Closes #202

See merge request pleroma/pleroma!271
2018-08-26 23:24:41 +00:00
William Pitcock 86dca39640 tests: fix formatting 2018-08-26 23:19:45 +00:00
kaniini 927be2c62b Merge branch 'bugfix/formatting' into 'develop'
fix formatting

See merge request pleroma/pleroma!301
2018-08-26 22:56:18 +00:00
William Pitcock bc3c30430e fix formatting 2018-08-26 22:46:25 +00:00
kaniini e394e5943d Merge branch 'tests/notification-smoketests' into 'develop'
tests: add notification smoketests (ref #265)

See merge request pleroma/pleroma!300
2018-08-26 22:44:22 +00:00
William Pitcock 504a25f812 tests: add notification smoketests (ref #265) 2018-08-26 22:42:02 +00:00
kaniini 1ad5cbed51 Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'
common api: properly handle replying to orphaned threads

See merge request pleroma/pleroma!299
2018-08-26 22:39:15 +00:00
William Pitcock 741c6ad671 common api: handle replying to orphaned threads 2018-08-26 22:37:36 +00:00
kaniini c9e4c45e0e Merge branch 'login-with-email' into 'develop'
When logging in, try treating the login as an email

Closes #245

See merge request pleroma/pleroma!295
2018-08-26 21:35:12 +00:00
kaniini 0f5bff8c66 Merge branch 'develop' into 'feature/relay'
# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex
2018-08-26 21:06:15 +00:00
kaniini 3448b434f5 Merge branch 'update-pleroma-frontend' into 'develop'
update pleroma frontend

See merge request pleroma/pleroma!298
2018-08-26 20:18:16 +00:00
kaniini 7faed99450 Merge branch 'improve-example-caddyfile' into 'develop'
Improve example Caddyfile

See merge request pleroma/pleroma!296
2018-08-26 20:16:46 +00:00
kaniini d802903c15 Merge branch 'remove-unused-settings' into 'develop'
Remove unused settings

See merge request pleroma/pleroma!297
2018-08-26 20:16:12 +00:00
hakabahitoyo ce8c7e77a1 update pleroma frontend 2018-08-26 21:08:03 +09:00
hakabahitoyo 946a0769c4 remove unused settings from /api/statusnet/config 2018-08-26 17:40:15 +09:00
hakabahitoyo 89e2cb0828 remove unused settings 2018-08-26 17:21:57 +09:00
shibayashi bff5ed154f
Improve example Caddyfile 2018-08-26 03:36:52 +02:00
Ekaterina Vaartis 540cce5d10 When logging in, try treating the login as an email
Closes #245
2018-08-25 23:29:03 +03:00
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
2018-08-25 00:20:25 +00:00
William Pitcock aab2bdddf4 twitter api: provide object descriptions as attachment description field 2018-08-25 00:12:58 +00:00
kaniini 66bc37925e Merge branch 'update/pleroma-fe-20180824' into 'develop'
update pleroma frontend

See merge request pleroma/pleroma!292
2018-08-24 22:00:13 +00:00
William Pitcock 47661ce44b update pleroma frontend 2018-08-24 21:59:57 +00:00
kaniini ae0e41fd8b Merge branch 'feature/tls-sni-support' into 'develop'
http: fix TLS server name indication

Closes #261

See merge request pleroma/pleroma!291
2018-08-24 20:15:59 +00:00
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
2018-08-24 20:04:50 +00:00
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
2018-08-24 18:42:14 +00:00
William Pitcock a8bd120ea6 tests: formatting 2018-08-24 18:33:36 +00:00
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
2018-08-24 18:27:43 +00:00
William Pitcock 3e10d13909 formatter: adjust regexp captures to match local users with single character nicknames (closes #163) 2018-08-24 18:22:47 +00:00
William Pitcock 14d1187702 test: add testcase for formatter issue #163 2018-08-24 18:22:46 +00:00
William Pitcock 09cb402203 fe config: add collapse_message_with_subject fe option 2018-08-24 18:21:42 +00:00
kaniini cac0bd6d51 Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'"
This reverts merge request !288
2018-08-24 18:01:30 +00:00
kaniini 265fba7e01 Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'
add collapseMessageWithSubject in config

See merge request pleroma/pleroma!288
2018-08-24 17:40:55 +00:00
hakabahitoyo 661a985cb9 add collapseMessageWithSubject in config 2018-08-24 19:10:23 +09:00
kaniini 8b9fe0c7a1 Merge branch 'fix/suggestions-api-error-handling' into 'develop'
Better error handling in /api/v1/suggestions

See merge request pleroma/pleroma!287
2018-08-23 20:56:43 +00:00
Haelwenn ab85fef076 Merge branch 'develop' into 'develop'
Add an OpenRC service

See merge request pleroma/pleroma!285
2018-08-23 17:09:37 +00:00
vaartis 9c5ca9e15e Add an OpenRC service 2018-08-23 19:34:11 +03:00
hakabahitoyo bf9f68b681 debug 2018-08-23 11:52:18 +09:00
kaniini e416469a40 Merge branch 'security/activitypub-reject-bogus-ids' into 'develop'
security: activitypub: reject activities with bogus ids

See merge request pleroma/pleroma!286
2018-08-23 01:39:08 +00:00
William Pitcock a909fe45a6 formatting 2018-08-23 01:34:36 +00:00
William Pitcock bc36d40bee tests: add a testcase for verifying that objects without a valid ID are always rejected 2018-08-23 01:25:27 +00:00
William Pitcock 52b44184b4 transmogrifier: reject activities lacking a valid ID 2018-08-23 01:25:26 +00:00
Haelwenn (lanodan) Monnier 643f373514
Run mix format 2018-08-22 12:09:01 +02:00
Haelwenn (lanodan) Monnier d5bdd55b5d
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil 2018-08-22 01:47:25 +02:00
Haelwenn (lanodan) Monnier 5dde6e4a00
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos 2018-08-22 01:46:26 +02:00
kaniini f6b06d2ac8 Merge branch 'feature/peertube_2' into 'develop'
rebase/update of feature/peertube

See merge request pleroma/pleroma!217
2018-08-21 16:58:44 +00:00
kaniini a6d4cc8917 Merge branch 'sanitize-bio' into 'develop'
mastodon api: sanitize the bio HTML

See merge request pleroma/pleroma!282
2018-08-21 16:56:24 +00:00
kaniini 5a8bb3cb3b Merge branch 'twitter-api-bios' into 'develop'
Twitter API: Support Mastodon-style bios

See merge request pleroma/pleroma!283
2018-08-21 16:55:26 +00:00