a43a1c6d4e
Revert "Merge branch 'spc-fix-3' into 'develop'"
...
This reverts merge request !682
6 years ago
4d3655c479
Merge branch 'spc-fix-3' into 'develop'
...
Spc fix 3
See merge request pleroma/pleroma!682
6 years ago
00d4333373
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Features/glitch soc frontend
See merge request pleroma/pleroma!192
6 years ago
5f40f4f74d
Merge branch 'update-mastofe/glitch-soc-2019-01-28' into 'develop'
...
[MastodonFE] Update Frontend (glitch)
See merge request pleroma/pleroma!730
6 years ago
de0c1c641a
[MastodonFE] Update Frontend (glitch)
6 years ago
58e250d9d2
fix merge
6 years ago
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
6 years ago
95d6118090
Merge branch 'add-wiki-reference-to-readme' into 'develop'
...
Add wiki reference to readme
See merge request pleroma/pleroma!744
6 years ago
242748cc54
Reformat to make markdownlint happy and other little typographic things
6 years ago
388475c478
Add reference to Pleroma Wiki in the Readme
6 years ago
6b54a3ec0b
Merge branch 'multiple-hackney-pools' into 'develop'
...
Fix 4aff4efapleroma/pleroma!743
6 years ago
45d22269e7
Merge branch '2019-1-30-update-frontend' into 'develop'
...
update frontend
See merge request pleroma/pleroma!742
6 years ago
5ea0397e2d
Fix 4aff4efa typos
6 years ago
88a40308d3
update frontend
6 years ago
bd5086731e
Merge branch 'multiple-hackney-pools' into 'develop'
...
Use multiple hackney pools
See merge request pleroma/pleroma!739
6 years ago
6fe01a3234
Merge branch 'better-following' into 'develop'
...
Use race condition free queries for following / unfollowing
See merge request pleroma/pleroma!740
6 years ago
c53b96a024
Fix specs.
6 years ago
47ec690c54
Use race-condition free mass follow.
6 years ago
935e65e261
Use race-condition free following method.
6 years ago
ab31adf15b
tiny improve
6 years ago
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.
6 years ago
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
6 years ago
7db517ff06
docs/config.md: Fix syntax, pleroma_fe isn’t an atom
6 years ago
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
6 years ago
aa492af6c2
docs/config.md: Fix typo, provide an example key with camelCase and where to find more
...
[ci skip]
6 years ago
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
6 years ago
3f9d0c08ea
docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to it
...
[ci skip]
6 years ago
7a2c4f984b
Merge branch 'bugfix/fix-rejects' into 'develop'
...
follow request fixups
Closes #537
See merge request pleroma/pleroma!734
6 years ago
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
6 years ago
57549f6043
activitypub: utils: update the state of *any* pending follow relationship that matches the actor and target
6 years ago
cbb2b709de
activitypub: transmogrifier: fix follow request rejections
6 years ago
92753b0cd9
[ #534 ] Made federation push sender be determined basing on content instead of `referer` header. Updated tests.
6 years ago
ebb3496386
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
...
Rich Media support, part 2.
See merge request pleroma/pleroma!719
6 years ago
61d6715714
rich media: oembed: return data in the same format as the other parsers
6 years ago
ddb5545202
rich media: kill some testsuite noise
6 years ago
0f11254a06
rich media: parser: add some basic sanity checks on the returned data with pattern matching
6 years ago
83b7062634
rich media: parser: cache negatives
6 years ago
8fb16e9f0f
rich media: parser: add copyright header
6 years ago
3e968f9ef2
Format
6 years ago
50d6183893
Split hide_network into hide_followers & hide_followings
6 years ago
1724a6b34b
add spec back
6 years ago
56533495b5
fix defaults
6 years ago
b2e9700785
cleanup
6 years ago
55affbca7f
add a job queue
6 years ago
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
6 years ago
b57b56ff3e
App list changes: Separate into two categories, and drop Subway Tooter.
6 years ago
f53d464db0
Put deprecation warnings undre Pleroma.Config.
6 years ago
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
6 years ago
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
6 years ago
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.
6 years ago
lambda