squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,602 Commits 154 Branches 42 Tags 503 MiB
fb9730010e
Commit Graph

3602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kaniini
fb9730010e Merge branch 'fix/rich-media-disable-in-config' into 'develop' 
Make rich media support toggleable

See merge request pleroma/pleroma!748
 2019-01-31 16:22:26 +00:00
rinpatch
7057891db6 Make rich media support toggleable 2019-01-31 18:18:20 +03:00
lambda
bd89cdbe31 Merge branch 'revert-4d3655c4' into 'develop' 
Revert "Merge branch 'spc-fix-3' into 'develop'"

See merge request pleroma/pleroma!745
 2019-01-31 12:16:44 +00:00
lambda
a43a1c6d4e Revert "Merge branch 'spc-fix-3' into 'develop'" 
This reverts merge request !682
 2019-01-31 12:16:23 +00:00
kaniini
4d3655c479 Merge branch 'spc-fix-3' into 'develop' 
Spc fix 3

See merge request pleroma/pleroma!682
 2019-01-31 11:29:29 +00:00
Haelwenn
00d4333373 Merge branch 'features/glitch-soc-frontend' into 'develop' 
Features/glitch soc frontend

See merge request pleroma/pleroma!192
 2019-01-31 10:16:11 +00:00
Haelwenn
5f40f4f74d Merge branch 'update-mastofe/glitch-soc-2019-01-28' into 'develop' 
[MastodonFE] Update Frontend (glitch)

See merge request pleroma/pleroma!730
 2019-01-31 10:12:48 +00:00
Haelwenn (lanodan) Monnier
de0c1c641a
[MastodonFE] Update Frontend (glitch) 2019-01-31 10:35:44 +01:00
kaniini
95d6118090 Merge branch 'add-wiki-reference-to-readme' into 'develop' 
Add wiki reference to readme

See merge request pleroma/pleroma!744
 2019-01-30 21:38:15 +00:00
shibayashi
242748cc54
Reformat to make markdownlint happy and other little typographic things 2019-01-30 22:26:10 +01:00
shibayashi
388475c478
Add reference to Pleroma Wiki in the Readme 2019-01-30 22:15:52 +01:00
lambda
6b54a3ec0b Merge branch 'multiple-hackney-pools' into 'develop' 
Fix 4aff4efa typos

See merge request pleroma/pleroma!743
 2019-01-30 20:18:05 +00:00
lambda
45d22269e7 Merge branch '2019-1-30-update-frontend' into 'develop' 
update frontend

See merge request pleroma/pleroma!742
 2019-01-30 20:17:22 +00:00
href
5ea0397e2d
Fix 4aff4efa typos 2019-01-30 21:08:41 +01:00
lain
88a40308d3 update frontend 2019-01-30 21:04:58 +01:00
kaniini
bd5086731e Merge branch 'multiple-hackney-pools' into 'develop' 
Use multiple hackney pools

See merge request pleroma/pleroma!739
 2019-01-30 19:01:57 +00:00
kaniini
6fe01a3234 Merge branch 'better-following' into 'develop' 
Use race condition free queries for following / unfollowing

See merge request pleroma/pleroma!740
 2019-01-30 18:50:00 +00:00
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
href
4aff4efa8d
Use multiple hackney pools 
* federation (ap, salmon)
* media (rich media, media proxy)
* upload (uploader proxy)

Each "part" will stop fighting others ones -- a huge federation outbound
could before make the media proxy fail to checkout a connection in time.

splitted media and uploaded media for the good reason than an upload
pool will have all connections to the same host (the uploader upstream).
it also has a longer default retention period for connections.
 2019-01-30 15:06:46 +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