sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,163 Commits 1 Branch 0 Tags 184 MiB
1dc5794e29
Commit Graph

13163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Tashkinov
60b4654038 Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube). 
Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56.
 2021-01-28 19:49:43 +03:00
Alexander Strizhakov
dd1be13f75
changelog entry 2021-01-28 17:01:31 +03:00
Alexander Strizhakov
6c987c7670
fix and delete purge activities duplicates 2021-01-28 16:57:41 +03:00
Alexander Strizhakov
39335d4251
fix for unique oban worker option 2021-01-28 16:57:03 +03:00
Alibek Omarov
aaceb042c5 fix format 2021-01-28 10:20:25 +00:00
Alibek Omarov
1547a2fda4 mix: instance: ensure all needed folders are created before generating config 2021-01-28 09:39:53 +00:00
Alexander Strizhakov
35cad9793d
cache headers for emoji and images 2021-01-27 18:49:08 +03:00
Egor Kislitsyn
13a2ae8ce0
Update CHANGELOG 2021-01-27 18:23:46 +04:00
Egor Kislitsyn
bddb01bded
Add tests 2021-01-27 18:20:07 +04:00
Egor Kislitsyn
793fc77b16
Add active user count 2021-01-27 18:20:06 +04:00
lain
7f07871639 Merge branch 'chore/tests-use-clear_config' into 'develop' 
Convert tests to all use clear_config instead of Pleroma.Config.put

See merge request pleroma/pleroma!3282
 2021-01-27 11:33:27 +00:00
Alexander Strizhakov
d4158e8bf0
added total 
to the instance adminAPI endpoint
 2021-01-27 07:45:06 +03:00
Alexander Strizhakov
6806c03e85
added total 
to the user statuses adminAPI endpoint
 2021-01-27 07:45:02 +03:00
feld
d7af0294e6 Merge branch 'service-worker-allowed-header' into 'develop' 
Ability to set custom HTTP headers per each frontend

See merge request pleroma/pleroma!3247
 2021-01-26 18:14:01 +00:00
Mark Felder
e854c35e65 Convert tests to all use clear_config instead of Pleroma.Config.put 2021-01-26 11:58:43 -06:00
Haelwenn
e1eac4faac Merge branch '2435-list-multiple-users' into 'develop' 
Resolve "Add/Remove several accounts from List don't work"

Closes #2435

See merge request pleroma/pleroma!3260
 2021-01-26 14:34:50 +00:00
lain
229acae6c3 Merge branch 'develop' into '2435-list-multiple-users' 
# Conflicts:
#   CHANGELOG.md
 2021-01-26 14:24:32 +00:00
Alexander Strizhakov
875fbaae35
support for expires_in/expires_at in filters 2021-01-26 08:27:45 +03:00
Haelwenn
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
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
Alexander Strizhakov
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
rinpatch
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
Haelwenn
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
eugenijm
7fcaa188a0 Allow to define custom HTTP headers per each frontend 2021-01-21 21:55:23 +03:00
eugenijm
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
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
lain
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