sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-22 18:49:38 +01:00
Code Issues Releases Wiki Activity
7,825 Commits 136 Branches 24 Tags 261 MiB
revert-bca1512d
Commit Graph

455 Commits

Author SHA1 Message Date
Maxim Filippov
3ecf131511 Merge branch 'develop' into feature/report-notes 2019-12-12 02:16:23 +03:00
Mark Felder
0867064441 Document the favorites timeline order change 2019-12-11 15:03:54 -06:00
lain
1ae976ac51 Merge branch 'develop' into '1427-oauth-admin-scopes' 
# Conflicts:
#   CHANGELOG.md
 2019-12-10 13:34:54 +00:00
Hakaba Hitoyo
701815e64c [ActivityPub] Configurable ActivityPub actor type 2019-12-10 13:19:26 +00:00
Ivan Tashkinov
835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes 
# Conflicts:
#	CHANGELOG.md
 2019-12-10 08:55:14 +03:00
rinpatch
632dab5d30 Merge branch 'user-timelines-changelog' into 'develop' 
Changelog: Update with user timeline change info.

See merge request pleroma/pleroma!2049
 2019-12-09 17:50:00 +00:00
lain
e4ea0e20b3 Merge branch 'issue/1342' into 'develop' 
[#1342] Added privacy option to push notifications

See merge request pleroma/pleroma!1920
 2019-12-09 14:30:35 +00:00
lain
a5e28bf214 Merge branch 'develop' into 'fix/oauth-compile-time' 
# Conflicts:
#   CHANGELOG.md
 2019-12-09 13:52:01 +00:00
lain
eb7f412b26 Changelog: Update with user timeline change info. 2019-12-09 14:43:57 +01:00
Maksim Pechnikov
dfae1d705f update changelog 2019-12-08 21:46:20 +03:00
rinpatch
d6c89068f3 HTML: Compile Scrubbers on boot 
This makes it possible to configure their behavior on OTP releases.
 2019-12-08 20:35:41 +03:00
rinpatch
bd3aa8500c OAuth token cleanup: Get rid of compile-time configuration 2019-12-08 20:03:33 +03:00
rinpatch
6cb31edd76 Merge branch 'feature/1455-chat-character-limit' into 'develop' 
Feature/1455 chat character limit

Closes #1455

See merge request pleroma/pleroma!2034
 2019-12-06 15:36:30 +00:00
Ivan Tashkinov
13926537b6 Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes 2019-12-06 00:26:31 +03:00
Ivan Tashkinov
af42c00cff [#1427] Reworked admin scopes support. 
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
 2019-12-06 00:25:44 +03:00
rinpatch
cdff5b8267 Merge branch 'develop' into fix/mrf-delete 2019-12-06 00:12:21 +03:00
rinpatch
9f99640cfc ActivityPub: Fix deletes being exempt from MRF 
Closes #1461
 2019-12-05 21:45:57 +03:00
lain
67d8df04a4 Merge branch '1335-user-api-id-fields-relations' into 'develop' 
[#1335] User: refactoring of AP ID fields into relations

Closes #1335

See merge request pleroma/pleroma!1963
 2019-12-05 17:16:23 +00:00
feld
d0bd4348b3 Merge branch 'feature/admin-api-render-whole-status' into 'develop' 
Miscellaneous grouped reports fixes

Closes admin-fe#48 and admin-fe#51

See merge request pleroma/pleroma!2007
 2019-12-05 13:34:34 +00:00
Ivan Tashkinov
30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	lib/pleroma/user.ex
 2019-12-04 18:56:31 +03:00
lain
21353a8ee9 Changelog: Add information about chat limit. 2019-12-04 12:49:46 +01:00
Maxim Filippov
4b60d41db9 Add report notes 2019-12-04 00:26:37 +09:00
lain
7722e5a67a Merge branch 'feature/move-activity' into 'develop' 
Support "Move" activity

Closes #1316

See merge request pleroma/pleroma!1883
 2019-12-02 16:26:19 +00:00
Ivan Tashkinov
c8d3c3bfec Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
 2019-11-26 10:42:36 +03:00
Maxim Filippov
b62be2564c Merge branch 'develop' into feature/admin-api-render-whole-status 2019-11-26 00:25:43 +09:00
Maxim Filippov
b3b4e5ca80 AdminAPI: Grouped reports old/new fix 
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
 2019-11-26 00:20:46 +09:00
feld
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
feld
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
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
Maxim Filippov
2b341627da Admin API: Render whole status in grouped reports 2019-11-25 00:04:29 +09: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
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
Ivan Tashkinov
81f1c6bc47 [#1335] Added CHANGELOG.md entry. 2019-11-20 15:57:51 +03:00
rinpatch
dc8830da27 changelog: add 1.1.6 entries from stable 2019-11-20 00:01:58 +03:00
Maxim Filippov
46eb160135 AdminAPI: Confirm user account, resend confirmation email 2019-11-19 20:14:02 +09:00
Egor Kislitsyn
36686f5245
Support authentication via x-admin-token HTTP header 2019-11-19 15:58:20 +07:00
Maxim Filippov
c506cc48ef Admin API: Error when trying to update reports in the "old" format 2019-11-16 18:44:48 +09:00
rinpatch
da28bf8fdd Sync the changelogs between develop and stable 2019-11-16 01:02:08 +03:00
lain
075789c442 Apply suggestion to CHANGELOG.md 2019-11-15 12:31:09 +00:00
Ariadne Conill
2469880a2b add changelog entry for MRF ObjectAgePolicy 2019-11-14 19:49:25 -06:00
Maxim Filippov
114930b5fd Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance 2019-11-14 23:45:29 +09:00
Maxim Filippov
30af5da330 Admin API: list all statuses from a given instance 2019-11-14 23:44:07 +09:00
feld
1afeaf82fa Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop' 
Admin API: Grouped reports, update multiple reports in one query

Closes admin-fe#43

See merge request pleroma/pleroma!1815
 2019-11-14 13:35:41 +00:00
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity 2019-11-14 16:39:45 +07:00
rinpatch
6085c71bd1 Merge branch 'reactions' into 'develop' 
Emoji Reactions

See merge request pleroma/pleroma!1662
 2019-11-14 08:47:10 +00:00
lain
7a322713c3 Update CHANGELOG.md 2019-11-14 08:21:06 +00:00
Egor Kislitsyn
63c493cd53
Update CHANGELOG 2019-11-12 18:51:12 +07:00
kaniini
2cc043591c Merge branch 'feature/static-fe' into 'develop' 
Static frontend

See merge request pleroma/pleroma!1917
 2019-11-11 19:10:44 +00:00