moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,039 Commits 2 Branches 0 Tags 201 MiB
Commit Graph

9039 Commits

Author SHA1 Message Date
Haelwenn 8ad73445cd Merge branch 'bugfix/bad-pleromafe-bundle' into 'develop' 
static-fe.css: Restore from before a65ee8ea

See merge request pleroma/pleroma!2284
 2020-03-11 07:25:35 +00:00
Ivan Tashkinov 972889550d Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions 2020-03-11 09:15:55 +03:00
Haelwenn (lanodan) Monnier a747eb6df9
static-fe.css: Restore from before a65ee8ea 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
 2020-03-11 06:35:26 +01:00
lain 953aece848 Merge branch 'fix/post-length-validation' into 'develop' 
Fix enforcement of character limits

Closes #1618

See merge request pleroma/pleroma!2283
 2020-03-10 18:16:10 +00:00
Mark Felder 5af798f246 Fix enforcement of character limits 2020-03-10 13:08:00 -05:00
Alexander Strizhakov f39e1b9eff
add verify tls_opts only when we open connection 
for other requests tesla will add tls_opts
 2020-03-10 15:54:11 +03:00
Alexander Strizhakov 426f5ee48a
tesla adapter can't be changed in adminFE 2020-03-10 15:31:44 +03:00
Haelwenn (lanodan) Monnier 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
 2020-03-10 11:49:23 +01:00
Ivan Tashkinov 5fc92deef3 [#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring. 2020-03-09 20:51:44 +03:00
lain 841e4e4d83 Merge branch 'patch-1' into 'develop' 
Better advice for vacuuming after restoring.

See merge request pleroma/pleroma!2233
 2020-03-09 13:36:21 +00:00
Alexander Strizhakov d9f8941dac
Merge branch 'develop' into gun 2020-03-09 10:56:33 +03:00
rinpatch 5b74976c8d Merge branch 'chore/mix-version-bump' into 'develop' 
mix.exs: bump version to development one

See merge request pleroma/pleroma!2279
 2020-03-08 20:31:54 +00:00
rinpatch 86e7709a4d mix.exs: bump version to development one 2020-03-08 23:24:30 +03:00
rinpatch 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
 2020-03-08 13:42:15 +00:00
rinpatch e8493431bf Merge branch 'release/2.0.0' into 'stable' 
Release/2.0.0

See merge request pleroma/pleroma!2273
 2020-03-08 10:38:35 +00:00
rinpatch e7c49d51d7 pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af 2020-03-07 18:18:43 +03:00
rinpatch 80ca06227a Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0' 
moderation log: fix improperly migrated data

See merge request pleroma/pleroma!2277
 2020-03-07 14:45:00 +00:00
rinpatch 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
 2020-03-07 17:00:58 +03:00
Alexander Strizhakov 474ef512df wait in mix task while pleroma is rebooted 2020-03-07 16:02:55 +03:00
Alexander Strizhakov b2eb1124d1
Merge branch 'develop' into gun 2020-03-07 12:41:37 +03:00
rinpatch 6d797b9928 Merge branch 'restart-fix-for-mix-tasks' into 'develop' 
Wait in mix task while pleroma is rebooted

See merge request pleroma/pleroma!2225
 2020-03-07 09:32:29 +00:00
Alexander Strizhakov 5f42ecc4c7
start gun upload pool, if proxy_remote is enabled 2020-03-07 12:24:39 +03:00
Alexander Strizhakov 9f884a2639
tests changes 2020-03-07 11:01:37 +03:00
Alexander Strizhakov 14678a7708
using `stub` instead `expect` 2020-03-07 10:12:34 +03:00
rinpatch 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
 2020-03-06 20:23:39 +00:00
Alexander Strizhakov 78282dc983
little polishing 2020-03-06 21:24:19 +03:00
Alexander Strizhakov c93c3096d5
little refactor 2020-03-06 21:04:18 +03:00
Alexander Strizhakov 56ff02f2ef
removing GunMock to use Mox 2020-03-06 20:23:58 +03:00
feld 46f118d7e1 Merge branch 'revert-67cc4dce' into 'develop' 
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"

See merge request pleroma/pleroma!2276
 2020-03-06 16:03:24 +00:00
feld 15d36b7f5f Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'" 
This reverts merge request !2274
 2020-03-06 15:56:41 +00:00
Mark Felder e25bacabb1 Remove EmojiPacks from AdminFE build 
Once more, with feeling
 2020-03-06 09:54:38 -06:00
lain 67cc4dceb5 Merge branch 'update/admin-fe-without-emojipack' into 'develop' 
Remove emoji support from AdminFE

See merge request pleroma/pleroma!2274
 2020-03-06 15:14:10 +00:00
Mark Felder d283c9abc1 Remove emoji support from AdminFE 2020-03-06 07:53:33 -06:00
Ivan Tashkinov 027714b519 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions 2020-03-06 11:48:30 +03:00
rinpatch a65ee8ead6 pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd 2020-03-05 23:41:47 +03:00
rinpatch 4271cfb81a Merge branch 'stable' into release/2.0.0 2020-03-05 22:38:38 +03:00
rinpatch 7605fe5065 Merge branch 'stable' into release/2.0.0 2020-03-05 22:36:35 +03:00
rinpatch 3508ae7039 version bump changelog and mix version 2020-03-05 22:35:23 +03:00
rinpatch 69a85e9c82 changelog: sync with stable 2020-03-05 22:28:37 +03:00
Ivan Tashkinov 40765875d4 [#1560] Misc. improvements in ActivityPubController federation state restrictions. 2020-03-05 21:19:21 +03:00
Alexander Strizhakov 931111fd55
removing integration tests 2020-03-05 18:57:45 +03:00
Alexander Strizhakov 058c9b01ac
returning, not needed 2020-03-05 18:28:04 +03:00
Alexander Strizhakov f0753eed0f
removing try block in tesla request 
added mocks for tests which fail with Tesla.Mock.Error
 2020-03-05 17:31:06 +03:00
eugenijm ad22e94f33 Exclude private and direct statuses visible to the admin when using godmode 2020-03-05 15:15:27 +03:00
lain 47604907c9 Merge branch 'proper_error_messages' into 'develop' 
MastodonController: Return 404 errors correctly.

See merge request pleroma/pleroma!2270
 2020-03-05 11:49:51 +00:00
lain f1750b4658 Admin API tests: Fix wrong test. 2020-03-05 12:42:02 +01:00
Haelwenn 927079e2ff Merge branch 'fix/stats-on-startup' into 'develop' 
Generate instance stats on startup

Closes #1598

See merge request pleroma/pleroma!2271
 2020-03-05 07:25:23 +00:00
Alexander Strizhakov eb324467d9
removing try block in getting gun info 2020-03-05 09:51:52 +03:00
Mark Felder ec3dc462ff Document the instance stats fix 2020-03-04 13:41:04 -06:00
Mark Felder cdb05633a6 Generate instance stats on startup 2020-03-04 13:33:26 -06:00