Commit graph

12076 commits

Author SHA1 Message Date
Alexander Strizhakov
61c609884c
UserFetcherPlug module name 2020-10-13 16:42:51 +03:00
Alexander Strizhakov
1d16cd0c3d
UserIsAdminPlug module name 2020-10-13 16:42:50 +03:00
Alexander Strizhakov
2125286e90
fix for fallback controller 2020-10-13 16:42:50 +03:00
Alexander Strizhakov
e267991a44
renaming LimiterSupervisor 2020-10-13 16:42:48 +03:00
Alexander Strizhakov
6a87f94ee2
renaming ratelimiter supervisor 2020-10-13 16:38:48 +03:00
Alexander Strizhakov
2501793f81
moving plugs into web dir 2020-10-13 16:38:19 +03:00
Alexander Strizhakov
0374df1d12
other files consistency 2020-10-13 16:38:19 +03:00
Alexander Strizhakov
fc7151a9c4
more files renamings 2020-10-13 16:38:19 +03:00
Alexander Strizhakov
e8e4034c48
metadata providers consistency 2020-10-13 16:38:18 +03:00
Alexander Strizhakov
b5b4395e4a
oauth consistency 2020-10-13 16:38:18 +03:00
Alexander Strizhakov
7acf09beb8
more tests 2020-10-13 16:38:18 +03:00
Alexander Strizhakov
103f3dcb9e
rich media parser ttl files consistency 2020-10-13 16:38:15 +03:00
Alexander Strizhakov
7dffaef479
tests consistency 2020-10-13 16:35:09 +03:00
Alexander Strizhakov
6bf85440b3
mix tasks consistency 2020-10-13 16:33:24 +03:00
Alexander Strizhakov
b573711e9c
file locations consistency 2020-10-13 16:33:24 +03:00
Mark Felder
eea879eb36 Update AdminFE build to latest develop 2020-10-13 07:51:48 -05:00
lain
5ed7eb1a26 Merge branch 'preload-frontend-config' into 'develop'
Preload `/api/pleroma/frontend_configurations`, fixes #1932

Closes #1932

See merge request pleroma/pleroma!3075
2020-10-13 11:33:39 +00:00
Alex Gleason
83ae45b000
Preload /api/pleroma/frontend_configurations, fixes #1932 2020-10-12 18:49:37 -05:00
feld
42b4b95467 Merge branch 'docs/improve-backup-restore' into 'develop'
Further improvements to backup/restore docs

See merge request pleroma/pleroma!3072
2020-10-12 17:46:25 +00:00
Mark Felder
c4fae2611f Switch Majic to a copy hosted in our GitLab 2020-10-12 12:25:45 -05:00
feld
03855f9789 Merge branch 'improve/instance-gen' into 'develop'
#2159 Support enabling upload filters during instance gen

See merge request pleroma/pleroma!3070
2020-10-12 17:24:24 +00:00
Mark Felder
6ec1b1615b Further improvements 2020-10-12 12:23:20 -05:00
feld
68d0380633 Merge branch 'chore/copyright-headers' into 'develop'
Add missing Copyright headers

See merge request pleroma/pleroma!3071
2020-10-12 17:20:09 +00:00
Mark Felder
8539e386c3 Add missing Copyright headers 2020-10-12 12:00:50 -05:00
Mark Felder
6c61ef14c3 Support enabling upload filters during instance gen 2020-10-12 11:19:48 -05:00
feld
bc3cf0fee0 Merge branch 'feat/deep-link-account-approval' into 'develop'
Deep link to the user account in AdminFE in account confirmation emails

See merge request pleroma/pleroma!3065
2020-10-09 22:35:09 +00:00
Mark Felder
3ca98878d2 Deep link to the user account in AdminFE in account confirmation emails 2020-10-09 17:08:05 -05:00
feld
1aabc0672e Merge branch 'docs/improve-backup-restore' into 'develop'
Spelling

See merge request pleroma/pleroma!3063
2020-10-09 16:30:35 +00:00
Mark Felder
04b514c567 Merge branch 'develop' into feature/gen-magic 2020-10-09 11:26:10 -05:00
Mark Felder
ec217ca638 Spelling 2020-10-09 11:18:48 -05:00
feld
d239bd3ca4 Merge branch 'docs/improve-backup-restore' into 'develop'
#2219 Improve backup/restore documentation

See merge request pleroma/pleroma!3061
2020-10-09 14:25:24 +00:00
Mark Felder
1e5fec8d45 Ask user to use matching values for database setup 2020-10-09 09:14:02 -05:00
Mark Felder
e0c5adcc20 Syntax error 2020-10-08 15:56:37 -05:00
Mark Felder
5f38e03c8a Don't always need to drop 2020-10-08 15:54:28 -05:00
Mark Felder
a02ed3920f Improve backup/restore documentation 2020-10-08 15:51:56 -05:00
Haelwenn
74be4de3f6 Merge branch 'fix/2209-remoteip' into 'develop'
#2209 RemoteIP CIDR helper, config and doc improvements

See merge request pleroma/pleroma!3057
2020-10-08 17:29:00 +00:00
Mark Felder
a702f9fb5b Lint 2020-10-07 15:07:03 -05:00
Maksim
6ee20eb328 Apply 1 suggestion(s) to 1 file(s) 2020-10-07 19:32:42 +00:00
Maksim
8bfc5d9a0c Apply 1 suggestion(s) to 1 file(s) 2020-10-07 19:32:09 +00:00
feld
d0eca5b125 Apply 2 suggestion(s) to 2 file(s) 2020-10-07 19:16:53 +00:00
Mark Felder
b90eda3d8b Improve description yet again 2020-10-06 17:36:29 -05:00
Mark Felder
e08eb4aba0 Don't leak internal variables in the docs. They're useless to users. 2020-10-06 17:29:56 -05:00
Mark Felder
7a2ed2fc90 Credo 2020-10-06 17:26:31 -05:00
Mark Felder
b8c05f4876 Improve descriptions for reserved and proxies 2020-10-06 17:21:27 -05:00
Mark Felder
9783e9cd80 Add test for an entry without CIDR format 2020-10-06 17:08:26 -05:00
Mark Felder
d43d05005a Move hardcoded default configuration into config.exs 2020-10-06 17:02:46 -05:00
Mark Felder
7aff2b47c5 Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For by default. 2020-10-06 15:47:11 -05:00
feld
f9ece1a7f6 Merge branch 'revert/rich-media-censorship' into 'develop'
#2192 Revert Rich Media censorship for sensitive statuses

See merge request pleroma/pleroma!3044
2020-10-06 20:19:39 +00:00
Mark Felder
21a73ce9f2 Document the NSFW link preview change 2020-10-06 14:54:21 -05:00
Mark Felder
cddca85c84 Merge branch 'develop' into revert/rich-media-censorship 2020-10-06 14:25:20 -05:00