lain [Sat, 9 Feb 2019 12:39:57 +0000 (13:39 +0100)]
Do autofollow first.
lain [Sat, 9 Feb 2019 12:24:23 +0000 (13:24 +0100)]
Respect blocks in mass follow.
lambda [Fri, 8 Feb 2019 12:18:05 +0000 (12:18 +0000)]
Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop'
Split hide_network only for local users
See merge request pleroma/pleroma!781
lambda [Fri, 8 Feb 2019 12:10:35 +0000 (12:10 +0000)]
Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop'
Mark streaming feature for iOS apps in readme
See merge request pleroma/pleroma!790
lambda [Fri, 8 Feb 2019 12:09:43 +0000 (12:09 +0000)]
Merge branch 'oauth2_strengthening' into 'develop'
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix
See merge request pleroma/pleroma!793
Ivan Tashkinov [Thu, 7 Feb 2019 19:14:06 +0000 (22:14 +0300)]
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix.
(`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris,
and if that happened before /web/login is accessed for the first time
then Pleroma used this externally created record with arbitrary
redirect_uris and client_secret known by creator).
hakabahitoyo [Thu, 7 Feb 2019 03:01:35 +0000 (12:01 +0900)]
mark streaming feature for ios apps in readme
kaniini [Thu, 7 Feb 2019 02:19:52 +0000 (02:19 +0000)]
Merge branch 'remove-pawoo-apps-from-readme' into 'develop'
Remove Pawoo apps from README.md
See merge request pleroma/pleroma!788
kaniini [Thu, 7 Feb 2019 02:18:51 +0000 (02:18 +0000)]
Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop'
Mark streaming feature for Apps in README.md
See merge request pleroma/pleroma!789
hakabahitoyo [Thu, 7 Feb 2019 02:04:37 +0000 (11:04 +0900)]
Mark streaming feature for Apps in README.md
Hakaba Hitoyo [Thu, 7 Feb 2019 01:15:27 +0000 (01:15 +0000)]
Update README.md
kaniini [Wed, 6 Feb 2019 22:40:24 +0000 (22:40 +0000)]
Merge branch 'rename-followings' into 'develop'
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
See merge request pleroma/pleroma!787
Mark Felder [Wed, 6 Feb 2019 22:34:44 +0000 (22:34 +0000)]
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
This was a dirty regex replace which worked on my server
Haelwenn [Wed, 6 Feb 2019 18:39:13 +0000 (18:39 +0000)]
Merge branch 'bugfix/rich-media-card' into 'develop'
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
William Pitcock [Wed, 6 Feb 2019 18:27:55 +0000 (18:27 +0000)]
tests: add a rich media card that contains all relevant fields
kaniini [Wed, 6 Feb 2019 18:19:47 +0000 (18:19 +0000)]
Merge branch 'add-admin-and-moderator-fields' into 'develop'
Add admin and moderator badges to user view and make their visibility configurable
See merge request pleroma/pleroma!767
William Pitcock [Wed, 6 Feb 2019 18:12:26 +0000 (18:12 +0000)]
test: add some regression tests for the rich media card rendering
William Pitcock [Wed, 6 Feb 2019 18:02:15 +0000 (18:02 +0000)]
mastodon api: rich media: don't clobber %URI struct with a string
Haelwenn [Wed, 6 Feb 2019 18:02:10 +0000 (18:02 +0000)]
Merge branch 'mr/exsyslogger-doc-and-format' into 'develop'
Adds a couple examples to docs/config.md for ExSyslogger and removes duplicate timestamps from default format.
See merge request pleroma/pleroma!784
Michael Loftis [Wed, 6 Feb 2019 17:54:30 +0000 (17:54 +0000)]
adds a couple of explicit examples for ExSyslogger
rinpatch [Wed, 6 Feb 2019 17:47:58 +0000 (17:47 +0000)]
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'
Fix if clause in activity_pub user_view
See merge request pleroma/pleroma!783
href [Wed, 6 Feb 2019 17:42:19 +0000 (18:42 +0100)]
Fix if clause in activity_pub user_view
Michael Loftis [Wed, 6 Feb 2019 17:34:09 +0000 (17:34 +0000)]
rids the duplicate timestamp from default ExSyslogger config
Maxim Filippov [Wed, 6 Feb 2019 10:41:31 +0000 (13:41 +0300)]
Split hide_networ only for local users
lambda [Wed, 6 Feb 2019 09:47:36 +0000 (09:47 +0000)]
Merge branch '2019-02-06-update-frontend' into 'develop'
update frontend
See merge request pleroma/pleroma!780
lain [Wed, 6 Feb 2019 09:40:01 +0000 (10:40 +0100)]
update frontend
eugenijm [Mon, 4 Feb 2019 12:28:35 +0000 (15:28 +0300)]
Allow to configure visibility for admin and moderator badges
eugenijm [Mon, 4 Feb 2019 02:03:57 +0000 (05:03 +0300)]
Add is_admin and is_moderator boolean fields to the user view
rinpatch [Tue, 5 Feb 2019 21:01:20 +0000 (21:01 +0000)]
Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'
rich media: parser: reject any data which cannot be explicitly encoded into JSON
Closes #596
See merge request pleroma/pleroma!779
William Pitcock [Tue, 5 Feb 2019 20:50:57 +0000 (20:50 +0000)]
rich media: parser: reject any data which cannot be explicitly encoded into JSON
kaniini [Tue, 5 Feb 2019 20:27:31 +0000 (20:27 +0000)]
Merge branch 'fix-dm-index' into 'develop'
Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772
kaniini [Tue, 5 Feb 2019 20:26:31 +0000 (20:26 +0000)]
Merge branch 'feature/ap-c2s-whoami' into 'develop'
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773
kaniini [Tue, 5 Feb 2019 20:13:38 +0000 (20:13 +0000)]
Merge branch 'testfix/twitter-api' into 'develop'
test: twitterapi: fix another possible test failure case
See merge request pleroma/pleroma!778
William Pitcock [Tue, 5 Feb 2019 20:04:39 +0000 (20:04 +0000)]
test: twitterapi: fix another possible test failure case
kaniini [Tue, 5 Feb 2019 18:56:59 +0000 (18:56 +0000)]
Merge branch 'feature/split-hide-network-v2' into 'develop'
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
kaniini [Tue, 5 Feb 2019 18:53:43 +0000 (18:53 +0000)]
Merge branch 'bugfix/rich-media-image-nil' into 'develop'
mastodon api: fix rendering of cards without image URLs (closes #597)
Closes #597
See merge request pleroma/pleroma!777
William Pitcock [Tue, 5 Feb 2019 18:49:02 +0000 (18:49 +0000)]
test: twitterapi: fix the test breakage for real
William Pitcock [Tue, 5 Feb 2019 18:30:27 +0000 (18:30 +0000)]
mastodon api: fix rendering of cards without image URLs (closes #597)
lambda [Tue, 5 Feb 2019 11:30:18 +0000 (11:30 +0000)]
Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'
activitypub: transmogrifier: fix bare tags
See merge request pleroma/pleroma!774
lambda [Tue, 5 Feb 2019 11:29:20 +0000 (11:29 +0000)]
Merge branch 'patch-2' into 'develop'
ARGLE GARBLE
See merge request pleroma/pleroma!776
lambda [Tue, 5 Feb 2019 11:28:48 +0000 (11:28 +0000)]
Merge branch 'bugfix/rich-media-nil' into 'develop'
html: don't attempt to parse nil content
See merge request pleroma/pleroma!775
Maxim Filippov [Tue, 5 Feb 2019 07:22:31 +0000 (10:22 +0300)]
Fix SQL
witches.live [Tue, 5 Feb 2019 07:03:54 +0000 (07:03 +0000)]
ARGLE GARBLE
Update .gitignore
William Pitcock [Tue, 5 Feb 2019 05:06:17 +0000 (05:06 +0000)]
html: don't attempt to parse nil content
William Pitcock [Tue, 5 Feb 2019 00:32:49 +0000 (00:32 +0000)]
activitypub: transmogrifier: fix bare tags
William Pitcock [Mon, 4 Feb 2019 22:58:29 +0000 (22:58 +0000)]
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
lain [Mon, 4 Feb 2019 22:47:29 +0000 (23:47 +0100)]
Massage index until it actually does the stuff we want.
Also makes the index a lot smoler.
Maxim Filippov [Mon, 4 Feb 2019 19:23:09 +0000 (22:23 +0300)]
Initialize hide_network with false
Haelwenn [Mon, 4 Feb 2019 19:20:11 +0000 (19:20 +0000)]
Merge branch 'feature/mrf-tag' into 'develop'
MRF TagPolicy engine
See merge request pleroma/pleroma!768
William Pitcock [Mon, 4 Feb 2019 19:03:25 +0000 (19:03 +0000)]
activitypub: mrf: tag policy: fix force-unlisted and sandbox actions
William Pitcock [Mon, 4 Feb 2019 17:48:48 +0000 (17:48 +0000)]
activitypub: mrf: tag policy: add support for subscription control
rinpatch [Mon, 4 Feb 2019 17:32:12 +0000 (17:32 +0000)]
Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'
fix hellthread threshold deprecation warning
See merge request pleroma/pleroma!770
Karen Konou [Mon, 4 Feb 2019 17:26:56 +0000 (18:26 +0100)]
fix hellthread threshold deprecation warning
William Pitcock [Mon, 4 Feb 2019 17:06:37 +0000 (17:06 +0000)]
activitypub: mrf: tag policy: refactor the filtering hook a bit
William Pitcock [Mon, 4 Feb 2019 17:03:34 +0000 (17:03 +0000)]
activitypub: mrf: tag policy: add support for processing follow requests
William Pitcock [Mon, 4 Feb 2019 15:55:20 +0000 (15:55 +0000)]
activitypub: mrf: tag policy: implement force-unlisted and sandbox
William Pitcock [Mon, 4 Feb 2019 02:35:46 +0000 (02:35 +0000)]
mrf: add initial MRF.TagPolicy engine
William Pitcock [Mon, 4 Feb 2019 02:33:11 +0000 (02:33 +0000)]
mix: add user tag/untag task
kaniini [Mon, 4 Feb 2019 16:52:41 +0000 (16:52 +0000)]
Merge branch 'mime-riff' into 'develop'
Mime: detect RIFF formats (wave, webp, avi)
See merge request pleroma/pleroma!769
href [Mon, 4 Feb 2019 16:44:41 +0000 (17:44 +0100)]
Mime: detect RIFF formats (wave, webp, avi)
rinpatch [Mon, 4 Feb 2019 16:01:34 +0000 (16:01 +0000)]
Merge branch 'fix/rich-media-relative-path' into 'develop'
Fix rich media relative path
Closes #588
See merge request pleroma/pleroma!759
rinpatch [Mon, 4 Feb 2019 12:36:50 +0000 (12:36 +0000)]
Merge branch 'feature/hellthread-filter-improvements' into 'develop'
Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766
Karen Konou [Mon, 4 Feb 2019 11:22:25 +0000 (11:22 +0000)]
removed a debug thingy
Karen Konou [Mon, 4 Feb 2019 11:09:00 +0000 (12:09 +0100)]
squished a bug
Karen Konou [Mon, 4 Feb 2019 09:23:43 +0000 (10:23 +0100)]
actually commited the changes
Karen Konou [Mon, 4 Feb 2019 09:23:07 +0000 (10:23 +0100)]
fixed Map,put arguments, updated nomenclature
Karen Konou [Sun, 3 Feb 2019 22:56:20 +0000 (23:56 +0100)]
more tweaks, fixed silly mistakes...
Karen Konou [Sun, 3 Feb 2019 21:46:06 +0000 (22:46 +0100)]
implemented tweaks
kaniini [Sun, 3 Feb 2019 21:06:15 +0000 (21:06 +0000)]
Merge branch 'mogrify-orient' into 'develop'
Update Mogrify docs and warning for deprecated syntax
See merge request pleroma/pleroma!763
Karen Konou [Sun, 3 Feb 2019 19:45:32 +0000 (20:45 +0100)]
fixed things
Karen Konou [Sun, 3 Feb 2019 19:27:28 +0000 (20:27 +0100)]
made toggleable, added docs
Karen Konou [Sun, 3 Feb 2019 19:12:23 +0000 (20:12 +0100)]
added optional delist feature
Maxim Filippov [Sun, 3 Feb 2019 18:24:09 +0000 (21:24 +0300)]
Split hide_network into hide_followers & hide_followings (fixed)
lambda [Sun, 3 Feb 2019 18:19:40 +0000 (18:19 +0000)]
Merge branch '589-fix-cache' into 'develop'
Resolve "Update object cache on favs/boosts"
Closes #589
See merge request pleroma/pleroma!764
lain [Sun, 3 Feb 2019 17:54:39 +0000 (18:54 +0100)]
Unbreak all the tests.
lain [Sun, 3 Feb 2019 17:28:14 +0000 (18:28 +0100)]
Still do caching in tests.
Mark Felder [Sun, 3 Feb 2019 16:39:42 +0000 (16:39 +0000)]
Update Mogrify docs and warning for deprecated syntax to encourage
users to enable both strip and auto-orient
kaniini [Sun, 3 Feb 2019 15:47:55 +0000 (15:47 +0000)]
Merge branch '582_federation_retirement_optimization' into 'develop'
[#582] Optimized federation retirement by reducing the number of SQL calls
Closes #582
See merge request pleroma/pleroma!762
Ivan Tashkinov [Sun, 3 Feb 2019 10:28:13 +0000 (13:28 +0300)]
[#582] Made single-pub task call Instance.set_reachable/1 if `set_reachable` is not specified.
Added tests.
Ivan Tashkinov [Sun, 3 Feb 2019 09:41:27 +0000 (12:41 +0300)]
[#582] Optimized federation retirement by reducing the number of SQL calls
(calling `Instances.set_reachable/1` only if instance had `unreachable_since`,
calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`).
rinpatch [Sat, 2 Feb 2019 10:48:35 +0000 (10:48 +0000)]
Merge branch 'fix/oauth-page-responsiveness' into 'develop'
Add responsive features to layout
Closes #564
See merge request pleroma/pleroma!760
Maxim Filippov [Sat, 2 Feb 2019 10:38:52 +0000 (13:38 +0300)]
Add responsive features to layout
rinpatch [Sat, 2 Feb 2019 09:24:24 +0000 (12:24 +0300)]
Check if rich media uri is relative
rinpatch [Sat, 2 Feb 2019 09:04:18 +0000 (12:04 +0300)]
Use with instead of if in the card
rinpatch [Sat, 2 Feb 2019 08:53:46 +0000 (11:53 +0300)]
merge only if page_url is an absolute path
rinpatch [Sat, 2 Feb 2019 08:38:37 +0000 (11:38 +0300)]
Fix rich media relative path
kaniini [Fri, 1 Feb 2019 20:23:55 +0000 (20:23 +0000)]
Merge branch 'revert-
0a82a7e6' into 'develop'
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
See merge request pleroma/pleroma!758
kaniini [Fri, 1 Feb 2019 20:22:58 +0000 (20:22 +0000)]
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
This reverts merge request !733
href [Fri, 1 Feb 2019 19:45:55 +0000 (19:45 +0000)]
Merge branch 'hotfix/object-normalize-cache' into 'develop'
object: use cached accesses when possible in Object.normalize()
See merge request pleroma/pleroma!757
href [Fri, 1 Feb 2019 19:39:50 +0000 (19:39 +0000)]
Merge branch 'streaming-api-url-fix' into 'develop'
Fix WebSocket streaming API URL.
See merge request pleroma/pleroma!756
William Pitcock [Fri, 1 Feb 2019 19:38:57 +0000 (19:38 +0000)]
object: use cached accesses when possible in Object.normalize()
eugenijm [Fri, 1 Feb 2019 19:35:19 +0000 (22:35 +0300)]
Use url() instead of static_url in Endpoint.websocket_url()
href [Fri, 1 Feb 2019 19:18:46 +0000 (19:18 +0000)]
Merge branch 'develop' into 'develop'
Use nodeinfo 2.1
See merge request pleroma/pleroma!753
Luna [Fri, 1 Feb 2019 19:03:23 +0000 (16:03 -0300)]
update nodeinfo version when requesting 2.1
eugenijm [Fri, 1 Feb 2019 18:56:18 +0000 (21:56 +0300)]
Use String.replace_leading instead of String.replace for getting websocket streaming api url.
Extract the login responsible for obtaining websocket URL into the corresponding
Endpoint function.
Luna [Fri, 1 Feb 2019 17:40:43 +0000 (14:40 -0300)]
mix format pass
Luna [Fri, 1 Feb 2019 17:35:08 +0000 (14:35 -0300)]
downcase software name in nodeinfo
Luna [Fri, 1 Feb 2019 17:33:14 +0000 (14:33 -0300)]
add tests for nodeinfo 2.0 compat and 2.1's new field
Haelwenn [Fri, 1 Feb 2019 17:27:50 +0000 (17:27 +0000)]
Merge branch 'bugfix/get_list_return_404' into 'develop'
MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list
See merge request pleroma/pleroma!755
Luna [Fri, 1 Feb 2019 17:23:40 +0000 (14:23 -0300)]
keep compatibility with nodeinfo 2.0
splits actual nodeinfo generation into raw_nodeinfo, the 2.0 handler
gives the same result, while the 2.1 handler inserts the
software.repository field. requested by @href
projects / akkoma / log