5b696a8ac1
[ #1560 ] Enforced authentication for non-federating instances in StaticFEController.
5 years ago
9dbf493b65
Merge branch 'docs/debian-install' into 'develop'
...
installation/otp_en.md: Fix pleroma.nginx target [deb]
See merge request pleroma/pleroma!2280
5 years ago
6316726a5f
CLI_tasks: Use manpage formatting conventions
...
- [] for options
- <> for mandatory arguments
- foo ... when foo can be repeated
[ci skip]
5 years ago
a06104b9d5
CLI_tasks/user.md: Fix `pleroma.user new` documentation
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1621
[ci skip]
5 years ago
8ad73445cd
Merge branch 'bugfix/bad-pleromafe-bundle' into 'develop'
...
static-fe.css: Restore from before a65ee8eapleroma/pleroma!2284
5 years ago
972889550d
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
a747eb6df9
static-fe.css: Restore from before a65ee8ea
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
5 years ago
953aece848
Merge branch 'fix/post-length-validation' into 'develop'
...
Fix enforcement of character limits
Closes #1618
See merge request pleroma/pleroma!2283
5 years ago
5af798f246
Fix enforcement of character limits
5 years ago
f39e1b9eff
add verify tls_opts only when we open connection
...
for other requests tesla will add tls_opts
5 years ago
426f5ee48a
tesla adapter can't be changed in adminFE
5 years ago
d9134d4430
installation/otp_en.md: Fix pleroma.nginx target [deb]
...
Needs to be backported to stable.
Related: https://git.pleroma.social/pleroma/pleroma-support/issues/29
5 years ago
5fc92deef3
[ #1560 ] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
5 years ago
841e4e4d83
Merge branch 'patch-1' into 'develop'
...
Better advice for vacuuming after restoring.
See merge request pleroma/pleroma!2233
5 years ago
d9f8941dac
Merge branch 'develop' into gun
5 years ago
5b74976c8d
Merge branch 'chore/mix-version-bump' into 'develop'
...
mix.exs: bump version to development one
See merge request pleroma/pleroma!2279
5 years ago
86e7709a4d
mix.exs: bump version to development one
5 years ago
663e466067
Merge branch 'stable' into 'develop'
...
Sync develop with stable
Closes #1262 , #1267 , #1293 , #1303 , #1287 , #1291 , #1382 , #1438 , #1129 , #1109 , and #1606
See merge request pleroma/pleroma!2278
5 years ago
e8493431bf
Merge branch 'release/2.0.0' into 'stable'
...
Release/2.0.0
See merge request pleroma/pleroma!2273
5 years ago
e7c49d51d7
pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af
5 years ago
80ca06227a
Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0'
...
moderation log: fix improperly migrated data
See merge request pleroma/pleroma!2277
5 years ago
6cf1958b02
moderation log: fix improperly migrated data
...
Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.
Closes #1606
5 years ago
474ef512df
wait in mix task while pleroma is rebooted
5 years ago
b2eb1124d1
Merge branch 'develop' into gun
5 years ago
6d797b9928
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
...
Wait in mix task while pleroma is rebooted
See merge request pleroma/pleroma!2225
5 years ago
5f42ecc4c7
start gun upload pool, if proxy_remote is enabled
5 years ago
9f884a2639
tests changes
5 years ago
14678a7708
using `stub` instead `expect`
5 years ago
f259b1adab
Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0'
...
Remove EmojiPacks from AdminFE build
See merge request pleroma/pleroma!2275
5 years ago
78282dc983
little polishing
5 years ago
c93c3096d5
little refactor
5 years ago
56ff02f2ef
removing GunMock to use Mox
5 years ago
46f118d7e1
Merge branch 'revert-67cc4dce' into 'develop'
...
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
See merge request pleroma/pleroma!2276
5 years ago
15d36b7f5f
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
...
This reverts merge request !2274
5 years ago
e25bacabb1
Remove EmojiPacks from AdminFE build
...
Once more, with feeling
5 years ago
67cc4dceb5
Merge branch 'update/admin-fe-without-emojipack' into 'develop'
...
Remove emoji support from AdminFE
See merge request pleroma/pleroma!2274
5 years ago
d283c9abc1
Remove emoji support from AdminFE
5 years ago
027714b519
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
a65ee8ead6
pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd
5 years ago
4271cfb81a
Merge branch 'stable' into release/2.0.0
5 years ago
7605fe5065
Merge branch 'stable' into release/2.0.0
5 years ago
3508ae7039
version bump changelog and mix version
5 years ago
69a85e9c82
changelog: sync with stable
5 years ago
40765875d4
[ #1560 ] Misc. improvements in ActivityPubController federation state restrictions.
5 years ago
931111fd55
removing integration tests
5 years ago
058c9b01ac
returning, not needed
5 years ago
f0753eed0f
removing try block in tesla request
...
added mocks for tests which fail with Tesla.Mock.Error
5 years ago
ad22e94f33
Exclude private and direct statuses visible to the admin when using godmode
5 years ago
47604907c9
Merge branch 'proper_error_messages' into 'develop'
...
MastodonController: Return 404 errors correctly.
See merge request pleroma/pleroma!2270
5 years ago
f1750b4658
Admin API tests: Fix wrong test.
5 years ago
Ivan Tashkinov