alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,843 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

8843 Commits

Author SHA1 Message Date
rinpatch 00d1752031 Merge branch 'docs/new_user' into 'develop' 
CLI_tasks/user.md: Fix `pleroma.user new` documentation

Closes #1621

See merge request pleroma/pleroma!2286
 2020-03-11 20:26:50 +00:00
feld 2019f3b3ff Merge branch 'fix/signup-without-email' into 'develop' 
Allow account registration without an email

See merge request pleroma/pleroma!2246
 2020-03-11 16:53:05 +00:00
rinpatch 7cdabdc0df Merge branch 'fix/1610-release-compilation-config-fix' into 'develop' 
Merging default release config on app start

Closes #1610

See merge request pleroma/pleroma!2288
 2020-03-11 15:16:18 +00:00
feld f92c447bbc Merge branch 'relay-list-change' into 'develop' 
Relay list shows hosts without accepted follow

See merge request pleroma/pleroma!2240
 2020-03-11 15:10:09 +00:00
rinpatch c3b9fbd3a7 Revert "Set better Cache-Control header for static content" 
On furher investigation it seems like all that did was cause unintuitive
behavior. The emoji request flood that was the reason for introducing it
isn't really that big of a deal either, since Plug.Static only needs to
read file modification time and size to determine the ETag.

Closes #1613
 2020-03-11 17:58:25 +03:00
Alexander Strizhakov fce090c1de
using Pleroma.Config instead of ets 2020-03-11 17:22:50 +03:00
Alexander Strizhakov 193d67cde5
compile fix 2020-03-11 16:43:58 +03:00
Alexander Strizhakov 282a93554f
merging release default config on app start 2020-03-11 16:25:53 +03:00
Ivan Tashkinov 5b696a8ac1 [#1560] Enforced authentication for non-federating instances in StaticFEController. 2020-03-11 14:05:56 +03:00
rinpatch 9dbf493b65 Merge branch 'docs/debian-install' into 'develop' 
installation/otp_en.md: Fix pleroma.nginx target [deb]

See merge request pleroma/pleroma!2280
 2020-03-11 10:39:06 +00:00
Haelwenn (lanodan) Monnier 6316726a5f
CLI_tasks: Use manpage formatting conventions 
- [] for options
- <> for mandatory arguments
- foo ... when foo can be repeated

[ci skip]
 2020-03-11 08:48:50 +01:00
Haelwenn (lanodan) Monnier a06104b9d5
CLI_tasks/user.md: Fix `pleroma.user new` documentation 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1621

[ci skip]
 2020-03-11 08:36:25 +01:00
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
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
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
Maksim Pechnikov edb659dc57 Merge branch 'develop' into issue/1276 2020-03-08 14:10:59 +03: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
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
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
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
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
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
feld 9b740cfb23 Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop' 
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default

Closes #1596

See merge request pleroma/pleroma!2267
 2020-03-04 18:22:37 +00:00