kaniini
|
d928f0c4c3
|
Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'
Pleroma 1.0.91 (aka 1.1 RC2).
See merge request pleroma/pleroma!1811
|
2019-10-07 12:12:45 +00:00 |
|
Ariadne Conill
|
c5b7d2ef26
|
Pleroma 1.0.91 (aka 1.1 RC2).
|
2019-10-07 12:10:57 +00:00 |
|
lain
|
e8395bedd2
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# priv/static/schemas/litepub-0.1.jsonld
|
2019-10-07 12:10:27 +00:00 |
|
kaniini
|
079d069eb4
|
Merge branch 'backport/remove-direct-messages-from-public-timeline' into 'maint/1.1'
backport: Mastodon API: Fix private and direct statuses not being filtered out from the...
See merge request pleroma/pleroma!1807
|
2019-10-07 11:40:31 +00:00 |
|
kaniini
|
cb36fe0128
|
Merge branch 'backport/chore-context-cleanups' into 'maint/1.1'
clean up bundled litepub schema (closes #1303)
See merge request pleroma/pleroma!1809
|
2019-10-07 11:37:01 +00:00 |
|
Ariadne Conill
|
d3e04d5590
|
clean up bundled litepub schema (closes #1303)
|
2019-10-07 11:36:05 +00:00 |
|
kaniini
|
5c32e6ee91
|
Merge branch 'chore/context-cleanups' into 'develop'
clean up bundled litepub schema (closes #1303)
Closes #1303
See merge request pleroma/pleroma!1808
|
2019-10-07 11:34:50 +00:00 |
|
Ariadne Conill
|
19962d2022
|
clean up bundled litepub schema (closes #1303)
|
2019-10-07 11:33:58 +00:00 |
|
eugenijm
|
790ae8e189
|
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (GET /api/v1/timelines/public)
|
2019-10-07 11:28:51 +00:00 |
|
lain
|
d580eedfe9
|
Linting.
|
2019-10-07 12:40:33 +02:00 |
|
lain
|
73b6512907
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-10-07 12:30:59 +02:00 |
|
kaniini
|
93bdc55306
|
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
|
2019-10-07 10:19:24 +00:00 |
|
Haelwenn
|
15592f1abe
|
Merge branch '1260-rate-limited-auth-actions' into 'develop'
[#1260] Rate-limiting for create authentication and related requests
Closes #1260
See merge request pleroma/pleroma!1681
|
2019-10-07 09:16:42 +00:00 |
|
Ivan Tashkinov
|
28fb98d69e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
# CHANGELOG.md
|
2019-10-07 11:06:30 +03:00 |
|
lain
|
91e90aa807
|
Merge branch 'misskey-compat' into 'reactions'
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
See merge request pleroma/pleroma!1783
|
2019-10-07 07:25:27 +00:00 |
|
Haelwenn
|
b4f3c16885
|
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
[#1234] Mastodon 2.4.3 hierarchical OAuth scopes
Closes #1234
See merge request pleroma/pleroma!1643
|
2019-10-07 02:14:45 +00:00 |
|
Haelwenn (lanodan) Monnier
|
58aeabd020
|
mrf/simple_policy: check actor against accept/reject
|
2019-10-07 03:49:57 +02:00 |
|
kaniini
|
f6ff19e074
|
Merge branch 'backport/custom-field-update' into 'maint/1.1'
Backport: custom field update
See merge request pleroma/pleroma!1805
|
2019-10-06 15:33:33 +00:00 |
|
rinpatch
|
b5e6ba323d
|
Merge branch 'backport/key-moveout-1.1' into 'maint/1.1'
Backport moving out keys from user info to 1.1
See merge request pleroma/pleroma!1801
|
2019-10-06 15:32:33 +00:00 |
|
Ariadne Conill
|
c6b7980303
|
changelog
|
2019-10-06 15:21:18 +00:00 |
|
rinpatch
|
e442180d11
|
Fix muted notification migration only working with a schema
Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do
|
2019-10-06 18:20:24 +03:00 |
|
kaniini
|
25cffffaf1
|
Merge branch 'fix/bad-migration' into 'develop'
Fix muted notification migration only working with a schema
See merge request pleroma/pleroma!1803
|
2019-10-06 15:15:00 +00:00 |
|
kPherox
|
c5338764df
|
Extract if block into private function
|
2019-10-06 15:14:53 +00:00 |
|
kPherox
|
cc84563796
|
Update test for custom fields when content-type urlencoded
|
2019-10-06 15:14:46 +00:00 |
|
kPherox
|
86bc83efe5
|
Update test for custom fields when name empty string
|
2019-10-06 15:14:39 +00:00 |
|
kPherox
|
db6c5aa66a
|
Change to delete empty name field
|
2019-10-06 15:14:31 +00:00 |
|
kPherox
|
313b134fac
|
Fix type of fields_attributes
Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`
|
2019-10-06 15:14:27 +00:00 |
|
kPherox
|
81abee22b6
|
Rename fields to fields_attributes
|
2019-10-06 15:14:21 +00:00 |
|
kaniini
|
8a52f30356
|
Merge branch 'backport/feature-poll-refresh' into 'maint/1.1'
backport: poll refreshing
See merge request pleroma/pleroma!1804
|
2019-10-06 15:07:38 +00:00 |
|
rinpatch
|
ee88afb2e2
|
Fix muted notification migration only working with a schema
Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do
|
2019-10-06 18:06:04 +03:00 |
|
kaniini
|
10f4ce848a
|
Merge branch 'backport/fix-report-email' into 'maint/1.1'
backport: Use the user.id instead of nickname in report URLs
See merge request pleroma/pleroma!1802
|
2019-10-06 14:59:58 +00:00 |
|
Ariadne Conill
|
bab901bfd7
|
add changelog
|
2019-10-06 14:54:44 +00:00 |
|
rinpatch
|
c7313c8dfb
|
Fix credo issues
|
2019-10-06 14:53:55 +00:00 |
|
rinpatch
|
40c7d6fa17
|
Do not refetch local objects
|
2019-10-06 14:53:48 +00:00 |
|
rinpatch
|
644bc1e64a
|
Preserve internal fields when reinjecting
|
2019-10-06 14:53:40 +00:00 |
|
rinpatch
|
845e8ad5f6
|
Move object internal fields to a constant
|
2019-10-06 14:53:34 +00:00 |
|
rinpatch
|
b9cdead076
|
Set updated_at even if the object stayed the same
|
2019-10-06 14:53:29 +00:00 |
|
rinpatch
|
8be9a9b5bb
|
Fix wrong argument order when calling NaiveDateTime.diff
|
2019-10-06 14:53:23 +00:00 |
|
rinpatch
|
f95ae0e50a
|
Capture log in object refetch tests
|
2019-10-06 14:53:17 +00:00 |
|
rinpatch
|
eae9a6d34d
|
Initial poll refresh support
Implement refreshing the object with an interval and call the function
when getting the poll.
|
2019-10-06 14:53:11 +00:00 |
|
feld
|
2a2d834ff7
|
Use the user.id instead of nickname in report URLs
Ensures links to profiles of remote users work.
|
2019-10-06 14:48:37 +00:00 |
|
rinpatch
|
a0d336a828
|
Fix the use of queries with a schema in a migration
|
2019-10-06 17:36:42 +03:00 |
|
rinpatch
|
c58da11182
|
Move local keys out of user.info
|
2019-10-06 17:36:24 +03:00 |
|
kaniini
|
2411d09215
|
Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'
Move local keys out of `user.info`
See merge request pleroma/pleroma!1799
|
2019-10-06 14:32:56 +00:00 |
|
rinpatch
|
125f96e706
|
Fix the use of queries with a schema in a migration
|
2019-10-06 17:23:43 +03:00 |
|
feld
|
09a3b993fe
|
Merge branch 'fix/report-email' into 'develop'
Fix/report email
Closes #1300
See merge request pleroma/pleroma!1800
|
2019-10-06 14:13:04 +00:00 |
|
feld
|
1d8e956c32
|
Use the user.id instead of nickname in report URLs
Ensures links to profiles of remote users work.
|
2019-10-06 14:13:04 +00:00 |
|
Ivan Tashkinov
|
b93856874d
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
2019-10-06 17:12:17 +03:00 |
|
rinpatch
|
fefbd31c6e
|
Move local keys out of user.info
|
2019-10-06 16:56:36 +03:00 |
|
Ivan Tashkinov
|
06b3bb54c5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
2019-10-06 11:43:49 +03:00 |
|