hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
14,958 commits 1 branch 0 tags 221 MiB
Commit graph

846 commits

Author SHA1 Message Date
href
ec1452fd1c Pleroma.MIME: use gen_magic 2020-06-16 15:15:50 +02:00
Maksim Pechnikov
579763126f Merge branch 'develop' into issue/1855 2020-06-15 15:24:55 +03:00
Maksim Pechnikov
2e8a236cef fix invalidates media url's 2020-06-14 21:02:57 +03:00
Mark Felder
26f710b9e3 Merge branch 'develop' into preload-data 2020-06-12 16:52:52 -05:00
Egor Kislitsyn
697cf92024
 		Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers 2020-06-12 18:25:29 +04:00
Egor Kislitsyn
1f35acce54
 		Merge OGP parser with TwitterCard 2020-06-11 17:57:31 +04:00
Egor Kislitsyn
da22119c2f
 		Merge branch 'develop' into global-status-expiration 2020-06-08 17:21:47 +04:00
stwf
75e886b506 fix config 2020-06-03 17:32:03 -04:00
stwf
906ac57ba8 Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-data 
# Conflicts:
#	lib/pleroma/web/preload/status_net.ex
 2020-06-03 17:25:53 -04:00
stwf
5677b21e82 clean up 2020-06-03 17:24:35 -04:00
stwf
3b8180d7d1 add status_net/config 2020-06-03 16:34:03 -04:00
stwf
29ae5bb771 preload data into index.html 2020-06-03 16:34:03 -04:00
stwf
aa26dc6a13 add status_net/config 2020-06-03 13:40:48 -04:00
lain
6977500ef7 Merge branch 'tagline' into 'develop' 
Update default instance description

See merge request pleroma/pleroma!2600
 2020-06-02 14:10:53 +00:00
Egor Kislitsyn
a7627bdc7a
 		Merge remote-tracking branch 'origin/develop' into global-status-expiration 2020-06-01 15:48:51 +04:00
lain
ac31f687c0 Config: Default to Hackney again 
Gun needs some server setting changes (files) and has problems with
OTP 23 (wildcards), so use Hackney as a default again for now.
 2020-06-01 13:35:39 +02:00
stwf
d67b302810 preload data into index.html 2020-05-29 14:15:24 -04:00
Alex Gleason
d4a18d44fe
 		Update default instance description 2020-05-28 11:56:30 -05:00
lain
337ca33e5e Config: Restore old new background image 
Became lost in a settings restructure
 2020-05-26 16:00:56 +02:00
Henry Jameson
8676f39421 Merge remote-tracking branch 'origin/develop' into shigusegubu 
* origin/develop:
  Apply suggestion to lib/pleroma/web/common_api/utils.ex
  Update CHANGELOG and docs
  Add filename_display_max_length config
  priv/static: Add a warning discouraging admins from modifying the static files directly
  Fix notifications mark as read API
  EmojiReactionController: Return more appropriate error.
  Credo fixes for the credo god.
  AnnounceValidator: Check for announcability
  Credo fixes.
  Announcements: Fix all tests.
  SideEffects: Builed out Announce effects.
  Pipeline: Don't federate if federation is disabled.
  Announcements: Handle through common pipeline.
  CommonAPI: Change public->private implicit addressing.
  AnnounceValidator: Validate for existing announce
  ObjectValidators: Add basic Announce validator.
  TransmogrifierTest: Fix tests.
  Transmogrifier Test: Extract Announce handling.
 2020-05-23 02:33:15 +03:00
