lambda [Mon, 6 May 2019 17:17:03 +0000 (17:17 +0000)]
Merge branch 'feature/bbs' into 'develop'
BBS / SSH
See merge request pleroma/pleroma!997
lambda [Mon, 6 May 2019 16:45:22 +0000 (16:45 +0000)]
Merge branch 'feature/845-improve-status-deletion' into 'develop'
Improve status deletion
Closes #845
See merge request pleroma/pleroma!1104
Alexander Strizhakov [Mon, 6 May 2019 16:45:22 +0000 (16:45 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
lain [Sat, 4 May 2019 13:47:50 +0000 (15:47 +0200)]
BBS: Credo fixes.
lain [Sat, 4 May 2019 13:36:48 +0000 (15:36 +0200)]
BBS: Fix tests.
lain [Sat, 4 May 2019 13:08:07 +0000 (15:08 +0200)]
BBS: Use cached user fetcher.
lain [Sat, 4 May 2019 13:06:18 +0000 (15:06 +0200)]
BBS: small fixes.
lain [Sat, 4 May 2019 13:00:45 +0000 (15:00 +0200)]
Merge remote-tracking branch 'origin/develop' into feature/bbs
rinpatch [Fri, 3 May 2019 20:36:13 +0000 (20:36 +0000)]
Merge branch 'fix/embeded-relationship-in-follows' into 'develop'
Fix embeded relationships in Mastodon API
See merge request pleroma/pleroma!1118
rinpatch [Fri, 3 May 2019 18:35:02 +0000 (18:35 +0000)]
Merge branch 'fix-search-speed' into 'develop'
Search: Add fts index on objects table.
See merge request pleroma/pleroma!1120
lain [Fri, 3 May 2019 18:28:06 +0000 (20:28 +0200)]
Just have Benchee in all environments.
lain [Fri, 3 May 2019 17:42:49 +0000 (19:42 +0200)]
Mix: Also have benchee in test.
lambda [Fri, 3 May 2019 17:26:39 +0000 (17:26 +0000)]
Merge branch 'bugfix/emoji-size' into 'develop'
Bugfix: emoji size in profile
Closes #269
See merge request pleroma/pleroma!792
lain [Fri, 3 May 2019 17:15:55 +0000 (19:15 +0200)]
Search: Add fts index on objects table.
Haelwenn (lanodan) Monnier [Fri, 22 Feb 2019 23:57:42 +0000 (00:57 +0100)]
MastoAPI: profile update with emoji_map
Haelwenn (lanodan) Monnier [Fri, 22 Feb 2019 23:09:11 +0000 (00:09 +0100)]
TwitterAPI: profile update with emoji_map
Haelwenn (lanodan) Monnier [Fri, 22 Feb 2019 21:35:47 +0000 (22:35 +0100)]
Web.TwitterAPI.UserView: Also view local user emojis
Haelwenn (lanodan) Monnier [Tue, 12 Feb 2019 13:59:34 +0000 (14:59 +0100)]
formatter.ex: Add get_emoji_map/1
Haelwenn (lanodan) Monnier [Mon, 11 Feb 2019 22:47:32 +0000 (23:47 +0100)]
Pleroma.User: remove emojify on parse_bio
Haelwenn (lanodan) Monnier [Thu, 7 Feb 2019 15:41:20 +0000 (16:41 +0100)]
Pleroma.Formatter: width/height to class=emoji
lambda [Fri, 3 May 2019 11:45:04 +0000 (11:45 +0000)]
Merge branch 'fix/replace-ws' into 'develop'
Standardize construction of websocket URL
See merge request pleroma/pleroma!1115
feld [Fri, 3 May 2019 11:45:04 +0000 (11:45 +0000)]
Standardize construction of websocket URL
This follows up on the change made in
d747bd98
rinpatch [Thu, 2 May 2019 19:19:14 +0000 (22:19 +0300)]
Fix embeded relationships in Mastodon API
Currently some endpoints render accounts without for user resulting in
embedded relationship being empty. It causes bugs in followers/following
tab in pleroma-fe but I fixed it for other endpoints as well just in
case
lambda [Thu, 2 May 2019 14:17:17 +0000 (14:17 +0000)]
Merge branch 'iss-849' into 'develop'
Parse access_token from body parameters and URL parameters
See merge request pleroma/pleroma!1103
AkiraFukushima [Thu, 2 May 2019 13:25:21 +0000 (22:25 +0900)]
Add oauth plug tests for url and body parameters
AkiraFukushima [Mon, 29 Apr 2019 14:53:48 +0000 (23:53 +0900)]
fix: Add mix deps.get before unit-testing
AkiraFukushima [Thu, 2 May 2019 12:04:00 +0000 (21:04 +0900)]
Parse access_token from body parameters and URL parameters
lambda [Wed, 1 May 2019 13:28:04 +0000 (13:28 +0000)]
Merge branch 'support/oauth' into 'develop'
Refactored Pleroma.Web.Auth.Authenticator
See merge request pleroma/pleroma!1108
Maksim [Wed, 1 May 2019 13:28:04 +0000 (13:28 +0000)]
Refactored Pleroma.Web.Auth.Authenticator
rinpatch [Wed, 1 May 2019 11:02:08 +0000 (11:02 +0000)]
Merge branch 'fix/remove-redundant-ensure-scrubbed-html' into 'develop'
Remove redundant ensure_scrubbed_html
See merge request pleroma/pleroma!1114
rinpatch [Wed, 1 May 2019 10:52:44 +0000 (13:52 +0300)]
Remove redundant ensure_scrubbed_html
It is never used as handling for fake and non-fake activities was merged
into one function above it
lambda [Wed, 1 May 2019 10:48:30 +0000 (10:48 +0000)]
Merge branch 'features/download-mastofe-build' into 'develop'
installation/download-mastofe-build.sh: Add mastofe CI-artifacts download
See merge request pleroma/pleroma!1052
lambda [Wed, 1 May 2019 10:45:32 +0000 (10:45 +0000)]
Merge branch 'bugfix/web-notification-special-char' into 'develop'
fix the web push notification with special char for status created
See merge request pleroma/pleroma!1092
lambda [Wed, 1 May 2019 10:41:00 +0000 (10:41 +0000)]
Merge branch 'harmonize_return_types_in_user_module' into 'develop'
Harmonize return types in user module
Closes #718
See merge request pleroma/pleroma!1112
rinpatch [Wed, 1 May 2019 09:16:25 +0000 (09:16 +0000)]
Merge branch 'docs/fix-config.md' into 'develop'
[docs/config.md]Fix syntax highlighting + clarify :frontend_configuration
See merge request pleroma/pleroma!1110
rinpatch [Wed, 1 May 2019 09:14:10 +0000 (09:14 +0000)]
Merge branch 'update_auto_linker' into 'develop'
Update `auto_linker`
See merge request pleroma/pleroma!1111
Alex S [Wed, 1 May 2019 09:09:53 +0000 (16:09 +0700)]
test fixes
Egor Kislitsyn [Wed, 1 May 2019 08:18:12 +0000 (15:18 +0700)]
Update `auto_linker`
Alex S [Wed, 1 May 2019 05:29:33 +0000 (12:29 +0700)]
Merging with develop
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
xse [Tue, 30 Apr 2019 23:26:14 +0000 (01:26 +0200)]
Fix syntax highlighting + clarify :frontend_configuration
Sachin Joshi [Tue, 30 Apr 2019 19:52:17 +0000 (01:37 +0545)]
add scrubber for html special char
Sachin Joshi [Tue, 30 Apr 2019 18:36:30 +0000 (00:21 +0545)]
Merge branch 'develop' into bugfix/web-notification-special-char
rinpatch [Tue, 30 Apr 2019 17:31:48 +0000 (17:31 +0000)]
Merge branch 'fix/stream_out-normalize-only-creates' into 'develop'
Do not normalize objects in stream_out unless the activity type is Create
See merge request pleroma/pleroma!1109
rinpatch [Tue, 30 Apr 2019 17:21:28 +0000 (20:21 +0300)]
Do not normalize objects in stream_out unless the activity type is
Create
Saves quite a bit of time with delete activities because they would
always query the db
rinpatch [Mon, 29 Apr 2019 18:33:06 +0000 (18:33 +0000)]
Merge branch 'hotfix/migrateoldbookmarks-crashing-on-deleted-activities' into 'develop'
Fix MigrateOldBookmarks migration crashing on deleted activities
See merge request pleroma/pleroma!1106
rinpatch [Mon, 29 Apr 2019 18:25:30 +0000 (21:25 +0300)]
Fix MigrateOldBookmarks migration crashing on deleted activities
rinpatch [Mon, 29 Apr 2019 16:24:33 +0000 (16:24 +0000)]
Merge branch 'fix-webpush' into 'develop'
WebPush: Use Object.normalize, rewrite tests so they test reality.
See merge request pleroma/pleroma!1105
lain [Mon, 29 Apr 2019 16:15:30 +0000 (18:15 +0200)]
WebPush: Use Object.normalize, rewrite tests so they test reality.
rinpatch [Mon, 29 Apr 2019 06:45:18 +0000 (06:45 +0000)]
Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
Add default_scope to /api/v1/update_credentials
See merge request pleroma/pleroma!1100
kaniini [Sun, 28 Apr 2019 23:05:50 +0000 (23:05 +0000)]
Merge branch 'fix/uploads-folder-issues' into 'develop'
fix issues with the uploads directory
See merge request pleroma/pleroma!1101
kaniini [Sun, 28 Apr 2019 23:05:14 +0000 (23:05 +0000)]
Merge branch 'regression/rights-only-for-admin' into 'develop'
Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators
See merge request pleroma/pleroma!1102
rinpatch [Sun, 28 Apr 2019 16:42:43 +0000 (19:42 +0300)]
Fix `rights` in TwitterAPI's user entity being present only for
Admins/Moderators
In !1093 I reused `maybe_with_role` for `rights` object, however I
missed that `maybe_with_role` is called only for admins/moderators.
xse [Sun, 28 Apr 2019 04:43:00 +0000 (06:43 +0200)]
fix issues with the uploads directory
kaniini [Sun, 28 Apr 2019 00:21:32 +0000 (00:21 +0000)]
Merge branch 'fix/bookmark-depend-on-embeded-object' into 'develop'
Fix bookmarks depending on embeded object and move checking if the status is bookmarked to SQL
See merge request pleroma/pleroma!1099
rinpatch [Sat, 27 Apr 2019 20:55:54 +0000 (23:55 +0300)]
Add default_scope to /api/v1/update_credentials
rinpatch [Sat, 27 Apr 2019 20:06:46 +0000 (23:06 +0300)]
Fix bookmarks depending on embeded object and move checking if the
status is bookmarked to SQL
kaniini [Sat, 27 Apr 2019 07:44:24 +0000 (07:44 +0000)]
Merge branch 'feature/bbcode' into 'develop'
BBCode support (backend)
See merge request pleroma/pleroma!1097
kaniini [Sat, 27 Apr 2019 07:42:01 +0000 (07:42 +0000)]
Merge branch 'update/pleroma-fe-
20190426' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!1098
William Pitcock [Sat, 27 Apr 2019 07:34:59 +0000 (07:34 +0000)]
update pleroma frontend
William Pitcock [Fri, 26 Apr 2019 22:38:56 +0000 (22:38 +0000)]
tests: fix up for changed bbcode library output and verify html is properly escaped
William Pitcock [Fri, 26 Apr 2019 10:17:57 +0000 (10:17 +0000)]
add support for bbcode
William Pitcock [Fri, 26 Apr 2019 09:22:26 +0000 (09:22 +0000)]
mix: add bbcode dependency
lambda [Fri, 26 Apr 2019 11:59:47 +0000 (11:59 +0000)]
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
Feature/807 bookmark endpoint extension
Closes #807
See merge request pleroma/pleroma!1059
kaniini [Fri, 26 Apr 2019 02:41:35 +0000 (02:41 +0000)]
Merge branch 'feature/mastoapi-new-config' into 'develop'
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674)
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
See merge request pleroma/pleroma!1093
kaniini [Thu, 25 Apr 2019 23:35:13 +0000 (23:35 +0000)]
Merge branch 'chore/update-changelog' into 'develop'
update Changelog
See merge request pleroma/pleroma!1096
William Pitcock [Thu, 25 Apr 2019 23:27:38 +0000 (23:27 +0000)]
update Changelog
kaniini [Thu, 25 Apr 2019 23:23:27 +0000 (23:23 +0000)]
Merge branch 'feature/mediaproxy-whitelist' into 'develop'
Add mediaproxy whitelist capability
Closes #837
See merge request pleroma/pleroma!1095
Mark Felder [Thu, 25 Apr 2019 23:11:47 +0000 (18:11 -0500)]
Add mediaproxy whitelist capability
Haelwenn [Thu, 25 Apr 2019 09:47:42 +0000 (09:47 +0000)]
Merge branch 'feature/auto-reject-follow-requests-blocked' into 'develop'
activitypub: transmogrifier: send reject follow if following does not succeed
See merge request pleroma/pleroma!1094
rinpatch [Thu, 25 Apr 2019 06:14:35 +0000 (09:14 +0300)]
Move settings to Source subentity
Alex S [Thu, 25 Apr 2019 07:09:57 +0000 (14:09 +0700)]
test fixes
Alex S [Mon, 22 Apr 2019 09:16:19 +0000 (16:16 +0700)]
fixes for tests
Alex S [Mon, 22 Apr 2019 05:45:45 +0000 (12:45 +0700)]
migration without using old field name
removing old field from db, after bookmarks migration
Alex S [Sat, 20 Apr 2019 07:41:42 +0000 (14:41 +0700)]
unused
Alex S [Wed, 17 Apr 2019 07:24:11 +0000 (14:24 +0700)]
removing useless transaction
Alex S [Mon, 15 Apr 2019 04:43:02 +0000 (11:43 +0700)]
migration optimization
changelog wording
Alex S [Sun, 14 Apr 2019 14:54:49 +0000 (21:54 +0700)]
changelog file update
Alex S [Sun, 14 Apr 2019 14:42:18 +0000 (21:42 +0700)]
favourites add bookmark display
Alex S [Sun, 14 Apr 2019 14:37:05 +0000 (21:37 +0700)]
migrate user.bookmarks to separate table
Alex S [Sun, 14 Apr 2019 12:45:56 +0000 (19:45 +0700)]
bookmarks in separate table
William Pitcock [Wed, 24 Apr 2019 23:52:33 +0000 (23:52 +0000)]
activitypub: transmogrifier: send reject follow if following does not succeed
rinpatch [Wed, 24 Apr 2019 17:01:42 +0000 (20:01 +0300)]
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674)
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
Sachin Joshi [Wed, 24 Apr 2019 01:21:17 +0000 (07:06 +0545)]
fix the status notification with special char
kaniini [Tue, 23 Apr 2019 23:07:56 +0000 (23:07 +0000)]
Merge branch 'security/fix-html-class-scrubbing' into 'develop'
html: lock down allowed class attributes to only those related to microformats
See merge request pleroma/pleroma!1090
William Pitcock [Tue, 23 Apr 2019 22:55:21 +0000 (22:55 +0000)]
html: lock down allowed class attributes to only those related to microformats
kaniini [Tue, 23 Apr 2019 02:47:43 +0000 (02:47 +0000)]
Merge branch 'feature/users-favourites-timeline-endpoint' into 'develop'
Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)
Closes #789
See merge request pleroma/pleroma!1056
Sergey Suprunenko [Tue, 23 Apr 2019 02:47:43 +0000 (02:47 +0000)]
Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)
kaniini [Tue, 23 Apr 2019 02:43:53 +0000 (02:43 +0000)]
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086
kaniini [Tue, 23 Apr 2019 02:43:26 +0000 (02:43 +0000)]
Merge branch 'fix/normalize-activities' into 'develop'
Normalize acitvities instead of objects inside them
See merge request pleroma/pleroma!1085
kaniini [Tue, 23 Apr 2019 02:41:21 +0000 (02:41 +0000)]
Merge branch 'develop' into 'develop'
Add shortcode_globs setting to documentation
See merge request pleroma/pleroma!1087
kaniini [Mon, 22 Apr 2019 18:31:01 +0000 (18:31 +0000)]
Merge branch 'add-healthcheck-setting-to-config' into 'develop'
added healthcheck setting to instance config
See merge request pleroma/pleroma!1088
ilja [Mon, 22 Apr 2019 17:42:02 +0000 (19:42 +0200)]
Add :emoji settings to config.md
Alex S [Mon, 22 Apr 2019 10:00:06 +0000 (17:00 +0700)]
added healthcheck setting to instance config
ilja [Mon, 22 Apr 2019 09:17:53 +0000 (11:17 +0200)]
Add shortcode_globs setting to documentation
rinpatch [Mon, 22 Apr 2019 09:02:41 +0000 (12:02 +0300)]
Add a changelog entry for `pleroma.in_reply_to_account_acct`
rinpatch [Mon, 22 Apr 2019 08:53:37 +0000 (11:53 +0300)]
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
rinpatch [Mon, 22 Apr 2019 08:27:29 +0000 (11:27 +0300)]
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
rinpatch [Mon, 22 Apr 2019 08:09:08 +0000 (08:09 +0000)]
Merge branch 'fix/emoji-task-docs' into 'develop'
Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix task docs
See merge request pleroma/pleroma!1084
rinpatch [Mon, 22 Apr 2019 08:02:31 +0000 (11:02 +0300)]
Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix
task docs
kaniini [Mon, 22 Apr 2019 07:20:43 +0000 (07:20 +0000)]
Merge branch 'get-cached-everywhere' into 'develop'
Use `User.get_cached*` everywhere
See merge request pleroma/pleroma!1021
projects / akkoma / log