href
7d328c658d
Small wrapper module around Application.get_env/put_env
...
Same API as the old Pleroma.Config
2018-11-06 16:00:48 +01:00
lain
4f640c43ed
Unify Mastodon Login with OAuth login.
...
This removes duplication in the login code.
2018-11-06 15:19:11 +01:00
href
36ca3c1b3e
format
2018-11-06 15:17:29 +01:00
href
2bc924ba45
Get rid of Pleroma.Config in favor of Application
...
Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232
2018-11-06 15:12:53 +01:00
href
013f7ba8c1
Add federating plug & public tests
2018-11-06 14:45:04 +01:00
kaniini
0f6c4635a6
Merge branch 'use-the-same-example-domain-and-use-it-as-variable' into 'develop'
...
Use the same example domain and use it as variable
See merge request pleroma/pleroma!423
2018-11-06 07:37:04 +00:00
kaniini
0f75ed33f9
Merge branch 'runtime-emojis-fix-finmoji-return' into 'develop'
...
Runtime emojis: Fix wrong return when finmoji is disabled
See merge request pleroma/pleroma!427
2018-11-06 07:33:27 +00:00
href
83911b1443
Fix wrong return when finmoji is disabled
2018-11-05 21:17:47 +01:00
lambda
03702e4c4a
Merge branch 'runtime-emojis' into 'develop'
...
Runtime configured emojis
See merge request pleroma/pleroma!425
2018-11-05 18:40:38 +00:00
href
fd0e7d18d9
handle_continue is OTP21+
2018-11-05 18:04:43 +01:00
href
6fe23c5458
Runtime configured router
2018-11-05 15:19:03 +01:00
href
d096bc17bf
revert endpoint position in supervision tree
2018-11-05 14:05:04 +01:00
href
763fc7b44f
Runtime configured emojis
...
The changes are a bit heavy since the emojis were loaded into module
attributes from filesystem.
This introduces a GenServer using an ETS table to cache in memory the
emojis, and allows a runtime-reload with `Pleroma.Emoji.reload()`.
2018-11-05 13:24:00 +01:00
Hakaba Hitoyo
3ea4f9ac8d
Remove Access-Control-Allow-Origin
2018-11-05 04:18:43 +00:00
shibayashi
800d233631
Use example.tld so a single search and replace works
2018-11-04 14:06:18 +01:00
kaniini
bd97b3614f
Merge branch 'tests-for-emtpy-content' into 'develop'
...
Test for null-content activities.
See merge request pleroma/pleroma!422
2018-11-04 03:09:16 +00:00
shibayashi
941f9a888c
Update instructions
2018-11-03 23:59:52 +01:00
shibayashi
732d3fce73
Use the same example domain in all config examples
2018-11-03 23:44:26 +01:00
shibayashi
56c49513e0
Use the server name as variable
2018-11-03 23:41:37 +01:00
lain
2fedd93931
Fix formatting.
2018-11-03 16:40:57 +01:00
kaniini
007f1c73b1
Merge branch 'feature/cors-again' into 'develop'
...
Add CORSPlug to make web-based OAuth easier.
See merge request pleroma/pleroma!420
2018-11-03 15:36:23 +00:00
lain
81af7fd02d
Test for null-content activities.
2018-11-03 16:28:29 +01:00
Haelwenn
50f974b83b
Merge branch 'bugfix/harden_status_output' into 'develop'
...
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
See merge request pleroma/pleroma!421
2018-11-03 13:54:25 +00:00
Haelwenn (lanodan) Monnier
3e50bb667f
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
2018-11-03 14:42:47 +01:00
lambda
cf6ed32c68
Merge branch 'hashtag-search-case-sensitivity-test' into 'develop'
...
Test for case-insensitive mastodon hashtag timelines.
See merge request pleroma/pleroma!419
2018-11-03 12:40:42 +00:00
lain
e954cfcc2c
Add CORSPlug to make web-based OAuth easier.
2018-11-03 13:38:01 +01:00
lain
7dfe611620
Test for case-insensitive mastodon hashtag timelines.
2018-11-03 11:41:40 +01:00
lambda
4bcdbb12a4
Merge branch 'fix_hashtag_search' into 'develop'
...
Fix hashtag search
See merge request pleroma/pleroma!418
2018-11-02 20:05:56 +00:00
Mark Felder
0cca7edbe0
Fix hashtag search
...
When we lowercase the search it will succesfully do a case insenstive
match. Now #Linux will match #linux and #LINUX whereas previously it
would only match the exact case.
2018-11-02 19:38:57 +00:00
lambda
f028647ac0
Merge branch 'bugfix/dont-break-on-empty-in-reply-to' into 'develop'
...
Check for empty string in_reply_to ids.
Closes #355
See merge request pleroma/pleroma!417
2018-11-02 18:55:16 +00:00
lain
45ebc8dd9a
Check for empty string in_reply_to ids.
2018-11-02 17:33:51 +01:00
Haelwenn
f114f84324
Merge branch 'hotfix/prismo-twitterapi' into 'develop'
...
Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo
Closes #353
See merge request pleroma/pleroma!415
2018-11-01 14:14:05 +00:00
Haelwenn (lanodan) Monnier
3c7d4ff271
Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo
2018-11-01 15:07:27 +01:00
kaniini
4fab4e9ba4
Merge branch 'feature/as2-page-support' into 'develop'
...
AS2 page support (prismo)
See merge request pleroma/pleroma!413
2018-11-01 10:48:09 +00:00
Haelwenn (lanodan) Monnier
c5f26f3ce2
Test that prismo url-map transforms into a string
2018-11-01 11:30:50 +01:00
William Pitcock
24ba08de13
twitter api: add support for rendering Page objects
2018-11-01 10:01:35 +00:00
William Pitcock
4d8f076125
mastodon api: add support for rendering Page objects
2018-11-01 10:00:16 +00:00
William Pitcock
9f03b5c4f7
activitypub: transmogrifier: add support for Page objects
2018-11-01 09:59:43 +00:00
kaniini
f20f575e29
Merge branch 'bugfix/filter-id' into 'develop'
...
Ensure filters have a filter_id
See merge request pleroma/pleroma!412
2018-11-01 09:31:31 +00:00
Lee Starnes
585b29337c
Ensure filters have a filter_id
2018-11-01 09:17:02 +00:00
kaniini
eba9a62024
Merge branch 'feature/relay-tests' into 'develop'
...
relay tests
See merge request pleroma/pleroma!411
2018-11-01 09:10:51 +00:00
Haelwenn
40676d7683
Merge branch 'bugfix/prismo.news_article_url' into 'develop'
...
Bugfix/prismo.news article url
Closes #352
See merge request pleroma/pleroma!410
2018-11-01 09:05:16 +00:00
lain
1e9ced5af4
Test Relay, switch to runtime configuration.
2018-11-01 09:01:43 +00:00
lain
e6ec01afb6
Start configuration manager.
2018-11-01 09:01:24 +00:00
lain
9b77030d3c
Add basic configuration management module.
2018-11-01 09:01:03 +00:00
Haelwenn (lanodan) Monnier
b2da5262ea
Pleroma.Web.ActivityPub.Transmogrifier: fix_url when not a string/empty
...
Thanks prismo.news, I hate it
2018-11-01 09:56:37 +01:00
Haelwenn (lanodan) Monnier
755f166406
Pleroma.Web.MastodonAPI.StatusView: Do not fail when URL isn’t a string
2018-11-01 09:55:38 +01:00
kaniini
27a06bd440
Merge branch 'refactor/object-cache-deletion' into 'develop'
...
object cache deletion refactoring, part 2
See merge request pleroma/pleroma!409
2018-11-01 08:51:49 +00:00
William Pitcock
2b3a40d038
object: split object_cache from user_cache
2018-11-01 08:41:46 +00:00
William Pitcock
2c092ed355
test: fixup test breakage caused by User.delete() harmonization
2018-11-01 08:23:49 +00:00