Roman Chvanikov
cc82229ba7 Add filename_display_max_length config 2020-05-22 18:19:25 +03:00
Henry Jameson
f20479ded8 fix 2020-05-22 00:37:24 +03:00
Henry Jameson
2a06b66daf fix 2020-05-22 00:33:59 +03:00
Henry Jameson
f9b13c754c Merge remote-tracking branch 'origin/develop' into shigusegubu 
* origin/develop: (269 commits)
  Apply suggestion to docs/administration/CLI_tasks/user.md
  rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`
  Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
  fixed `mix pleroma.instance gen`
  Also add new sidebarRight setting
  Add `background_image` to `InstanceOperation`
  Move notification actions to PleromaAPI.NotificationController
  Move conversation actions to PleromaAPI.ConversationController
  Move reaction actions to EmojiReactionController
  Add OpenAPI spec for PleromaAPI.PleromaAPIController
  Changelog: Add background to instance
  Docs: Add background_image in instance
  InstanceOperation: Add background image to example
  MastoFE: update to bundle-2020-05-20
  Apply suggestion to installation/nginx-cache-purge.sh.example
  update purge script
  Synchronize :fe settings in config.exs
  Fix summary
  User.Query: Remove superfluous `distinct`
  UserTest: Hide warning in tests.
  ...
 2020-05-22 00:29:15 +03:00
Ivan Tashkinov
3a1e810aaa [#2497] Customized exexec launch to support root operation (currently required by Gitlab CI). 2020-05-21 21:47:32 +03:00
Haelwenn
42b06d78df Merge branch 'chore/update-config-fe' into 'develop' 
Synchronize :fe settings in config.exs

See merge request pleroma/pleroma!2560
 2020-05-20 17:45:19 +00:00
Ivan Tashkinov
6fd4f58ead Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy 2020-05-20 20:27:03 +03:00
Ivan Tashkinov
1871a5ddb4 [#2497] Image preview proxy: implemented ffmpeg-based resizing, removed eimp & mogrify-based resizing. 2020-05-20 20:26:43 +03:00
Mark Felder
4c48626585 Also add new sidebarRight setting 2020-05-20 12:22:31 -05:00
Haelwenn
94ba5a7802 Merge branch 'exposed-background-image' into 'develop' 
InstanceView: Expose background image link.

See merge request pleroma/pleroma!2545
 2020-05-20 10:53:54 +00:00
lain
6dd1575c64 Merge branch 'issue/1509' into 'develop' 
[#1509]  purge media from cache after delete

See merge request pleroma/pleroma!2539
 2020-05-20 10:35:36 +00:00
Mark Felder
918ee46417 Synchronize :fe settings in config.exs 2020-05-19 16:05:39 -05:00
lain
188b32145e InstanceView: Expose background image link. 
This will make it easier for more clients to support this feature.
 2020-05-18 13:29:30 +02:00
Maksim Pechnikov
c33a4315fb updated docs 2020-05-18 06:48:19 +03:00
Maksim Pechnikov
3f8d68bdf3 added example cache purge script 2020-05-17 05:56:20 +03:00
Maksim Pechnikov
cb40602a16 added media proxy invalidation 2020-05-15 21:39:42 +03:00
Ivan Tashkinov
f1f588fd52 [#2497] Added support for :eimp for image resizing. 2020-05-14 20:18:31 +03:00
Ivan Tashkinov
1b23acf164 [#2497] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments. 2020-05-11 23:21:53 +03:00
Ivan Tashkinov
bbdad85568 Initial implementation of image preview proxy. Media proxy tests refactoring. 2020-05-08 23:06:47 +03:00
Ivan Tashkinov
b2924ab1fb Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding 2020-05-08 21:37:55 +03:00
Maksim
3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
Egor Kislitsyn
decaa64f75
 		Merge branch 'develop' into global-status-expiration 2020-05-05 14:28:54 +04:00
Egor Kislitsyn
f070b5569c
 		Add a config option to enable strict validation 2020-05-04 22:33:05 +04:00
Henry Jameson
74db8f4769 Merge remote-tracking branch 'origin/develop' into shigusegubu 
* origin/develop: (381 commits)
  CHANGELOG.md: Add entry for re-registration ban
  Reword changelog entry for follow relationship bug
  Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`
  Deactivate local users on deletion instead of deleting the record
  [#1732] Made AP C2S :followers and :following endpoints serve on no auth (as for related :api pipeline endpoints).
  PleromaFE bundle supporting follow request notifications. 5f90b6a384
  static-fe.css: Restore and move to /priv/static/static-fe
  OpenAPI: Add `follow_request` to notification types
  Fix sporadic test compilation failure caused by unused alias
  OpenAPI: Remove max pagination limit from the spec
  Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (`with_move`).
  MappedSignatureToIdentityPlug: Fix.
  Signature: Handle non-ap ids in key ids.
  Made follow request notifications non-optional (removed config switch).
  Increase tests on AP C2S
  Dismiss the follow request notification on rejection
  fix for auth check
  docs update
  docs fix
  list of options for pack metadata
  ...
 2020-05-02 20:03:41 +03:00
Ivan Tashkinov
d5cdc907e3 Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering). 
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
 2020-05-01 18:45:24 +03:00
Ivan Tashkinov
92efb888c7 Made follow request notifications non-optional (removed config switch). 2020-05-01 09:51:41 +03:00
Egor Kislitsyn
c56c0a3d23
 		Merge branch 'develop' into global-status-expiration 2020-04-24 18:37:58 +04:00
Egor Kislitsyn
364eecc49f
 		Merge branch 'develop' into global-status-expiration 2020-04-20 20:37:56 +04:00
Alex Gleason
bedc558809
 		Merge remote-tracking branch 'upstream/develop' into accept-deletes 2020-04-20 10:15:40 -05:00
Alex Gleason
b54c8813d6
 		Add :reject_deletes option to SimplePolicy 2020-04-20 10:11:06 -05:00