Maksim Pechnikov
|
10f452ad1f
|
Merge branch 'develop' into issue/1276
|
2020-02-25 07:22:56 +03:00 |
|
eugenijm
|
7ad5c51f23
|
Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope
|
2020-02-24 21:46:37 +03:00 |
|
lain
|
2d5cf0f8cd
|
Migrations: Make them not fail for old databases
|
2020-02-20 16:44:31 +01:00 |
|
Mark Felder
|
6a97c1b9ff
|
Update adminFE build
|
2020-02-17 15:50:45 -06:00 |
|
Maksim Pechnikov
|
da44ee5b0f
|
Merge branch 'develop' into issue/1276
|
2020-02-13 09:20:34 +03:00 |
|
Mark Felder
|
f9eb35d48e
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211
|
2020-02-11 10:33:41 -06:00 |
|
Mark Felder
|
de0fea4634
|
Update AdminFE build
|
2020-02-11 10:24:38 -06:00 |
|
lain
|
60de311164
|
Update frontend
|
2020-02-11 13:59:04 +01:00 |
|
Maksim Pechnikov
|
cd040691bd
|
maked unread_count as virtual field
|
2020-02-10 09:01:45 +03:00 |
|
Maksim Pechnikov
|
b87533760b
|
Merge branch 'develop' into issue/1276
|
2020-02-10 07:59:52 +03:00 |
|
rinpatch
|
f13b7878b4
|
Merge branch 'rename_emoji_reactios' into 'develop'
EmojiReactions: Rename to EmojiReacts
See merge request pleroma/pleroma!2181
|
2020-02-07 10:35:37 +00:00 |
|
Lain Soykaf
|
8a79f20c21
|
EmojiReactions: Rename to EmojiReacts
|
2020-02-06 18:09:57 +01:00 |
|
Mark Felder
|
fed9b0d1e0
|
Update FE bundle
|
2020-02-06 10:59:41 -06:00 |
|
Maksim Pechnikov
|
ba5e8a6444
|
Merge branch 'develop' into issue/1276
|
2020-01-28 21:11:13 +03:00 |
|
lain
|
f5bfb29d3b
|
Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9
|
2020-01-28 18:39:02 +01:00 |
|
lain
|
6fab5fe7f8
|
Merge branch 'translation/errors-french' into 'develop'
Translation/errors french
See merge request pleroma/pleroma!1457
|
2020-01-28 13:26:28 +00:00 |
|
Maksim Pechnikov
|
e442ea5722
|
Merge branch 'develop' into issue/1276
|
2020-01-27 15:20:47 +03:00 |
|
|
|
be27777156
|
Merge branch 'admin-be' into 'develop'
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
|
2020-01-22 17:13:17 +00:00 |
|
Haelwenn (lanodan) Monnier
|
bd3f3756fb
|
Update MastoFE bundle to 2020-01-22
|
2020-01-22 16:00:23 +01:00 |
|
Alexander Strizhakov
|
32a643a159
|
Merge branch 'develop' into admin-be
|
2020-01-22 11:22:31 +03:00 |
|
Alexander Strizhakov
|
7ee2f86d76
|
Revert "Update AdminFE build"
This reverts commit 6395ad942c
|
2020-01-22 08:21:35 +00:00 |
|
Mark Felder
|
2860bee604
|
Last AdminFE update was accidentally built from master, not develop
|
2020-01-21 15:09:16 -06:00 |
|
Mark Felder
|
bc2ebdcfd6
|
Update AdminFE build
|
2020-01-21 13:41:22 -06:00 |
|
Alexander Strizhakov
|
503d966e9f
|
Merge branch 'develop' into admin-be
|
2020-01-21 10:32:27 +03:00 |
|
Ivan Tashkinov
|
d1e9768e10
|
[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.
|
2020-01-15 18:38:18 +03:00 |
|
Alexander Strizhakov
|
7d128ca208
|
dynamic_configuration renaming
and moving it from instance settings
|
2020-01-10 19:34:19 +03:00 |
|
Alexander Strizhakov
|
6395ad942c
|
Update AdminFE build
|
2020-01-10 15:52:02 +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 |
|
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 |
|
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 |
|
|
|
701815e64c
|
[ActivityPub] Configurable ActivityPub actor type
|
2019-12-10 13:19:26 +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 |
|
Maksim Pechnikov
|
6fbafb1cdc
|
Merge branch 'develop' into issue/1276
|
2019-12-08 20:14:28 +03:00 |
|
Maksim Pechnikov
|
49bb0a130f
|
Merge branch 'develop' into issue/1276
|
2019-12-05 12:22:19 +03: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 |
|
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 |
|
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 |
|
rinpatch
|
0fe08346db
|
bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7
|
2019-11-19 23:28:34 +03:00 |
|
