Commit graph

799 commits

Author SHA1 Message Date
href
7e930559fe Serve metrics at /api/pleroma/app_metrics 2019-04-04 12:27:44 -05:00
Egor Kislitsyn
0b5c818cb7 [#1] fix telemetry 2019-04-04 11:35:09 -05:00
href
bc3618a38d Set up telemetry and prometheus 2019-04-04 11:30:43 -05:00
Egor Kislitsyn
cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2 2019-04-04 16:10:43 +07:00
Alex S
9e0567ec52 Merge develop into feature/770-add-emoji-tags 2019-04-02 19:16:29 +07:00
Ivan Tashkinov
590c935d95 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-02 13:50:12 +03:00
Alex S
08d64b977f little changes and typos 2019-04-02 16:13:34 +07:00
Alex S
9b2188da7c refactoring of emoji tags config to use groups 2019-04-02 15:44:56 +07:00
Alex S
3601f03147 Adding tag to emoji ets table
changes in apis
2019-04-01 17:17:57 +07:00
Ivan Tashkinov
baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-01 08:49:32 +03:00
Mark Felder
d5a1e08bf1 Add default mail adapter settings to config 2019-03-31 17:46:17 -05:00
lain
10fdc080a0 BBS: Tests and formatting. 2019-03-31 20:35:10 +02:00
Egor
9a39d1d846 Replace Pleroma.Jobs with pleroma_job_queue 2019-03-29 12:46:05 +00:00
Ivan Tashkinov
20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth 2019-03-27 15:41:40 +03:00
Ivan Tashkinov
2a95014b9d [#923] OAuth consumer improvements, fixes, refactoring. 2019-03-27 15:39:35 +03:00
Henry Jameson
3af3e07312 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (55 commits)
  AP UserView: Refactor banner / avatar display code, add test.
  Test for MastoAPI /api/v1/instance response structure (formatting fix).
  Test for MastoAPI /api/v1/instance response structure.
  Credo is upset about me not remembering the alphabet
  Fix formatting
  Remove ActivityRepresenter
  Mastodon 2.7.2 instance attributes (registrations, languages).
  Increment replies_count on replies (MastoAPI)
  Comments split.
  Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
  Try sending an empty map
  Attempt to fix incorrect federation of default instance avatars
  Add an id index to notifications
  fix up missing announcements with preloads
  Serve non-public activities in /api/v1/favourites
  add overriding truncated_namespace condition for truncating paths for digital ocean
  mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
  tests: fix up activity collision test
  activity: use left join instead of inner join when fetching activities that may or may not have a child object
  user: use preloads when deleting accounts
  ...
2019-03-26 21:48:12 +02:00
kaniini
1c3d3d0c2b Merge branch 'safe-mentions' into 'develop'
Add safe dm mode option.

See merge request pleroma/pleroma!958
2019-03-22 00:50:24 +00:00
Henry Jameson
9bb34a12eb Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (87 commits)
  Add a gopher url port config option
  modify the migrations to use naive_datetime_usec
  Fix filter migration
  Fix migration timestamp type
  Ecto 3.0.5 migration
  Update frontend
  Format
  Use ILIKE to search users
  transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
  user: properly cope with actors which do not declare a followers collection
  transmogrifier: when determining followers collection URI, we may need to fetch the actor
  test: add test for list sanitization
  tests: add test for as:Public issues
  activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
  activitypub: transmogrifier: ensure as:Public activities are delivered to followers
  fix UploadTest to use new image_tmp.jpg
  used imageOptim to reduce size of image files
  Document additional pleroma changes to /api/v1/accounts/:id
  Check if the user has indeed not been federated with
  Added support for exclude_types, limit, and min_id in Mastodon notifications.
  ...
2019-03-21 20:26:26 +02:00
lain
8468f3f6d4 Add safe dm mode option. 2019-03-20 21:09:36 +01:00
Ivan Tashkinov
81bf6d9e6a [#923] Typo fix. 2019-03-20 20:29:08 +03:00
Ivan Tashkinov
af68a42ef7 [#923] Support for multiple OAuth consumer strategies. 2019-03-20 20:25:48 +03:00
rinpatch
9a7b817c9a Ecto 3.0.5 migration
kms
2019-03-20 15:59:54 +03:00
Ivan Tashkinov
26b6354095 [#923] Support for multiple (external) registrations per user via Registration. 2019-03-18 17:23:38 +03:00
Ivan Tashkinov
2a96283efb [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	config/config.exs
#	lib/pleroma/web/auth/pleroma_authenticator.ex
2019-03-18 10:26:41 +03:00
kaniini
8b352af4dd Merge branch 'feature/openldap-support' into 'develop'
OpenLDAP support

Closes #203

See merge request pleroma/pleroma!859
2019-03-15 19:57:09 +00:00
Ivan Tashkinov
2739057442 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 2019-03-15 17:11:00 +03:00
Ivan Tashkinov
aacbf0f570 [#923] OAuth: prototype of sign in / sign up with Twitter. 2019-03-15 17:08:03 +03:00
rinpatch
28cfb2c37a Enable dedupe by default 2019-03-15 12:11:13 +03:00
rinpatch
e2fe796c63 Add some tests 2019-03-14 22:02:48 +03:00
link0ff
54e7087ab4 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support 2019-03-14 17:43:30 +02:00
Henry Jameson
a9eb20e2db Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (24 commits)
  MastoAPI followers/following endpoints
  Switch the CI to Elixir 1.8.1
  Linting.
  WebPush: Add activity id to the push messages.
  MastoAPI Accounts: Add fetching by nickname.
  Update Differences-in-MastodonAPI-Responses.md
  Remove chromium input hilight that clashes with our own
  Style again the login page to fit pleroma more
  MastoAPI StatusView: Add locality indicator.
  Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
  Change order of source code to align with platforms
  Update homepages and provide source code links for Roma apps in Clients.md
  Rename Mastalab -> Fedilab in Clients.md
  http: connection: unify adapter configuration and defaults
  http: connection: relax the timeouts a little
  http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
  http: actually pass the options list to the Connection factory
  http: connection: merge hackney option lists instead of concatenating them
  http: safely catch erlang exits and elixir errors from hackney (ref #672)
  Allow an admin to delete a user status
  ...
2019-03-12 21:50:45 +02:00
link0ff
9338f061a3 Support LDAP method start_tls 2019-03-12 18:20:02 +02:00
Ivan Tashkinov
63ab61ed3f Sign in via Twitter (WIP). 2019-03-11 20:37:26 +03:00
kaniini
46200d8fac Merge branch 'fix-tlsv1.3' into 'develop'
Fix supported TLS versions as TLS 1.3 support seems buggy.

Closes #708

See merge request pleroma/pleroma!892
2019-03-08 22:53:12 +00:00
Ekaterina Vaartis
5021b7836f Fetch user's outbox posts on first federation with that user 2019-03-08 16:27:56 +03:00
Henry Jameson
66185ad957 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (62 commits)
  update pleroma frontend
  tests: add regression test
  MRF: anti followbot: gracefully handle accounts without a display name
  Adjust delete activity audience to match the deleted object
  Revert existing object check
  Preserve parameters in link headers (Mastodon API)
  [#647] tests for web push
  Keep heading short
  Add default config for masto_fe
  Add handling of objects not in database
  Add tests for reserved char escaping in upload
  Properly escape reserved URI charachters in upload urls
  Web.RelMe: Fix having other values in rel attr
  Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
  Include admins in nodeinfo
  Typo
  rich media: helpers: rework validate_page_url()
  local -> only_local
  Format & update docs
  helpers: use AutoLinker to validate URIs as well as the other tests
  ...
2019-03-07 19:54:48 +02:00
Maksim
bc7570c282 [#647] tests for web push 2019-03-06 13:20:12 +00:00
Haelwenn (lanodan) Monnier
a283a1fcd0
Add default config for masto_fe
Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22
2019-03-06 02:26:14 +01:00
Egor Kislitsyn
eb84de0143 allow users to disable their own account 2019-03-04 19:55:11 +07:00
KokaKiwi
b57913b13a Fix supported TLS versions as TLS 1.3 support seems buggy. 2019-03-04 11:30:26 +01:00
Henry Jameson
f95b354c3d configs update 2019-03-03 21:33:48 +02:00
link0ff
19e2b85247 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support 2019-03-03 18:29:37 +02:00
Henry Jameson
af8a7d8fd8 limit 2019-03-02 20:25:21 +02:00
Henry Jameson
ae07bb4779 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (208 commits)
  Web.OAuth.OAuthControllerTest: Add test against token formatting
  Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
  activitypub: fix date header format
  Added migration for setting default tags in existing users records
  config: fix chat endpoint path
  mastodon websocket: return errors using ok, not stop
  mastodon websocket: bring back infinity timeout
  mastodon websocket: use pattern match to get query data, robustly handle errors
  config: update config for cowboy 2 endpoints
  mastodon api: websocket: update code for cowboy 2.x
  mix: update dependencies for cowboy 2.0
  Renamed *DatabaseAuthenticator to *Authenticator.
  Added `auth_template/0` to DatabaseAuthenticator.
  Made auth customization be runtime-configurable.
  Added deactivated to the user view
  Remove parts of the old activity view.
  Add user muted status info to twitterapi.
  Add user muted status info to MastodonAPI.
  Add `with_muted` param.
  Follower requests: Utilize object index.
  ...
2019-03-02 20:20:45 +02:00
William Pitcock
6b2a1ad1c8 config: fix chat endpoint path 2019-02-28 17:00:54 +00:00
William Pitcock
9aec00d711 config: update config for cowboy 2 endpoints 2019-02-28 15:44:12 +00:00
Egor
c3ac9424d2 AutoLinker 2019-02-26 23:32:26 +00:00
link0ff
e278d47023 OpenLDAP support 2019-02-22 15:03:43 +02:00
Egor
bff9eb5ef7 Reports 2019-02-20 16:51:25 +00:00
kaniini
833161b5d2 Merge branch 'feature/jobs' into 'develop'
Job Queue

See merge request pleroma/pleroma!732
2019-02-18 19:43:06 +00:00