feld
|
cd5ff7a943
|
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
# Conflicts:
# CHANGELOG.md
|
2021-02-02 17:11:38 +00:00 |
Alexander Strizhakov
|
fdf1dfed56
|
only_remote -> remote renaming
|
2021-02-01 14:11:12 +03:00 |
Alexander Strizhakov
|
77f0a0af7d
|
more tests and update for docs and changelog
|
2021-02-01 14:11:12 +03:00 |
Alexander Strizhakov
|
2cb6dc5a3a
|
list timeline filtration by params
|
2021-02-01 14:11:12 +03:00 |
Alexander Strizhakov
|
b6a72680e2
|
added only_media flag to home timeline
|
2021-02-01 14:11:11 +03:00 |
Alexander Strizhakov
|
c3110c46f3
|
expanding filtration for home timeline
added local & remote statuses filtration for home timeline
|
2021-02-01 14:11:11 +03:00 |
Egor Kislitsyn
|
a51d903e0c
|
Make sure active_user_count/1 counts only local users
|
2021-01-28 22:23:10 +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 |
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 |
lain
|
229acae6c3
|
Merge branch 'develop' into '2435-list-multiple-users'
# Conflicts:
# CHANGELOG.md
|
2021-01-26 14:24:32 +00: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 |
Mark Felder
|
0b19534475
|
Merge branch 'develop' into docs/apache-config
|
2021-01-25 17:00:26 -06: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
|
5e8da27e14
|
Provide pleroma.user mix task for both activate and deactivate
|
2021-01-25 10:36:51 -06:00 |
Mark Felder
|
537ba1c5e0
|
Merge branch 'develop' into refactor/deactivated_user_field
|
2021-01-25 09:45:06 -06:00 |
Mark Felder
|
6bfd497f4a
|
Include own_votes in the poll data
|
2021-01-22 09:47:59 -06:00 |
Mark Felder
|
80ccdb56f6
|
Make tag urls absolute
|
2021-01-21 16:49:19 -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 |
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 |
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 |
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
|
9988d9261c
|
Add bucket_namespace to be extra certain truncated_namespace works
|
2021-01-20 16:33:00 -06:00 |
Mark Felder
|
dfc4cb6ebd
|
Special handling for unconfirmed users based on instance config no longer needed.
|
2021-01-20 11:30:29 -06:00 |
Mark Felder
|
5d344e5c79
|
Only need to test if unconfirmed users are successfully deleted
It's no longer possible to have an active user account with User.is_confirmed == false
|
2021-01-20 11:26:14 -06:00 |
Mark Felder
|
3cb4d40ebf
|
This scenario no longer exists. Users are auto-confirmed if confirmation not required at time of registration.
|
2021-01-20 11:17:13 -06:00 |
Ivan Tashkinov
|
318d6dde1c
|
Mox mode setup tweak; refactoring.
|
2021-01-19 00:23:39 +03:00 |
feld
|
958a7f6ed0
|
Merge branch 'fix/reblog-api' into 'develop'
Fix Reblog API
Closes #2423
See merge request pleroma/pleroma!3261
|
2021-01-18 21:19:14 +00:00 |
Mark Felder
|
28581e03ad
|
Merge branch 'develop' into refactor/deactivated_user_field
|
2021-01-18 14:58:21 -06:00 |
Mark Felder
|
44a86951a3
|
Merge branch 'develop' into refactor/approval_pending_user_field
|
2021-01-18 12:05:05 -06:00 |
Egor Kislitsyn
|
51d5951c02
|
Test that only author can reblog a private status
|
2021-01-18 21:01:00 +04:00 |
Egor Kislitsyn
|
1b79dce7bc
|
Fix Reblog API
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
|
2021-01-18 20:15:57 +04:00 |
Lain Soykaf
|
bdfd72630f
|
ListController: Fix being unable to add / remove users.
|
2021-01-18 16:28:36 +01:00 |
Ivan Tashkinov
|
3f88e33a71
|
[#3251] Fixed wrong test-env config setting for [Pleroma.Upload]. Refactoring. Added warning to `clear_config/_` to minimize such issues in future.
|
2021-01-16 23:05:31 +03:00 |
Mark Felder
|
2c0fe2ea9e
|
Remove toggle_confirmation; require explicit state change
Also cosmetic changes to make the code clearer
|
2021-01-15 13:11:51 -06:00 |
Mark Felder
|
d36182c088
|
Change user.confirmation_pending field to user.is_confirmed
|
2021-01-15 12:44:41 -06:00 |
Mark Felder
|
ebd7d1365b
|
Make setting user activation status explicit
|
2021-01-15 11:37:17 -06:00 |
Mark Felder
|
7516660753
|
Remove toggle_activation
|
2021-01-15 11:25:32 -06:00 |
Mark Felder
|
860b5c7804
|
Change user.deactivated field to user.is_active
|
2021-01-15 11:24:46 -06:00 |
Mark Felder
|
f7e59c28ed
|
Change user.approval_pending field to user.is_approved
|
2021-01-15 10:42:02 -06:00 |
Mark Felder
|
d0e0396528
|
Hack to fix tests not passing. Unclear why the filters are being set to nil.
Both of these changes are needed or it doesn't work.
|
2021-01-14 17:49:37 -06:00 |
Mark Felder
|
0b725f5d21
|
Lint
|
2021-01-14 16:00:32 -06:00 |
Mark Felder
|
12c8ce481c
|
Bump Copyright year
|
2021-01-14 13:58:52 -06:00 |
Mark Felder
|
fb47e83adc
|
Add ConfigDB migration
|
2021-01-14 13:53:55 -06:00 |
Lain Soykaf
|
fd9a0ac329
|
BackupTest: Fix s3 test.
|
2021-01-14 20:18:45 +01:00 |