Maksim Pechnikov
|
b7c449118b
|
Merge branch 'develop' into issue/1383
|
2019-11-28 21:27:01 +03:00 |
|
rinpatch
|
ca1acfa314
|
Merge branch 'chore/manual-benchmark' into 'develop'
CI: Make benchmarks manually triggered.
See merge request pleroma/pleroma!2020
|
2019-11-28 17:46:23 +00:00 |
|
lain
|
20564600e8
|
Merge branch 'use-pg12-in-ci' into 'develop'
Use PosgreSQL v12 in the federated tests
See merge request pleroma/pleroma!2022
|
2019-11-28 16:58:41 +00:00 |
|
Egor Kislitsyn
|
798aa0c335
|
Use PosgreSQL v12 in the federated tests
|
2019-11-28 23:08:13 +07:00 |
|
lain
|
98990d2d61
|
Merge branch 'fed-testing-updates' into 'develop'
Add federated test infrastructure
See merge request pleroma/pleroma!2014
|
2019-11-28 14:34:07 +00:00 |
|
lain
|
9a2d38107c
|
CI: Make benchmarks manually triggered.
|
2019-11-28 15:14:11 +01:00 |
|
lain
|
8627fb0bb5
|
Merge branch 'cleanup-tests-output' into 'develop'
Cleanup tests output
See merge request pleroma/pleroma!2018
|
2019-11-28 12:19:15 +00:00 |
|
Egor Kislitsyn
|
c4b468a95b
|
Cleanup tests output
|
2019-11-28 16:44:48 +07:00 |
|
Maksim Pechnikov
|
1403a1441d
|
added tests
|
2019-11-28 09:02:23 +03:00 |
|
kaniini
|
cb656938ca
|
Merge branch 'bugfix/1442-dont-return-nil-for-following-count' into 'develop'
User: Never return nil for user follower counts.
Closes #1442
See merge request pleroma/pleroma!2017
|
2019-11-27 16:46:41 +00:00 |
|
lain
|
50b152766f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
|
2019-11-27 14:48:28 +01:00 |
|
lain
|
ef1718a045
|
Merge branch 'remove-user-info' into 'develop'
Remove User.user_info/2
See merge request pleroma/pleroma!2016
|
2019-11-27 13:40:39 +00:00 |
|
Maksim Pechnikov
|
d55859f5a4
|
remove quantum package
|
2019-11-27 16:35:12 +03:00 |
|
lain
|
f36724efb1
|
User: Never return nil for user follower counts.
|
2019-11-27 14:13:36 +01:00 |
|
Maksim Pechnikov
|
a4f834a687
|
moved DigestEmail to Oban Periodic jobs
|
2019-11-27 15:59:13 +03:00 |
|
Egor Kislitsyn
|
f595cfe623
|
Remove User.user_info/2
|
2019-11-27 19:43:47 +07:00 |
|
Maksim Pechnikov
|
c5766a8100
|
moved ActivityExpiration to Oban Periodic jobs
|
2019-11-27 13:36:03 +03:00 |
|
Maksim Pechnikov
|
6f202a401b
|
moved ScheduledActivity to Oban Periodic jobs
|
2019-11-27 09:26:37 +03:00 |
|
stwf
|
bd1984f054
|
update tests and Oban
|
2019-11-26 15:24:34 -05:00 |
|
lain
|
bbec9bb727
|
Tests: Run the daemon
|
2019-11-26 15:03:17 -05:00 |
|
lain
|
74aa42998f
|
CI: Add testing stage for federated tests.
|
2019-11-26 15:03:16 -05:00 |
|
lain
|
717d246491
|
Tests: Don't run federated tests by default
|
2019-11-26 15:03:16 -05:00 |
|
Chris McCord
|
f01881e82a
|
Add federated test infrastructure
|
2019-11-26 15:01:35 -05:00 |
|
lain
|
139b1feda1
|
Merge branch 'feature/direct_conversation_id_web_push' into 'develop'
Add `direct_conversation_id` to web push payload
See merge request pleroma/pleroma!2012
|
2019-11-26 19:43:16 +00:00 |
|
Egor Kislitsyn
|
4af69f047d
|
Remove account field from web push payload
|
2019-11-27 02:32:55 +07:00 |
|
Egor Kislitsyn
|
80ededc04f
|
Add direct_conversation_id to web push payload
|
2019-11-26 19:53:43 +07:00 |
|
|
|
eb3c47f1d8
|
Merge branch 'fix/prod-syslog-level' into 'develop'
Default log level for syslog in prod should also be :warn
See merge request pleroma/pleroma!2011
|
2019-11-26 12:03:44 +00:00 |
|
Mark Felder
|
f673e3deef
|
Default log level for syslog in prod should also be :warn
|
2019-11-26 05:46:48 -06:00 |
|
Maksim Pechnikov
|
ac3abb5414
|
moved Pleroma.Stats to Oban Periodic jobs
|
2019-11-26 10:54:30 +03:00 |
|
lain
|
dc9090810d
|
Merge branch 'fix/ap-disable-remote-render' into 'develop'
Disable rendering AP representation for remote users and objects
See merge request pleroma/pleroma!2010
|
2019-11-25 15:23:45 +00:00 |
|
rinpatch
|
4b10804f21
|
OStatus controller: don't serve json at /notice/, redirect instead
|
2019-11-25 17:55:17 +03:00 |
|
rinpatch
|
02f7383891
|
ActivityPub controller: do not render remote users
|
2019-11-25 17:19:33 +03:00 |
|
|
|
5f981178d0
|
Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
Admin API: list all statuses from a given instance
See merge request pleroma/pleroma!1981
|
2019-11-25 13:29:53 +00:00 |
|
|
|
9374b52756
|
Merge branch 'fix/update-reports-old-format' into 'develop'
Admin API: Fix error when trying to update reports in the "old" format
See merge request pleroma/pleroma!1986
|
2019-11-25 13:29:22 +00:00 |
|
rinpatch
|
756bdef5f5
|
Merge branch 'feature/useragent-override' into 'develop'
Add ability to set a custom user-agent string
See merge request pleroma/pleroma!2009
|
2019-11-25 11:36:59 +00:00 |
|
Maksim Pechnikov
|
0e9be6bafa
|
moved OAuth.Token.CleanWorker to Oban Periodic jobs
|
2019-11-25 14:32:20 +03:00 |
|
Sadposter
|
e2dc89069d
|
move documentation section for http client
|
2019-11-25 11:26:42 +00:00 |
|
Sadposter
|
d3656c2725
|
add ability to set a custom user-agent string
|
2019-11-25 09:53:11 +00:00 |
|
Maxim Filippov
|
82f4e4760e
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
2019-11-25 01:46:18 +09:00 |
|
Maxim Filippov
|
fd24467b92
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
2019-11-25 01:43:11 +09:00 |
|
rinpatch
|
9f29930440
|
fetcher: move local object checking into a reusable function
|
2019-11-23 22:55:41 +03:00 |
|
rinpatch
|
34cdbcbb64
|
Merge branch 'fix/release-envvars' into 'develop'
OTP releases: only set name and distribution type if not set already
See merge request pleroma/pleroma!2004
|
2019-11-22 17:17:20 +00:00 |
|
rinpatch
|
4a5bb7eb02
|
OTP releases: only set name and distribution type if not set already
Fixes not being able to run two OTP releases on one machine because of
the name conflict.
|
2019-11-22 19:58:39 +03:00 |
|
lain
|
bd62946020
|
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
|
2019-11-22 15:39:19 +00:00 |
|
Maxim Filippov
|
b64c7b35d4
|
Swap map with each
|
2019-11-22 09:11:36 +09:00 |
|
rinpatch
|
c2ad9fd5f9
|
Merge branch 'list-users' into 'develop'
Add CLI list users command
See merge request pleroma/pleroma!1990
|
2019-11-21 20:33:11 +00:00 |
|
Alex Schroeder
|
fbc379d689
|
Add CLI list users command
|
2019-11-21 21:07:06 +01:00 |
|
rinpatch
|
dedb1ad5d6
|
Merge branch 'revert-5c6c3026' into 'develop'
Revert "Merge branch 'patch-1' into 'develop'"
See merge request pleroma/pleroma!2002
|
2019-11-21 15:20:05 +00:00 |
|
lain
|
19b727bf8f
|
Merge branch 'fix/mix-task-logging' into 'develop'
Allow mix tasks to always run with debug logging
See merge request pleroma/pleroma!1997
|
2019-11-21 15:04:19 +00:00 |
|
rinpatch
|
dc9303eac5
|
Revert "Merge branch 'patch-1' into 'develop'"
This reverts merge request !1829
|
2019-11-21 15:03:27 +00:00 |
|
