itepechi/akkoma
1
0
Fork 0
Code Issues Pull requests Releases Activity
4829 commits 3 branches 2 tags 277 MiB
Commit graph

4829 commits

This branch
This branch
All branches
Author SHA1 Message Date
rinpatch
f8f6af4cc1 Fix MigrateOldBookmarks migration crashing on deleted activities 2019-04-29 21:25:30 +03:00
rinpatch
41d78f9108 Merge branch 'fix-webpush' into 'develop' 
WebPush: Use Object.normalize, rewrite tests so they test reality.

See merge request pleroma/pleroma!1105
 2019-04-29 16:24:33 +00:00
lain
b0951a8849 WebPush: Use Object.normalize, rewrite tests so they test reality. 2019-04-29 18:15:30 +02:00
rinpatch
0fd176b990 Merge branch 'fix/add-default-scope-mastoapi' into 'develop' 
Add default_scope to /api/v1/update_credentials

See merge request pleroma/pleroma!1100
 2019-04-29 06:45:18 +00:00
kaniini
8e266e02da Merge branch 'fix/uploads-folder-issues' into 'develop' 
fix issues with the uploads directory

See merge request pleroma/pleroma!1101
 2019-04-28 23:05:50 +00:00
kaniini
292c69481b 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
 2019-04-28 23:05:14 +00:00
rinpatch
61ca2f7a4e 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.
 2019-04-28 19:42:43 +03:00
xse
31852f906e fix issues with the uploads directory 2019-04-28 06:43:00 +02:00
kaniini
f2a4156d49 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
 2019-04-28 00:21:32 +00:00
rinpatch
ce3789e39a Add default_scope to /api/v1/update_credentials 2019-04-27 23:55:54 +03:00
rinpatch
c3e9fcf098 Fix bookmarks depending on embeded object and move checking if the 
status is bookmarked to SQL
 2019-04-27 23:06:46 +03:00
kaniini
002ea343f8 Merge branch 'feature/bbcode' into 'develop' 
BBCode support (backend)

See merge request pleroma/pleroma!1097
 2019-04-27 07:44:24 +00:00
kaniini
81bc274930 Merge branch 'update/pleroma-fe-20190426' into 'develop' 
update pleroma frontend

See merge request pleroma/pleroma!1098
 2019-04-27 07:42:01 +00:00
William Pitcock
52bdfced32 update pleroma frontend 2019-04-27 07:34:59 +00:00
William Pitcock
ef52aa0e66 tests: fix up for changed bbcode library output and verify html is properly escaped 2019-04-26 22:45:45 +00:00
William Pitcock
501af917b5 add support for bbcode 2019-04-26 22:35:02 +00:00
William Pitcock
2bd880be88 mix: add bbcode dependency 2019-04-26 22:34:59 +00:00
lambda
4de5fef1f8 Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop' 
Feature/807 bookmark endpoint extension

Closes #807

See merge request pleroma/pleroma!1059
 2019-04-26 11:59:47 +00:00
kaniini
48f68fd133 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
 2019-04-26 02:41:35 +00:00
kaniini
fd45c74e6f Merge branch 'chore/update-changelog' into 'develop' 
update Changelog

See merge request pleroma/pleroma!1096
 2019-04-25 23:35:13 +00:00
William Pitcock
99b0792751 update Changelog 2019-04-25 23:27:58 +00:00
kaniini
5b2791698c Merge branch 'feature/mediaproxy-whitelist' into 'develop' 
Add mediaproxy whitelist capability

Closes #837

See merge request pleroma/pleroma!1095
 2019-04-25 23:23:27 +00:00
Mark Felder
24c3e2db2c Add mediaproxy whitelist capability 2019-04-25 18:11:47 -05:00
Haelwenn
8c9227c1f1 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
 2019-04-25 09:47:42 +00:00
rinpatch
dfc8425659 Move settings to Source subentity 2019-04-25 10:31:14 +03:00
Alex S
a825056d4d test fixes 2019-04-25 14:09:57 +07:00
Alex S
85953c0836 fixes for tests 2019-04-25 13:46:40 +07:00
Alex S
229ce6abbc migration without using old field name 
removing old field from db, after bookmarks migration
 2019-04-25 13:42:10 +07:00
Alex S
3c2ae80008 unused 2019-04-25 13:42:10 +07:00
Alex S
58711a79d0 removing useless transaction 2019-04-25 13:40:12 +07:00
Alex S
6322c1e123 migration optimization 
changelog wording
 2019-04-25 13:40:12 +07:00
Alex S
17b5b78737 changelog file update 2019-04-25 13:39:24 +07:00
Alex S
1258128f4f favourites add bookmark display 2019-04-25 13:38:24 +07:00
Alex S
324c9c8ab5 migrate user.bookmarks to separate table 2019-04-25 13:38:24 +07:00
Alex S
73d01857e3 bookmarks in separate table 2019-04-25 13:38:24 +07:00
William Pitcock
0fd0ffcd76 activitypub: transmogrifier: send reject follow if following does not succeed 2019-04-25 00:48:45 +00:00
rinpatch
4baea6e6d9 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
 2019-04-24 20:01:42 +03:00
kaniini
030a7876b4 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
 2019-04-23 23:07:56 +00:00
William Pitcock
f5535e5743 html: lock down allowed class attributes to only those related to microformats 2019-04-23 23:03:45 +00:00
kaniini
3789945784 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
 2019-04-23 02:47:43 +00:00
Sergey Suprunenko
9dd36e5bcb Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789) 2019-04-23 02:47:43 +00:00
kaniini
10c40e13d2 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
 2019-04-23 02:43:53 +00:00
kaniini
aa9d378985 Merge branch 'fix/normalize-activities' into 'develop' 
Normalize acitvities instead of objects inside them

See merge request pleroma/pleroma!1085
 2019-04-23 02:43:26 +00:00
kaniini
7dcac0bac0 Merge branch 'develop' into 'develop' 
Add shortcode_globs setting to documentation

See merge request pleroma/pleroma!1087
 2019-04-23 02:41:21 +00:00
kaniini
414902cd9e Merge branch 'add-healthcheck-setting-to-config' into 'develop' 
added healthcheck setting to instance config

See merge request pleroma/pleroma!1088
 2019-04-22 18:31:01 +00:00
ilja
74ef14b04e Add :emoji settings to config.md 2019-04-22 19:42:02 +02:00
Alex S
d35246c449 added healthcheck setting to instance config 2019-04-22 17:00:06 +07:00
ilja
c876b04aeb Add shortcode_globs setting to documentation 2019-04-22 11:17:53 +02:00
rinpatch
f4c9b79306 Add a changelog entry for pleroma.in_reply_to_account_acct 2019-04-22 12:02:47 +03:00
rinpatch
f60d072bbb Add pleroma.in_reply_to_account_acct to MastoAPI status entity 2019-04-22 11:54:27 +03:00