sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity
6,309 Commits 136 Branches 24 Tags 254 MiB
Commit Graph

6309 Commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier fba0a56f44
instance/panel.html: Add AdminFE link 2019-09-09 11:09:56 +02:00
kaniini 608773c5ef Merge branch 'chore/fix-ap-muted-tests' into 'develop' 
tests: activitypub: fix muted thread tests

See merge request pleroma/pleroma!1584
 2019-08-18 22:33:51 +00:00
Ariadne Conill a2fdc32368 tests: activitypub: fix typo 2019-08-18 22:31:59 +00:00
kaniini 475fcb3e6c Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop' 
Clear follow requests when blocking a user

See merge request pleroma/pleroma!1583
 2019-08-18 21:59:22 +00:00
kaniini 18c8c8d176 Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop' 
Hide muted theads from home/public timelines unless `with_muted` is set

See merge request pleroma/pleroma!1575
 2019-08-18 21:57:55 +00:00
Sadposter 58c1391c4d use commonAPI in tests 2019-08-18 22:54:40 +01:00
Sadposter 94e336d9d5 clear follow requests when blocking a user 2019-08-18 20:30:57 +01:00
lain 7ab2dbbdb6 Merge branch 'pleroma-conversations' into 'develop' 
Extended Pleroma Conversations

See merge request pleroma/pleroma!1535
 2019-08-16 12:55:33 +00:00
rinpatch 0f24edcd8d Merge branch 'fix/oauth-cleanup-worker-unconditional-start' into 'develop' 
Fix OAuth cleanup worker unconditionally starting

See merge request pleroma/pleroma!1578
 2019-08-15 17:51:30 +00:00
rinpatch fba3c16d20 Fix OAuth cleanup worker unconditionally starting 
!1576 removed enabled/disabled check from the worker, in favor of just
not starting it in application.ex if disabled. However a line
unconditionally starting the worker was removed
 2019-08-15 20:36:20 +03:00
kaniini 1c8f58a30e Merge branch 'features/formatting-sub_sup' into 'develop' 
html.ex: Allow sub and sup elements by default

Closes #1191

See merge request pleroma/pleroma!1572
 2019-08-15 17:34:16 +00:00
lain aefb9cdee8 Merge branch 'feature/parallel-rendering' into 'develop' 
Parallelize template rendering

See merge request pleroma/pleroma!1576
 2019-08-15 15:51:11 +00:00
rinpatch 1ad71592ad Parallelize template rendering 2019-08-15 18:05:50 +03:00
rinpatch a4a3e3becd Hide muted theads from home/public timelines unless `with_muted` is set 2019-08-15 17:37:30 +03:00
lain 9fb71ce7f4 Merge branch 'cache-follow-state' into 'develop' 
Cache follow state

Closes #1180

See merge request pleroma/pleroma!1573
 2019-08-15 14:06:27 +00:00
rinpatch 27b747546a Merge branch 'fix/stats-send-after' into 'develop' 
Collect stats immediately after init

See merge request pleroma/pleroma!1574
 2019-08-14 22:10:44 +00:00
rinpatch e8a8d50138 Collect stats immediately after init 2019-08-15 01:01:13 +03:00
rinpatch bd5ad0af78 Cache follow state 2019-08-15 00:47:30 +03:00
rinpatch a9e75fa6a4 Add a task to benchmark timeline rendering 2019-08-15 00:43:02 +03:00
Haelwenn (lanodan) Monnier a6a814420d
html.ex: Allow sub and sup elements by default 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1191
 2019-08-14 22:49:13 +02:00
rinpatch 31d576de0c Merge branch 'misc-otp-issues' into 'develop' 
Misc OTP issues

See merge request pleroma/pleroma!1567
 2019-08-14 19:22:15 +00:00
rinpatch dc902ad3df Merge branch 'fix/http-signatures-post' into 'develop' 
activitypub: publisher: add (request-target) to http signature when POSTing

See merge request pleroma/pleroma!1569
 2019-08-14 19:16:52 +00:00
kaniini 1754f8ce6d Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex 2019-08-14 19:05:44 +00:00
rinpatch 4be71c91e0 Merge branch 'fix/mrf-describe-keyword-lists' into 'develop' 
MRF: fix up unserializable option lists in describe implementations

