sadposter
|
4e069ce537
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-01-16 16:17:56 +00:00 |
|
sadposter
|
5664427d6c
|
branch
|
2020-01-16 16:13:51 +00:00 |
|
Ivan Tashkinov
|
d1e9768e10
|
[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.
|
2020-01-15 18:38:18 +03:00 |
|
Ivan Tashkinov
|
6c94b7498b
|
[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
|
2020-01-10 10:52:21 +03:00 |
|
Mark Felder
|
fd3c23af63
|
Update AdminFE build
|
2020-01-09 10:00:15 -06:00 |
|
sadposter
|
6f5844cf8e
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-12-15 14:11:26 +00:00 |
|
lain
|
2f31cef71f
|
Merge branch 'feature/native-captcha' into 'develop'
Add native captcha and enable it by default.
Closes #1017 and #1405
See merge request pleroma/pleroma!2060
|
2019-12-12 18:43:21 +00:00 |
|
sadposter
|
803bce3668
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-12-12 17:48:36 +00:00 |
|
lain
|
756a029edf
|
Update frontend
|
2019-12-12 17:05:22 +01:00 |
|
lain
|
2792672793
|
Revert "Merge branch 'admin-scope-support-code' into 'develop'"
This reverts merge request !2055
|
2019-12-12 09:37:02 +00:00 |
|
Maxim Filippov
|
3ecf131511
|
Merge branch 'develop' into feature/report-notes
|
2019-12-12 02:16:23 +03:00 |
|
Ivan Tashkinov
|
84f0aec9aa
|
Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.
|
2019-12-11 19:48:00 +03:00 |
|
sadposter
|
97f67e0786
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-12-11 10:01:04 +00:00 |
|
|
|
701815e64c
|
[ActivityPub] Configurable ActivityPub actor type
|
2019-12-10 13:19:26 +00:00 |
|
sadposter
|
d3cee00057
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-12-09 18:17:59 +00: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 |
|
sadposter
|
8ae4ae14f3
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-12-04 23:20:03 +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 |
|
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 |
|
sadposter
|
a7ec08d853
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-12-01 19:03:08 +00:00 |
|
rinpatch
|
0d24ab04c5
|
Merge branch 'remove-info-from-users' into 'develop'
Removed users.info field
See merge request pleroma/pleroma!2006
|
2019-11-30 10:42:51 +00:00 |
|
Ivan Tashkinov
|
52cc7de82c
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# mix.lock
|
2019-11-29 10:17:59 +03:00 |
|
lain
|
f0bdbe3f61
|
Migrations: Set users.following_count to NOT NULL
Also set following_count for local users to the correct value and for remote
users to 0.
|
2019-11-28 17:01:43 +01:00 |
|
sadposter
|
acac6e3540
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-11-25 11:37:49 +00:00 |
|
Ivan Tashkinov
|
1636cc5b7e
|
Removed users.info and remaining usages.
|
2019-11-23 14:06:19 +03:00 |
|
Ivan Tashkinov
|
cad9b325e5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
|
2019-11-21 16:47:52 +03:00 |
|
lain
|
8feb5dcb42
|
Merge branch 'issue/1348' into 'develop'
[#1348] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
|
2019-11-21 13:13:14 +00:00 |
|
Ivan Tashkinov
|
4f88b1b435
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
2019-11-20 15:47:11 +03:00 |
|
Ivan Tashkinov
|
de892d2fe1
|
[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
|
2019-11-20 15:46:11 +03:00 |
|
sadposter
|
9d29a5063c
|
fe
|
2019-11-20 09:48:05 +00:00 |
|
sadposter
|
d8286a122a
|
stickers
|
2019-11-20 09:46:08 +00:00 |
|
rinpatch
|
0fe08346db
|
bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7
|
2019-11-19 23:28:34 +03:00 |
|
Ivan Tashkinov
|
aad6576130
|
[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
|
2019-11-18 20:38:56 +03:00 |
|
Ivan Tashkinov
|
01d9c093c3
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
2019-11-15 21:40:14 +03:00 |
|
Ivan Tashkinov
|
c31ddce51e
|
[#1335] Reorganized users.mutes as relation to UserMute entity.
|
2019-11-15 21:38:54 +03: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 |
|
sadposter
|
2de30812ea
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-11-13 00:10:01 +00:00 |
|
sadposter
|
c4f66db63c
|
fe
|
2019-11-13 00:09:56 +00:00 |
|
Egor Kislitsyn
|
e6d7e27bd6
|
Add allow_following_move setting to User
|
2019-11-12 18:45:28 +07:00 |
|
Ivan Tashkinov
|
3db988250b
|
[#1335] User: refactored :blocks field into :blocked_users relation.
Introduced UserBlock.
|
2019-11-10 16:30:21 +03:00 |
|
lain
|
a88e834dba
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
2019-11-10 11:32:50 +00:00 |
|
Phil Hagelberg
|
274cc18e8a
|
Visually separate header.
|
2019-11-09 18:08:08 -08:00 |
|
Phil Hagelberg
|
1dc785b74b
|
Move static-fe CSS to a separate file.
|
2019-11-09 18:07:50 -08:00 |
|
sadposter
|
55cc96bcf9
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-11-09 19:11:33 +00:00 |
|
sadposter
|
058467d25c
|
fe
|
2019-11-09 19:10:22 +00:00 |
|
rinpatch
|
3cc2437598
|
Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642
|
2019-11-09 01:49:36 +03:00 |
|
lain
|
b22ee9d966
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-11-08 13:27:11 +01:00 |
|
sadposter
|
9bc70ca0c1
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-11-04 18:20:19 +00:00 |
|
