229acae6c3
Merge branch 'develop' into '2435-list-multiple-users'
...
# Conflicts:
# CHANGELOG.md
2021-01-26 14:24:32 +00:00
875fbaae35
support for expires_in/expires_at in filters
2021-01-26 08:27:45 +03:00
250e202098
Merge branch 'fix/missing-own_votes' into 'develop'
...
Include own_votes in the poll data
See merge request pleroma/pleroma!3274
2021-01-26 00:55:05 +00:00
feld
1e3832c6bb
Merge branch 'docs/apache-config' into 'develop'
...
Update Apache configuration
See merge request pleroma/pleroma!3271
2021-01-26 00:32:53 +00:00
Mark Felder
2cb5c16723
Credo
2021-01-25 18:25:53 -06:00
Mark Felder
01fc7d809d
Clarify the state of mediaproxy cache invalidation for Apache
2021-01-25 18:23:05 -06:00
Mark Felder
c6ef87d585
Note the requirement for the url_format parameter
2021-01-25 18:20:07 -06:00
Mark Felder
8373cb645b
Add sudo rule, remove quoting that breaks the for loop
2021-01-25 18:15:04 -06:00
Mark Felder
0b19534475
Merge branch 'develop' into docs/apache-config
2021-01-25 17:00:26 -06:00
e7864a32d7
[ #3213 ] Removed DISTINCT clause from ActivityPub.fetch_activities_query/2.
2021-01-25 22:31:23 +03:00
694d98be55
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-01-25 21:24:07 +03:00
ea4785213a
[ #3213 ] Switched to using embedded hashtags in Object.hashtags/1
...
(to avoid extra joins / preload in timeline queries).
2021-01-25 20:12:09 +03:00
feld
f1c82fbd42
Merge branch 'refactor/deactivated_user_field' into 'develop'
...
Change user.deactivated field to user.is_active
See merge request pleroma/pleroma!3073
2021-01-25 16:54:57 +00:00
Mark Felder
f868dcf3ac
Ensure consistent behavior between pleroma.user activate/deactivate mix tasks
2021-01-25 10:48:28 -06:00
3f3d64acbf
little refactor and tests
...
for voted & own_votes fields in polls
2021-01-25 19:46:36 +03:00
Mark Felder
6e51d7264b
Document pleroma.user activate mix task
2021-01-25 10:38:08 -06:00
Mark Felder
5e8da27e14
Provide pleroma.user mix task for both activate and deactivate
2021-01-25 10:36:51 -06:00
Mark Felder
fe63b48c8f
Document removal of toggle_activated
2021-01-25 10:05:38 -06:00
Mark Felder
c3dd06b540
Update PleromaFE: pleroma-fe@eb2975b64d849af6bdc327dabac34b8e6d952eae
2021-01-25 09:50:26 -06:00
Mark Felder
9e3fcb4b29
Update AdminFE: admin-fe@8a390584676b27b611d3363eca2a1194d94ed71f
2021-01-25 09:45:58 -06:00
Mark Felder
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
2021-01-25 09:45:06 -06:00
f264d930cc
[ #3213 ] Speedup of HashtagsTableMigrator (query optimization). State handling fix.
2021-01-24 23:27:02 +03:00
0a6f5f4793
Merge branch 'fix/minor-doc-fix' into 'develop'
...
add missing sudo prefix in some install doc
See merge request pleroma/pleroma!3276
2021-01-23 19:06:42 +00:00
55bf090492
add missing sudo prefix in install doc
2021-01-23 16:56:11 +00:00
Mark Felder
6bfd497f4a
Include own_votes in the poll data
2021-01-22 09:47:59 -06:00
218c519606
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# test/pleroma/web/mastodon_api/views/status_view_test.exs
2021-01-22 10:05:28 +03:00
42e495df2b
Merge branch 'fix/tag-urls' into 'develop'
...
Make tag urls absolute
See merge request pleroma/pleroma!3272
2021-01-22 03:21:26 +00:00
Mark Felder
80ccdb56f6
Make tag urls absolute
2021-01-21 16:49:19 -06:00
Mark Felder
c29cf65ec7
Document improved Apache support
2021-01-21 14:53:38 -06:00
Mark Felder
e709dec2eb
Add Invalidation Script url_format setting
2021-01-21 14:52:02 -06:00
Mark Felder
42e49529c2
Test URL formatting
2021-01-21 14:42:16 -06:00
Mark Felder
0c485d5555
Improve description
2021-01-21 14:42:08 -06:00
Mark Felder
e5b32aab92
rename function
2021-01-21 14:41:28 -06:00
Mark Felder
003402df40
Add ability to invalidate cache entries for Apache
2021-01-21 14:20:13 -06:00
7fcaa188a0
Allow to define custom HTTP headers per each frontend
2021-01-21 21:55:23 +03:00
133644dfa2
Ability to set the Service-Worker-Allowed header
2021-01-21 21:55:11 +03:00
Mark Felder
3078e62488
Update Apache configuration. This has been tested.
2021-01-21 12:25:18 -06:00
ca7f240643
[ #3213 ] Ignoring of blank elements from objects.data->tag.
2021-01-21 20:50:06 +03:00
c041e9c630
[ #3213 ] HashtagsTableMigrator: failures handling fix, retry function.
...
Changed default hashtags filtering strategy to non-aggregate approach.
2021-01-21 20:23:08 +03:00
2634a16b4c
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
2021-01-21 20:20:35 +03:00
feld
d8860eaee4
Merge branch 'limiter-setup-fix' into 'develop'
...
Configurable limits for ConcurrentLimiter for Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxyWarmingPolicy
See merge request pleroma/pleroma!3248
2021-01-21 14:59:51 +00:00
ba40af054c
Merge branch 'test-cases-mox-setup' into 'develop'
...
Mox mode setup tweak; refactoring
See merge request pleroma/pleroma!3263
2021-01-21 09:03:26 +00:00
5ade430e46
changed naming in changelog
2021-01-21 10:13:02 +03:00
6d48144a9d
use proper naming
...
for MediaProxyWarmingPolicy in ConcurrentLimiter
2021-01-21 09:50:18 +03:00
Mark Felder
dece31a031
Update docs
2021-01-21 09:47:22 +03:00
Mark Felder
1537a4f0ad
Document ConcurrentLimiter for RichMedia and MediaProxy
2021-01-21 09:47:22 +03:00
b4ff63d020
configurable limits for ConcurrentLimiter
...
Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy
2021-01-21 09:47:21 +03:00
feld
b5899fda1a
Merge branch 'copyright-fun' into 'develop'
...
Mix aliases for handling copyright headers
See merge request pleroma/pleroma!3257
2021-01-20 22:51:56 +00:00
feld
2926713fe5
Merge branch 'deprecate-public_endpoint' into 'develop'
...
Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251
2021-01-20 22:48:48 +00:00
Mark Felder
086100e3b7
Consistent comment style for :ex_aws
2021-01-20 16:39:39 -06:00
lain
feld