e5642d7566
enable scope options and such
6 years ago
5dd6542db5
formatting
6 years ago
1089d3658e
user: fix up notification last calculation [NOT related to upstream]
6 years ago
46c7c2380c
Merge branch 'feature/relay' into 'develop'
...
message relay
Closes #144
See merge request pleroma/pleroma!264
6 years ago
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
6 years ago
63094cfd3e
Merge branch 'feature/emoji-in-local-users' into 'develop'
...
Add emoji to local user profiles.
Closes #202
See merge request pleroma/pleroma!271
6 years ago
86dca39640
tests: fix formatting
6 years ago
927be2c62b
Merge branch 'bugfix/formatting' into 'develop'
...
fix formatting
See merge request pleroma/pleroma!301
6 years ago
bc3c30430e
fix formatting
6 years ago
e394e5943d
Merge branch 'tests/notification-smoketests' into 'develop'
...
tests: add notification smoketests (ref #265 )
See merge request pleroma/pleroma!300
6 years ago
504a25f812
tests: add notification smoketests (ref #265 )
6 years ago
1ad5cbed51
Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'
...
common api: properly handle replying to orphaned threads
See merge request pleroma/pleroma!299
6 years ago
741c6ad671
common api: handle replying to orphaned threads
6 years ago
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
6 years ago
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
6 years ago
3448b434f5
Merge branch 'update-pleroma-frontend' into 'develop'
...
update pleroma frontend
See merge request pleroma/pleroma!298
6 years ago
7faed99450
Merge branch 'improve-example-caddyfile' into 'develop'
...
Improve example Caddyfile
See merge request pleroma/pleroma!296
6 years ago
d802903c15
Merge branch 'remove-unused-settings' into 'develop'
...
Remove unused settings
See merge request pleroma/pleroma!297
6 years ago
ce8c7e77a1
update pleroma frontend
6 years ago
946a0769c4
remove unused settings from /api/statusnet/config
6 years ago
89e2cb0828
remove unused settings
6 years ago
bff5ed154f
Improve example Caddyfile
6 years ago
540cce5d10
When logging in, try treating the login as an email
...
Closes #245
6 years ago
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
aab2bdddf4
twitter api: provide object descriptions as attachment description field
6 years ago
66bc37925e
Merge branch 'update/pleroma-fe-20180824' into 'develop'
...
update pleroma frontend
See merge request pleroma/pleroma!292
6 years ago
47661ce44b
update pleroma frontend
6 years ago
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
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
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
a8bd120ea6
tests: formatting
6 years ago
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
3e10d13909
formatter: adjust regexp captures to match local users with single character nicknames ( closes #163 )
6 years ago
14d1187702
test: add testcase for formatter issue #163
6 years ago
09cb402203
fe config: add collapse_message_with_subject fe option
6 years ago
cac0bd6d51
Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'"
...
This reverts merge request !288
6 years ago
265fba7e01
Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'
...
add collapseMessageWithSubject in config
See merge request pleroma/pleroma!288
6 years ago
661a985cb9
add collapseMessageWithSubject in config
6 years ago
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
ab85fef076
Merge branch 'develop' into 'develop'
...
Add an OpenRC service
See merge request pleroma/pleroma!285
6 years ago
9c5ca9e15e
Add an OpenRC service
6 years ago
bf9f68b681
debug
6 years ago
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
a909fe45a6
formatting
6 years ago
bc36d40bee
tests: add a testcase for verifying that objects without a valid ID are always rejected
6 years ago
52b44184b4
transmogrifier: reject activities lacking a valid ID
6 years ago
643f373514
Run mix format
6 years ago
d5bdd55b5d
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil
6 years ago
5dde6e4a00
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos
6 years ago
f6b06d2ac8
Merge branch 'feature/peertube_2' into 'develop'
...
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
6 years ago
William Pitcock