Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,185 Commits 1 Branch 0 Tags 222 MiB
9423052e92
Commit Graph

14185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csaurus
c60a5405db Detect and try to stream incoming "direct" messages 2018-05-12 17:40:59 -04:00
Francis Dinh
aee49724f5 Merge branch 'feature/unrepeat-tests' into feature/unrepeats 2018-05-12 11:11:13 -04:00
Francis Dinh
694e376954 Update test fixture 2018-05-12 11:10:49 -04:00
Francis Dinh
4d88747561 Revert "Log error when handling unrepeats" 
This reverts commit c17c55e989.
 2018-05-11 15:34:46 -04:00
Francis Dinh
16b793656d Add tests for unrepeats 2018-05-11 15:30:47 -04:00
Francis Dinh
c17c55e989 Log error when handling unrepeats 2018-05-11 15:29:19 -04:00
Francis Dinh
271fb5ccb1 Probably better way of handling non-follow undos in ostatus 2018-05-11 11:59:53 -04:00
Francis Dinh
4151cbe6b2 Revert "Do not send non-follow undos over ostatus for now" 
This reverts commit 07fdc07238.
 2018-05-11 11:53:28 -04:00
Francis Dinh
0b527b5528 Revert "Use [] instead of nil" 
This reverts commit 42268b0981.
 2018-05-11 11:53:06 -04:00
Pierrick Brun
89603eda9e do not create notification for yourself 2018-05-11 11:31:17 +02:00
lambda
853f183fd3 Merge branch 'patch-1' into 'develop' 
Remove alias directive in service file

See merge request pleroma/pleroma!151
 2018-05-11 07:18:25 +00:00
Francis Dinh
42268b0981 Use [] instead of nil 2018-05-11 01:48:56 -04:00
Francis Dinh
07fdc07238 Do not send non-follow undos over ostatus for now 2018-05-11 01:45:10 -04:00
Normandy
38f5f6f659 Remove alias directive in service file 
Systemd will complain otherwise.
 2018-05-11 05:19:20 +00:00
href
c220a6db43
format & made get_policies/1 private 2018-05-10 18:51:58 +02:00
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
Francis Dinh
900c735467 Match proper number of values from unannounce 2018-05-09 00:04:14 -04:00
Francis Dinh
54f6628590 Change argument order and call correct # of args 2018-05-08 23:59:36 -04:00
Francis Dinh
e55f69a676 Handle Undo activites containing an Announce 2018-05-08 23:50:19 -04:00
Francis Dinh
4d5ec883b7 Federate correct activity 2018-05-08 21:52:21 -04:00
Mark Felder
a85d051675 Don't strip headers from backend for /notice/ either 2018-05-07 23:44:40 +00:00
Mark Felder
4233b1504f Caching notice URLs does not produce pleasant results 2018-05-07 23:43:27 +00: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
Artik Banana
0a1fd8adf0 Added headers for a more secure default. 2018-05-06 14:19:29 +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