lain
|
c53b96a024
|
Fix specs.
|
2019-01-30 19:45:31 +01:00 |
|
lain
|
47ec690c54
|
Use race-condition free mass follow.
|
2019-01-30 19:33:25 +01:00 |
|
lain
|
935e65e261
|
Use race-condition free following method.
|
2019-01-30 19:21:04 +01:00 |
|
Haelwenn
|
aa98a100b4
|
Merge branch 'docs/fix-frontend_config' into 'develop'
docs/config.md: Fix syntax, pleroma_fe isn’t an atom
See merge request pleroma/pleroma!738
|
2019-01-30 10:56:53 +00:00 |
|
Haelwenn (lanodan) Monnier
|
7db517ff06
|
docs/config.md: Fix syntax, pleroma_fe isn’t an atom
|
2019-01-30 11:51:12 +01:00 |
|
kaniini
|
cfda532d16
|
Merge branch 'docs/fix-frontend_config' into 'develop'
docs/config.md: Fix typo, provide an example key with camelCase and where to find more
See merge request pleroma/pleroma!737
|
2019-01-30 10:38:41 +00:00 |
|
Haelwenn (lanodan) Monnier
|
aa492af6c2
|
docs/config.md: Fix typo, provide an example key with camelCase and where to find more
[ci skip]
|
2019-01-30 11:33:39 +01:00 |
|
lambda
|
97694eb451
|
Merge branch 'docs/fix-pleroma-api-title' into 'develop'
docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to it
See merge request pleroma/pleroma!736
|
2019-01-29 19:24:30 +00:00 |
|
Haelwenn (lanodan) Monnier
|
3f9d0c08ea
|
docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to it
[ci skip]
|
2019-01-29 19:11:54 +01:00 |
|
kaniini
|
7a2c4f984b
|
Merge branch 'bugfix/fix-rejects' into 'develop'
follow request fixups
Closes #537
See merge request pleroma/pleroma!734
|
2019-01-29 14:47:36 +00:00 |
|
kaniini
|
d03a116654
|
Merge branch 'hj-happiness-improvement' into 'develop'
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
|
2019-01-29 13:54:10 +00:00 |
|
William Pitcock
|
57549f6043
|
activitypub: utils: update the state of *any* pending follow relationship that matches the actor and target
|
2019-01-29 12:21:02 +00:00 |
|
William Pitcock
|
cbb2b709de
|
activitypub: transmogrifier: fix follow request rejections
|
2019-01-29 11:57:46 +00:00 |
|
Haelwenn
|
ebb3496386
|
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
Rich Media support, part 2.
See merge request pleroma/pleroma!719
|
2019-01-29 05:11:08 +00:00 |
|
William Pitcock
|
61d6715714
|
rich media: oembed: return data in the same format as the other parsers
|
2019-01-28 21:13:25 +00:00 |
|
William Pitcock
|
ddb5545202
|
rich media: kill some testsuite noise
|
2019-01-28 20:55:33 +00:00 |
|
William Pitcock
|
0f11254a06
|
rich media: parser: add some basic sanity checks on the returned data with pattern matching
|
2019-01-28 20:43:21 +00:00 |
|
William Pitcock
|
83b7062634
|
rich media: parser: cache negatives
|
2019-01-28 20:19:07 +00:00 |
|
William Pitcock
|
8fb16e9f0f
|
rich media: parser: add copyright header
|
2019-01-28 20:00:01 +00:00 |
|
kaniini
|
009273fd6e
|
Merge branch 'app-list-changes' into 'develop'
App list changes: Separate into two categories, and drop Subway Tooter.
See merge request pleroma/pleroma!731
|
2019-01-28 14:31:03 +00:00 |
|
scarlett
|
b57b56ff3e
|
App list changes: Separate into two categories, and drop Subway Tooter.
|
2019-01-28 14:24:49 +00:00 |
|
lain
|
f53d464db0
|
Put deprecation warnings undre Pleroma.Config.
|
2019-01-28 14:39:54 +01:00 |
|
lain
|
8e8a1e1ba8
|
Return new-style config if old-style config is set to false.
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
|
2019-01-28 13:07:12 +01:00 |
|
lain
|
bcc559e4e6
|
Update config.md
|
2019-01-28 13:06:28 +01:00 |
|
lain
|
f1d58c5c49
|
Don't run warnings in a task.
|
2019-01-28 13:05:17 +01:00 |
|
lain
|
39b2457734
|
Change default bg image in new config.
|
2019-01-28 13:04:51 +01:00 |
|
Haelwenn
|
de0fb88a9c
|
Merge branch 'safe-render-activities' into 'develop'
remove unnecessary filter (re !723)
See merge request pleroma/pleroma!729
|
2019-01-28 11:48:03 +00:00 |
|
href
|
df2f7b39dd
|
re f83bae7c: remove unnecessary filter
|
2019-01-28 12:24:14 +01:00 |
|
lain
|
f231313b70
|
Add deprecation warning mechanism.
|
2019-01-28 12:09:41 +01:00 |
|
href
|
74ed1b4d87
|
Merge branch 'oauth-login-failure-bug' into 'develop'
Correctly handle invalid credentials on auth login.
Closes #407
See merge request pleroma/pleroma!728
|
2019-01-28 10:49:03 +00:00 |
|
lain
|
1825118fd4
|
Correctly handle invalid credentials on auth login.
Closes #407
|
2019-01-28 11:41:47 +01:00 |
|
Haelwenn
|
b380b4898d
|
Merge branch 'patch-2' into 'develop'
Update the openrc service's retry with the correct format
See merge request pleroma/pleroma!727
|
2019-01-28 08:23:21 +00:00 |
|
vaartis
|
9e43a28bc3
|
Update the openrc service's retry with the correct format
|
2019-01-28 08:18:11 +00:00 |
|
William Pitcock
|
ddc7ae2c1a
|
mastodon api: card: force OGP images through mediaproxy
|
2019-01-28 06:42:27 +00:00 |
|
William Pitcock
|
339c26e12b
|
test: add status posting with OGP link preview test
|
2019-01-28 06:19:00 +00:00 |
|
William Pitcock
|
ebeabdcc72
|
rich media: helpers: clean up unused aliases
|
2019-01-28 06:10:25 +00:00 |
|
William Pitcock
|
91ef64a1ec
|
activitypub: prime OGP crawler cache when new messages are inserted into the database
|
2019-01-28 06:07:18 +00:00 |
|
William Pitcock
|
8e42251e06
|
rich media: add helpers module, use instead of MastodonAPI module
|
2019-01-28 06:04:54 +00:00 |
|
William Pitcock
|
24a103a1fe
|
mastodon api: formatting
|
2019-01-28 05:53:17 +00:00 |
|
William Pitcock
|
6096846f5f
|
API: kill /api/rich_media/parse endpoint
|
2019-01-28 05:53:17 +00:00 |
|
William Pitcock
|
020b3b29d9
|
test: update twitterapi tests
|
2019-01-28 05:53:17 +00:00 |
|
William Pitcock
|
07a9a891ad
|
twitter api: fix up activity representer
|
2019-01-28 05:53:17 +00:00 |
|
William Pitcock
|
364cf5369b
|
test: update mastodon status view tests
|
2019-01-28 05:53:17 +00:00 |
|
William Pitcock
|
de42646634
|
rich media: add try/rescue to ensure we catch parsing and fetching failures
|
2019-01-28 05:53:17 +00:00 |
|
William Pitcock
|
5d895093fd
|
twitter api: embed card in twitterapi posts
|
2019-01-28 05:53:17 +00:00 |
|
William Pitcock
|
5a37ddc2dc
|
mastodon api: embed card in status object
|
2019-01-28 05:53:17 +00:00 |
|
William Pitcock
|
132d815f1f
|
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
|
2019-01-28 05:53:17 +00:00 |
|
rinpatch
|
6db792124b
|
Merge branch 'notice-404-to-fe' into 'develop'
/notice/:id - send the FE index even if 404
See merge request pleroma/pleroma!725
|
2019-01-27 22:01:20 +00:00 |
|
href
|
71bb90073b
|
/notice/:id - send the FE index even if 404
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
|
2019-01-27 22:51:50 +01:00 |
|
lambda
|
16ab1437d6
|
Merge branch 'safe-render-activities' into 'develop'
Views: wrap activity rendering in a rescue
See merge request pleroma/pleroma!723
|
2019-01-27 20:10:09 +00:00 |
|