See merge request pleroma/pleroma!1568
 2019-08-14 19:03:39 +00:00
Ariadne Conill 5bb418a90d activitypub: publisher: add (request-target) to http signature when POSTing 2019-08-14 19:01:51 +00:00
Ariadne Conill 626e094589 MRF: fix up unserializable option lists in describe implementations 2019-08-14 18:54:17 +00:00
stwf c43152f6c1 fix formatting 2019-08-14 14:01:11 -04:00
stwf d81f63845a Implement Pleroma.Stats as GenServer 2019-08-14 11:59:33 -04:00
stwf 574856ef01 streamline Streamer pings 2019-08-14 11:58:32 -04:00
stwf 15ef521009 Isolate OAuth.Token.CleanWorker 2019-08-14 11:57:50 -04:00
stwf 51bdf0cab6 use default child_specs 2019-08-14 11:55:17 -04:00
lain 4a5b0965a0 Merge branch 'fix/revert-tzdata-1.8' into 'develop' 
Switch to pre-1.8 version of tzdata.

Closes #1183

See merge request pleroma/pleroma!1566
 2019-08-14 15:07:03 +00:00
lain d3af9e19ed Conversations: Load relations in one query. 2019-08-14 17:01:11 +02:00
rinpatch 6a101f0361 Switch to pre-1.8 version of tzdata. 
tzdata 1.0.0 requires Elixir 1.8.0, but we target 1.7. Fortunately
tzdata issues bugfix releases for pre-1.8.0 version.
 2019-08-14 17:05:21 +03:00
lain f73212b2a3 Conversation: Render new participation on update. 2019-08-14 15:56:15 +02:00
lain df81abb68c Conversations: Use correct oauth paths for extended api. 2019-08-14 15:55:43 +02:00
lain 560dbad538 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-14 15:30:40 +02:00
rinpatch 744e2ce8b4 Merge branch 'backport/describe-api-changelog' into 'develop' 
Backport the describe API changelog entry to develop

See merge request pleroma/pleroma!1564
 2019-08-14 02:12:09 +00:00
Ariadne Conill 8fab9c5c1c update changelog to cover MRF describe API. 2019-08-14 04:59:31 +03:00
kaniini 5c35d2f1d8 Merge branch 'preload-user-timelines' into 'develop' 
Preload thread mutes/bookmarks in user_statuses

See merge request pleroma/pleroma!1563
 2019-08-14 01:04:07 +00:00
kaniini fe42844bda Merge branch 'get-context-optimizations' into 'develop' 
Preload thread mutes/bookmarks in get_context

See merge request pleroma/pleroma!1562
 2019-08-14 01:03:54 +00:00
rinpatch 8202f1634a Preload thread mutes/bookmarks in user_statuses 2019-08-14 03:02:09 +03:00
rinpatch f4e087ee48 Preload thread mutes/bookmarks in get_context 
Also removes filtering for creates (was done on the database side
already) and filtering for the requested activity (moved to the database
side) from application side.
 2019-08-14 02:36:54 +03:00
rinpatch 9ef31767f2 Merge branch 'feature/mrf-vocabulary' into 'develop' 
MRF Vocabulary

See merge request pleroma/pleroma!1559
 2019-08-13 22:51:15 +00:00
kaniini c3a54cc34d Merge branch 'feature/mrf-describe' into 'develop' 
MRF describe API

See merge request pleroma/pleroma!1561
 2019-08-13 22:46:19 +00:00
Ariadne Conill 5983f98f26 docs tweak 2019-08-13 22:40:18 +00:00
rinpatch 83a3de8cc4 Merge branch 'length-limit-bio' into 'develop' 
Add configurable length limits for `User.bio` and `User.name`

See merge request pleroma/pleroma!1515
 2019-08-13 22:40:13 +00:00
Ariadne Conill abfbcfdcb3 mrf_vocabulary: add describe API support 2019-08-13 22:39:26 +00:00
Ariadne Conill 4244e17de0 fix credo 2019-08-13 22:36:24 +00:00
Haelwenn 47c20ab796 Merge branch 'fix/mastoapi-more-object-preloads' into 'develop' 
Mastodon API: Preloading and normalization optimizations

See merge request pleroma/pleroma!1558
 2019-08-13 22:32:49 +00:00