href
e9e6f37bda
Chain policies
...
- The `:pleroma, :instance, :rewrite_policy` can now be either a policy
or a list of policies
- Made a behaviour for MRF policies
2018-05-10 18:41:06 +02:00
lain
ffe028cd73
More warning fixes.
2018-05-07 18:11:37 +02:00
lambda
a9baf955fa
Merge branch 'feld-varnish' into 'develop'
...
Caching /objects/ URLs breaks them in Mastoweb as they don't redirect to the /notice/
See merge request pleroma/pleroma!110
2018-05-06 18:43:57 +00:00
lambda
6c2903d9a1
Merge branch 'feld-warnings' into 'develop'
...
Clean up warnings
See merge request pleroma/pleroma!144
2018-05-06 18:42:31 +00:00
lambda
2b708f76e0
Merge branch 'fix/unsafe-variables' into 'develop'
...
Get rid of unsafe variables.
See merge request pleroma/pleroma!145
2018-05-06 18:41:46 +00:00
eal
bfad57c7c9
Get rid of unsafe variables.
2018-05-06 09:58:59 +03:00
lain
1e83727fdd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-05-05 13:41:27 +02:00
lain
9810153aeb
Streamer: Don't send out stream events for blocked users.
2018-05-05 13:40:47 +02:00
lain
96add86b50
Unify wss uri generation.
2018-05-05 13:40:31 +02:00
lambda
c8ba7501b7
Merge branch 'feld-test.secret' into 'develop'
...
Make it possible to use custom database connection parameters
See merge request pleroma/pleroma!143
2018-05-05 09:58:17 +00:00
lain
c464355d1a
Idempotency: Use special cache, keep for 6 hours.
2018-05-05 11:15:57 +02:00
Mark Felder
7a884d70d8
Group def renders here as well
2018-05-04 22:31:46 +00:00
Mark Felder
31ea9cbcd8
Group def renders together to fix warning
2018-05-04 22:28:13 +00:00
Mark Felder
955bd643ff
Merge branch 'feld-test.secret' into feld-warnings
2018-05-04 22:05:19 +00:00
Mark Felder
737c42920a
Speling
2018-05-04 22:05:01 +00:00
Mark Felder
14c0c6d16b
Fix formatting
2018-05-04 22:03:14 +00:00
Mark Felder
2a402fb395
Group response declarations together
2018-05-04 21:59:21 +00:00
Mark Felder
a24eed0f57
That last change was stupid. Multiline comments in Elixir don't really exist.
...
Instead we'll just pad with # intstead of playing stupid games with the compiler.
2018-05-04 21:53:52 +00:00
Mark Felder
79d41aa12e
Dirty hack to remove the warning
...
warning: code block contains unused literal "internal -> Mastodon\n" (remove the literal or assign it to _ to avoid warnings)
lib/pleroma/web/activity_pub/transmogrifier.ex
2018-05-04 21:48:30 +00:00
Mark Felder
aaacebd906
Fix unused variables, imports, and aliases
2018-05-04 21:42:20 +00:00
Mark Felder
42f1a098aa
Fix build. Too eager with the fixing of unused variables.
...
== Compilation error in file lib/pleroma/web/activity_pub/views/user_view.ex ==
** (CompileError) lib/pleroma/web/activity_pub/views/user_view.ex:54: undefined function _total/0
(stdlib) lists.erl:1338: :lists.foreach/2
(stdlib) erl_eval.erl:670: :erl_eval.do_apply/6
2018-05-04 21:26:33 +00:00
Mark Felder
636f0fa402
Clean up unused aliases and imports
2018-05-04 21:25:31 +00:00
lain
762f6edc29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-05-04 23:16:16 +02:00
Mark Felder
943820ae29
More unused variables
2018-05-04 21:16:02 +00:00
lain
12f0ad1392
update frontend
2018-05-04 23:15:33 +02:00
Mark Felder
5855ffd322
Merge branch 'feld-test.secret' into feld-warnings
2018-05-04 21:02:14 +00:00
Mark Felder
d30907e573
Make it possible to use custom database connection parameters
2018-05-04 21:00:18 +00:00
Mark Felder
ab4aa5720a
Fix a bunch of unused variable warnings
2018-05-04 20:59:01 +00:00
lambda
11a1241d41
Merge branch 'feature/nodeinfo' into 'develop'
...
Implements the nodeinfo endpoints
See merge request pleroma/pleroma!140
2018-05-04 19:17:19 +00:00
lain
90c4bed0af
Don't expire idempotency cache for five minutes.
2018-05-04 21:15:39 +02:00
lain
fcd3eca167
MastodonAPI: Support idempotency key.
2018-05-04 20:30:29 +02:00
Dashie
c3f9e24c70
Use a variable for stats to avoid double call
2018-05-03 15:31:39 +02:00
Dashie
724f096ac7
Add metadata.nodeName
2018-05-03 10:52:20 +02:00
Dashie
804497542d
Return the right content-type for the schema call
2018-05-03 10:50:02 +02:00
Dashie
e448734952
Explicit error message
2018-05-02 22:45:20 +02:00
Dashie
fd0bf3aa71
Simplify version and fix typo
2018-05-02 22:44:13 +02:00
Dashie
b8789cc8b6
Add localPosts count, also set to 0 if null
2018-05-02 22:36:19 +02:00
Dashie
abeb009acc
Change path of nodeinfo to use .json format
2018-05-02 22:16:19 +02:00
Dashie
65168393d8
Format files
2018-05-02 21:43:12 +02:00
Dashie
67dadd954e
Add first try at nodeinfo
2018-05-02 21:31:42 +02:00
lain
5b6d6d7f2d
update frontend
2018-04-29 16:56:13 +02:00
lain
bc215f5684
Fix format.
2018-04-29 11:28:26 +02:00
lambda
b7584edcea
Merge branch 'patch-bio' into 'develop'
...
replace newlines in profiles with <br>
See merge request pleroma/pleroma!136
2018-04-29 09:26:47 +00:00
lain
4d55d7c95e
Insert object after being rewritten.
2018-04-28 16:10:24 +02:00
lambda
a7a40bb8f1
Merge branch 'fix/blocked-user-boosts' into 'develop'
...
ActivityPub.ex: do not return boosted statuses from blocked users.
See merge request pleroma/pleroma!111
2018-04-28 13:49:12 +00:00
Wim Vanderbauwhede
6908f29e0a
Added a test (written by @andrewzah) for the MR
2018-04-28 12:01:43 +01:00
Wim Vanderbauwhede
634c0c52a1
Merge remote-tracking branch 'upstream/develop' into patch-bio
2018-04-28 11:59:01 +01:00
lambda
39c80a3667
Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'
...
ActivityPub MRF SimplePolicy: fix media stripping
See merge request pleroma/pleroma!133
2018-04-27 05:49:12 +00:00
lain
6eb274f278
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-04-26 07:07:04 +02:00
lain
3bad2b827a
Resurrect instance specific panel.
2018-04-26 07:06:32 +02:00