kaniini
|
39b766cc43
|
Merge branch 'bugfix/connect-src-https' into 'develop'
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
See merge request pleroma/pleroma!900
|
2019-03-06 13:22:02 +00:00 |
|
kaniini
|
07f8c79a69
|
Merge branch 'bugfix/rel-me_list' into 'develop'
Web.RelMe: Fix having other values in rel attr
See merge request pleroma/pleroma!901
|
2019-03-06 13:20:51 +00:00 |
|
kaniini
|
d249ea8e7c
|
Merge branch 'feature/647' into 'develop'
[#647] tests for web push
See merge request pleroma/pleroma!904
|
2019-03-06 13:20:12 +00:00 |
|
Maksim
|
bc7570c282
|
[#647] tests for web push
|
2019-03-06 13:20:12 +00:00 |
|
kaniini
|
4cbaab2181
|
Merge branch 'features/masto_fe-config' into 'develop'
Add default config for masto_fe
See merge request pleroma/pleroma!906
|
2019-03-06 13:19:26 +00:00 |
|
Maxim Filippov
|
76160122f6
|
Keep heading short
|
2019-03-06 05:01:38 +03:00 |
|
Haelwenn
|
96901b6554
|
Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'
Properly escape reserved URI charachters in upload urls
Closes #700
See merge request pleroma/pleroma!905
|
2019-03-06 01:45:17 +00:00 |
|
Haelwenn (lanodan) Monnier
|
a283a1fcd0
|
Add default config for masto_fe
Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22
|
2019-03-06 02:26:14 +01:00 |
|
|
|
28d5b40d0a
|
Add handling of objects not in database
|
2019-03-05 23:15:22 +01:00 |
|
rinpatch
|
40ff8f5964
|
Add tests for reserved char escaping in upload
|
2019-03-05 19:28:58 +03:00 |
|
rinpatch
|
4263edc9c9
|
Properly escape reserved URI charachters in upload urls
|
2019-03-05 18:09:23 +03:00 |
|
rinpatch
|
bcd8ef65e0
|
Merge branch 'add-admin-to-node-info' into 'develop'
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
|
2019-03-05 07:05:44 +00:00 |
|
Haelwenn (lanodan) Monnier
|
788a354ce0
|
Web.RelMe: Fix having other values in rel attr
One example of this is Github which puts a rel="nofollow me" on the
profile link.
|
2019-03-05 02:13:22 +01:00 |
|
Haelwenn (lanodan) Monnier
|
fc37e5815f
|
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/469
|
2019-03-05 01:44:24 +01:00 |
|
Haelwenn
|
682cc94db1
|
Merge branch 'bugfix/rich-media-uri-validation' into 'develop'
rich media: don't crawl bogus URIs
See merge request pleroma/pleroma!864
|
2019-03-05 00:33:04 +00:00 |
|
eugenijm
|
d1de0a30cc
|
Include admins in nodeinfo
|
2019-03-05 03:17:24 +03:00 |
|
Maxim Filippov
|
2d30fc279f
|
Typo
|
2019-03-05 02:11:15 +03:00 |
|
William Pitcock
|
b7aa1ea9e6
|
rich media: helpers: rework validate_page_url()
|
2019-03-04 18:39:13 +00:00 |
|
Maxim Filippov
|
02359d686c
|
local -> only_local
|
2019-03-04 21:36:47 +03:00 |
|
Maxim Filippov
|
e34710b988
|
Format & update docs
|
2019-03-04 21:33:53 +03:00 |
|
William Pitcock
|
9f3cb38012
|
helpers: use AutoLinker to validate URIs as well as the other tests
|
2019-03-04 18:31:49 +00:00 |
|
William Pitcock
|
d7a278a733
|
tests: add tests for rich media helper functions
|
2019-03-04 18:31:49 +00:00 |
|
William Pitcock
|
d38d537bee
|
rich media: don't crawl bogus URIs
|
2019-03-04 18:31:49 +00:00 |
|
kaniini
|
d45dbdce5a
|
Merge branch 'feature/add-status-text-to-notifications' into 'develop'
Add status text to notifications (mentions and reposts)
Closes #696
See merge request pleroma/pleroma!897
|
2019-03-04 18:29:13 +00:00 |
|
Maxim Filippov
|
f620199836
|
Merge search endpoint into /users
|
2019-03-04 21:26:32 +03:00 |
|
Maxim Filippov
|
0245ce842f
|
Remove unused code
|
2019-03-04 20:49:20 +03:00 |
|
Maxim Filippov
|
cc7b35e097
|
Add status text to notifications (mentions and reposts)
|
2019-03-04 20:47:34 +03:00 |
|
kaniini
|
ca5d894e68
|
Merge branch 'fix/like-adressing' into 'develop'
Stop adresssing like activities to actor's follower collection on non-public posts
See merge request pleroma/pleroma!896
|
2019-03-04 15:59:57 +00:00 |
|
rinpatch
|
33c614bce0
|
Stop adresssing like activities to actor's follower collection on non-public posts
|
2019-03-04 18:09:58 +03:00 |
|
kaniini
|
10248d86a2
|
Merge branch 'unify-follow' into 'develop'
Unify follow code with CommonAPI
Closes #690
See merge request pleroma/pleroma!889
|
2019-03-04 13:25:32 +00:00 |
|
kaniini
|
c63a45cd0e
|
Merge branch 'dm-visibility-for-blocking-users' into 'develop'
Fix DM visibility for blocking users #698
Closes #698
See merge request pleroma/pleroma!890
|
2019-03-04 13:20:17 +00:00 |
|
KokaKiwi
|
bf43f055dd
|
Set content types settings on mastofe endpoint.
|
2019-03-04 12:00:02 +01:00 |
|
KokaKiwi
|
b57913b13a
|
Fix supported TLS versions as TLS 1.3 support seems buggy.
|
2019-03-04 11:30:26 +01:00 |
|
|
|
896f8580dd
|
Merge branch 'bugfix/delete-activity-audience' of git.pleroma.social:pleroma/pleroma into bugfix/delete-activity-audience
|
2019-03-04 11:22:17 +01:00 |
|
|
|
1445dc25d4
|
fix format
|
2019-03-04 11:18:45 +01:00 |
|
|
|
aab86698a5
|
Expand "to" of delete activities
|
2019-03-04 11:18:45 +01:00 |
|
|
|
8302cdb5dc
|
Expand "to" of delete activities
|
2019-03-04 10:47:04 +01:00 |
|
eugenijm
|
86e4b48a5e
|
Fix DM visibility for blocking users
|
2019-03-04 06:24:27 +03:00 |
|
eugenijm
|
594694607c
|
Unify Mastodon and Twitter follow implementations using CommonAPI
|
2019-03-04 01:00:37 +03:00 |
|
kaniini
|
dd5865535e
|
Merge branch 'muting' into 'develop'
Don't stream muted accounts
See merge request pleroma/pleroma!888
|
2019-03-03 21:10:10 +00:00 |
|
William Pearson
|
818a7894da
|
Don't stream muted accounts
|
2019-03-03 20:54:53 +00:00 |
|
link0ff
|
88a672fe88
|
Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well
|
2019-03-03 21:20:36 +02:00 |
|
rinpatch
|
8543e7f760
|
Merge branch 'remove-todo-txt' into 'develop'
Remove TODO.txt
See merge request pleroma/pleroma!887
|
2019-03-03 17:39:46 +00:00 |
|
rinpatch
|
9962121bff
|
Remove TODO.txt
|
2019-03-03 20:32:46 +03:00 |
|
link0ff
|
19e2b85247
|
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
|
2019-03-03 18:29:37 +02:00 |
|
kaniini
|
ace4231628
|
Merge branch 'features/bio_rel_me' into 'develop'
Add rel=me to the User bio
Closes #423
See merge request pleroma/pleroma!813
|
2019-03-03 16:00:49 +00:00 |
|
kaniini
|
6c6a2dbfdd
|
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
Add pagination and search to users
See merge request pleroma/pleroma!873
|
2019-03-03 15:59:15 +00:00 |
|
kaniini
|
b531e366df
|
Merge branch 'get-follow-requests-sql' into 'develop'
Use sql query in User.get_follow_requests/1 for filtering logic
See merge request pleroma/pleroma!883
|
2019-03-03 15:51:32 +00:00 |
|
kaniini
|
413cf00cc3
|
Merge branch 'atomic-note-count-updates' into 'develop'
Atomic update for note count and follower count
See merge request pleroma/pleroma!885
|
2019-03-03 15:50:41 +00:00 |
|
kaniini
|
c93479c6f5
|
Merge branch 'count-only-public-statuses' into 'develop'
Increment user note count only on public activities #703
See merge request pleroma/pleroma!884
|
2019-03-03 15:49:19 +00:00 |
|
