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

575 Commits

Author SHA1 Message Date
Egor Kislitsyn cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination 2020-04-10 14:18:57 +04:00
rinpatch 9abf13abe0 CHANGELOG.md: update 2.0.2 release date 2020-04-09 15:46:12 -05:00
rinpatch adeb82e496 CHANGELOG.md: add 2.0.2 update notes 2020-04-09 15:45:41 -05:00
rinpatch 0b8f9a66ae CHANGELOG.md: add entries for funkwhale-related changes 2020-04-09 15:45:35 -05:00
rinpatch 7306d2d069 CHANGELOG.md: Add 2.0.2 entry 2020-04-09 15:45:25 -05:00
rinpatch 2a08f44b02 CHANGELOG.md: Add upgrade notes for 2.0.1 2020-04-09 15:43:54 -05:00
rinpatch 781ac28859 changelog.md: add 2.0.1 entry 2020-04-09 15:42:01 -05:00
Egor Kislitsyn c826d5195f
Update CHANGELOG 2020-04-09 23:36:17 +04:00
Alexander Strizhakov 73134e248a
no changelog entry - bug fixed only in develop 2020-04-09 08:03:21 +03:00
Alexander Strizhakov 5739c498c0
fix for gun connections pool 2020-04-08 18:46:01 +03:00
lain 1d4ab06505 Merge branch 'featureflag/emoji_reactions' into 'develop' 
Add emoji reactions to features in nodeinfo

See merge request pleroma/pleroma!2313
 2020-04-06 12:51:35 +00:00
Alexander Strizhakov df5f89c0d6
test for default features and changelog entry 2020-03-31 18:22:25 +03:00
Alexander Strizhakov 2afc7a9112
changelog fix 2020-03-30 12:16:45 +03:00
Alexander Strizhakov f497cf2f7c
Merge branch 'develop' into gun 2020-03-30 12:15:23 +03:00
lain 1d75d0ed7a Merge branch 'admin-api-change-password' into 'develop' 
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`

See merge request pleroma/pleroma!2149
 2020-03-24 17:34:13 +00:00
Egor Kislitsyn 4a2538967c
Support pagination in conversations 2020-03-24 20:18:27 +04:00
Alexander Strizhakov 9bae9b1b1b
Merge branch 'develop' into gun 2020-03-20 20:47:54 +03:00
Alexander Strizhakov fe15f0ba15
restrict_unauthenticated setting 2020-03-20 16:36:20 +03:00
Alexander Strizhakov 98a60df41f
include_types parameter in /api/v1/notifications 2020-03-20 13:18:12 +03:00
Alexander Strizhakov f9ecb513fa
Merge branch 'develop' into gun 2020-03-18 14:08:21 +03:00
eugenijm 13cce9c0de Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`. 2020-03-16 20:42:37 +03:00
eugenijm d198e7fa2a Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password` 2020-03-16 20:32:07 +03:00
Alexander Strizhakov f3791add99
removing with_move parameter 2020-03-16 20:07:45 +03:00
Alexander Strizhakov f0651730bd
Merge branch 'develop' into gun 2020-03-16 14:25:55 +03:00
Haelwenn (lanodan) Monnier d1379c4de8
Formatting: Do not use \n and prefer <br> instead 
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.

Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
 2020-03-13 16:07:17 +01:00
Alexander Strizhakov 39ed608b13
Merge branch 'develop' into gun 2020-03-12 18:31:10 +03: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
Alexander Strizhakov d9f8941dac
Merge branch 'develop' into gun 2020-03-09 10:56:33 +03:00
Alexander Strizhakov b2eb1124d1
Merge branch 'develop' into gun 2020-03-07 12:41:37 +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
Mark Felder ec3dc462ff Document the instance stats fix 2020-03-04 13:41:04 -06:00
Alexander Strizhakov 509c81e4b1
Merge branch 'develop' into gun 2020-03-03 10:08:07 +03:00
Egor Kislitsyn 4f3313bf80
Merge remote-tracking branch 'origin/develop' into fix/signup-without-email 2020-03-03 00:29:51 +04:00
lain 4c02e04935 Merge branch 'prepared-statements-settings' into 'develop' 
Prepared statements settings

See merge request pleroma/pleroma!2238
 2020-03-02 17:00:04 +00:00
Egor Kislitsyn 4a45b96a91
Merge branch 'develop' into fix/signup-without-email 2020-03-02 15:35:49 +04:00
Alexander Strizhakov d9e4b77f8b
Merge branch 'develop' into gun 2020-03-01 12:48:49 +03:00
rinpatch e6ccf12129 changelog: entries for timeline DoS fixes 2020-03-01 01:13:08 +03:00
Alexander Strizhakov 814b275af7
Merge branch 'develop' into gun 2020-02-29 11:34:50 +03:00
feld f2216287a7 Merge branch 'admin-status-list' into 'develop' 
Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)

Closes #1550

See merge request pleroma/pleroma!2192
 2020-02-27 18:11:04 +00:00
eugenijm 4ab07cf0d5 Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses` 2020-02-26 22:35:57 +03:00
eugenijm e2a6a40367 Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`) 2020-02-26 20:21:38 +03:00
Egor Kislitsyn f446744a6a
Allow account registration without an email 2020-02-26 20:13:53 +04:00
lain e4804137b3 Document database default changes 2020-02-25 11:53:51 +01:00
eugenijm 7ad5c51f23 Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope 2020-02-24 21:46:37 +03:00
Ivan Tashkinov 8f0ca19b9c Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 
# Conflicts:
#	CHANGELOG.md
#	config/config.exs
 2020-02-22 09:31:43 +03:00
Alexander Strizhakov 13918cb545
Merge branch 'develop' into gun 2020-02-21 10:02:37 +03:00
Haelwenn c5570e0493 Merge branch 'single_emoji_reaction' into 'develop' 
Single emoji reaction

Closes #1578

See merge request pleroma/pleroma!2226
 2020-02-20 23:50:40 +00:00
lain 3eddd9caa6 Merge branch 'require-signature' into 'develop' 
Add an option to require fetches to be signed

Closes #1444

See merge request pleroma/pleroma!2071
 2020-02-20 12:13:21 +00:00
Ivan Tashkinov 0c65a8c3d0 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 
# Conflicts:
#	config/config.exs
 2020-02-20 15:00:48 +03:00