Commit Graph

582 Commits (4ce4d799fd9fa5ab4fde6c6aa55bf8b516d64c12)

Author SHA1 Message Date
lain 4ce4d799fd Config: Add frontend information.
4 years ago
lain dc36d6e9d2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
4 years ago
lain 79f9ddd8b7 Merge branch 'by-approval' into 'develop'
4 years ago
lain e2f82968e8 Config: Update frontend config example
4 years ago
Mark Felder bee29f6610 Clarify location of frontends directory
4 years ago
lain 08732e8a03 Docs: Add frontend info to cheat sheet.
4 years ago
Alex Gleason 6f44a0ee84
Add configurable registration_reason limit
4 years ago
Alex Gleason 6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Alex Gleason 6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Maksim Pechnikov 67ab9a7928 Merge branch 'develop' into issue/1934-welcome-email
4 years ago
Maksim Pechnikov 5879d36854 fix sender for welcome email
4 years ago
lain 5b1eeb06d8 Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
4 years ago
lain 696c13ce54 Revert "Merge branch 'linkify' into 'develop'"
4 years ago
Maksim Pechnikov 3edaecae96 added welcome email
4 years ago
Alex Gleason 38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
4 years ago
Mark Felder b2d398b1d0 Merge branch 'develop' into refactor/gun-pool-registry
4 years ago
rinpatch c413649a8d Bring back oban job pruning
4 years ago
rinpatch 33747e9366 config.exs: set gun retries to 0
4 years ago
rinpatch 9df5918974 config.exs: make gun the default again
4 years ago
rinpatch 4128e3a84a HTTP: Implement max request limits
4 years ago
rinpatch 58a4f350a8 Refactor gun pooling and simplify adapter option insertion
4 years ago
Alex Gleason 51ab8d0128
Add `account_approval_required` instance setting
4 years ago
Mark Felder 3c0c1fd2ef Merge branch 'develop' into issue/1790-updated-oban
4 years ago
Haelwenn (lanodan) Monnier 312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false
4 years ago
lain 8939ff39e4 Merge branch 'remove-twitter-api' into 'develop'
4 years ago
DYM a784c09db8 added hyper:// to default protocols
4 years ago
lain 65fd28e0c4 Config: Remove Statusnet preloader.
4 years ago
lain af7720237b Upload: Restrict description length
4 years ago
Mark Felder 4695bdd81b Merge branch 'develop' into issue/1790-updated-oban
4 years ago
Alex Gleason 8daacc9114
AutoLinker --> Linkify, update to latest version
4 years ago
lain 0313520cd2 Config: Reduce default preloaders to configuration endpoints.
4 years ago
feld 8288419686 Merge branch 'preload-data' into 'develop'
4 years ago
Maksim Pechnikov 439a1a0218 added wrapper Pleroma.HTTP for ExAws.S3
4 years ago
Maksim Pechnikov 721fc7c554 added wrapper Pleroma.HTTP for Tzdata.HTTPClient
4 years ago
Haelwenn c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
4 years ago
Maksim Pechnikov a8d967762e migrate to oban 2.0-rc1
4 years ago
Mark Felder bf8310f380 Add missing default config value for :instance, instance_thumbnail
4 years ago
Mark Felder 3462d4b995 Merge branch 'develop' into issue/1855
4 years ago
Alexander Strizhakov ed189568f3
moving mrf settings from instance to separate group
4 years ago
Maksim Pechnikov 579763126f Merge branch 'develop' into issue/1855
4 years ago
Maksim Pechnikov 2e8a236cef fix invalidates media url's
4 years ago
Mark Felder 26f710b9e3 Merge branch 'develop' into preload-data
4 years ago
Egor Kislitsyn 697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
Egor Kislitsyn 1f35acce54
Merge OGP parser with TwitterCard
4 years ago
Egor Kislitsyn da22119c2f
Merge branch 'develop' into global-status-expiration
4 years ago
stwf 75e886b506 fix config
4 years ago
stwf 906ac57ba8 Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-data
4 years ago
stwf 5677b21e82 clean up
4 years ago
stwf 3b8180d7d1 add status_net/config
4 years ago
stwf 29ae5bb771 preload data into index.html
4 years ago