sadposter
|
8cec5796ae
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-04-06 14:44:26 +01:00 |
|
|
lain
|
1d4ab06505
|
Merge branch 'featureflag/emoji_reactions' into 'develop'
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
|
2020-04-06 12:51:35 +00:00 |
|
|
lain
|
96ee0aadbf
|
Merge branch 'improving-test-coverage' into 'develop'
Tests for emoji mix task
See merge request pleroma/pleroma!2350
|
2020-04-06 12:49:17 +00:00 |
|
|
lain
|
349b9d86dc
|
Merge branch 'remake-remodel-2' into 'develop'
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
|
2020-04-06 11:59:01 +00:00 |
|
|
lain
|
772bc258cd
|
ObjectID Validator: Refactor.
|
2020-04-06 13:53:24 +02:00 |
|
|
lain
|
e67cde0ed6
|
Transmogrifier: Refactoring / Renaming.
|
2020-04-06 13:46:34 +02:00 |
|
|
Alexander Strizhakov
|
a43e055916
|
using another fn for file deletion
|
2020-04-06 14:27:20 +03:00 |
|
|
Alexander Strizhakov
|
b59ac37b2c
|
tests for emoji mix task
|
2020-04-06 11:13:59 +03:00 |
|
|
feld
|
8444e7ee96
|
Merge branch 'fix/docs-markdown' into 'develop'
Fix formatting in documentation
See merge request pleroma/pleroma!2348
|
2020-04-02 19:36:55 +00:00 |
|
|
Egor Kislitsyn
|
8a0ffaa9ea
|
Fix formatting in documentation
|
2020-04-02 23:10:13 +04:00 |
|
|
feld
|
7879369e4d
|
Merge branch '2323-accounts-relationships-hotfix' into 'develop'
[#2323] Fixed /accounts/relationships
Closes pleroma-fe#820
See merge request pleroma/pleroma!2347
|
2020-04-02 16:48:47 +00:00 |
|
|
Ivan Tashkinov
|
aa78325117
|
[#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
|
2020-04-02 19:23:30 +03:00 |
|
|
feld
|
fd932b14a7
|
Merge branch 'update/adminfe-20200331' into 'develop'
Update AdminFE build in preparation for Pleroma 2.0.2
See merge request pleroma/pleroma!2343
|
2020-04-01 17:12:59 +00:00 |
|
|
feld
|
ef7d2b0f11
|
Merge branch 'gun' into 'develop'
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
|
2020-04-01 17:05:09 +00:00 |
|
|
lain
|
037b49c415
|
Validators: Correct ObjectID filename
|
2020-04-01 16:10:17 +02:00 |
|
|
rinpatch
|
bfec45bf74
|
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
Restrict remote users from indexing
Closes #1601
See merge request pleroma/pleroma!2341
|
2020-04-01 12:55:52 +00:00 |
|
|
Alexander Strizhakov
|
94ddbe4098
|
restrict remote users from indexing
|
2020-04-01 09:57:12 +03:00 |
|
|
Haelwenn
|
c9f51edea1
|
Merge branch 'ops/fix-ci' into 'develop'
Ops/fix ci
See merge request pleroma/pleroma!2340
|
2020-04-01 03:44:47 +00:00 |
|
|
jp
|
bcaaba4660
|
remove testing only: in docker build
|
2020-03-31 22:16:36 -04:00 |
|
|
jp
|
c2715ed772
|
add imagemagick and update inherited container to alpine:3.11
|
2020-03-31 21:31:23 -04:00 |
|
|
feld
|
ec5d6eef6a
|
Merge branch 'fix/docker-mogrify' into 'develop'
Remove problematic --cache-from argument
See merge request pleroma/pleroma!2338
|
2020-03-31 22:32:48 +00:00 |
|
|
Mark Felder
|
d3cd3b96bf
|
Remove problematic --cache-from argument
|
2020-03-31 17:28:41 -05:00 |
|
|
Haelwenn
|
7d3b25f0e1
|
Merge branch 'bugfix/funkwhale-channel' into 'develop'
Fix profile url for funkwhale channels, removes one source_data use
Closes #1653
See merge request pleroma/pleroma!2333
|
2020-03-31 22:04:02 +00:00 |
|
|
Haelwenn (lanodan) Monnier
|
185520d1b4
|
Provide known-good user.uri, remove User.profile_url/1
|
2020-03-31 23:55:29 +02:00 |
|
|
Haelwenn (lanodan) Monnier
|
b30fb1f3bb
|
User: Fix use of source_data in profile_url/1
|
2020-03-31 23:54:20 +02:00 |
|
|
Haelwenn (lanodan) Monnier
|
2553400a66
|
Initial failing test statement against funkwhale channels
|
2020-03-31 23:54:20 +02:00 |
|
|
feld
|
fa38089f16
|
Merge branch 'fix/docker-mogrify' into 'develop'
Fix/docker mogrify
Closes #1644
See merge request pleroma/pleroma!2337
|
2020-03-31 19:36:04 +00:00 |
|
|
Mark Felder
|
f6dc33615b
|
Add imagemagick to Docker image to fix broken mogrify plugin
|
2020-03-31 14:29:43 -05:00 |
|
|
Mark Felder
|
219d3aaa2d
|
Update AdminFE build in preparation for Pleroma 2.0.2
|
2020-03-31 13:05:16 -05:00 |
|
|
lain
|
c982093cc2
|
Transmogrifier: Fix BAD code by RINPATCH
|
2020-03-31 19:33:41 +02:00 |
|
|
lain
|
1b323ce1c6
|
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
|
2020-03-31 17:28:18 +00:00 |
|
|
lain
|
ecac57732a
|
Transmogrifier: Only add context if it really is onne.
|
2020-03-31 19:16:45 +02:00 |
|
|
lain
|
51fc504705
|
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
|
2020-03-31 19:06:08 +02:00 |
|
|
lain
|
288f2b5a7c
|
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
|
2020-03-31 17:00:55 +00:00 |
|
|
lain
|
0be1fa0a86
|
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
|
2020-03-31 17:00:48 +00:00 |
|
|
lain
|
057438a657
|
CommonAPI: DRY up a bit.
|
2020-03-31 17:56:05 +02:00 |
|
|
lain
|
aebec1bac9
|
Validator Test: Small refactor.
|
2020-03-31 17:47:34 +02:00 |
|
|
Alexander Strizhakov
|
7af0959a07
|
updating docs
|
2020-03-31 18:30:19 +03:00 |
|
|
Alexander Strizhakov
|
df5f89c0d6
|
test for default features and changelog entry
|
2020-03-31 18:22:25 +03:00 |
|
|
lain
|
643f15e77b
|
Validators: ObjectID is an http uri.
|
2020-03-31 16:11:38 +02:00 |
|
|
lain
|
f6835333be
|
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
|
2020-03-31 12:55:25 +00:00 |
|
|
lain
|
8bd5ad8664
|
Merge branch 'benchmark-improvements' into 'develop'
Benchmark improvements
See merge request pleroma/pleroma!2308
|
2020-03-30 14:48:00 +00:00 |
|
|
rinpatch
|
dabe3aeb9e
|
Merge branch 'removing-grouped-reports' into 'develop'
Removing grouped reports endpoint
See merge request pleroma/pleroma!2335
|
2020-03-30 12:38:21 +00:00 |
|
|
Alexander Strizhakov
|
b607ae1a1c
|
removing grouped reports admin api endpoint
|
2020-03-30 13:51:45 +03:00 |
|
|
Alexander Strizhakov
|
1fcdcb12a7
|
updating gun with bug fix
https://github.com/ninenines/gun/issues/222
|
2020-03-30 12:47:12 +03:00 |
|
|
Alexander Strizhakov
|
2afc7a9112
|
changelog fix
|
2020-03-30 12:16:45 +03:00 |
|
|
Alexander Strizhakov
|
f497cf2f7c
|
Merge branch 'develop' into gun
|
2020-03-30 12:15:23 +03:00 |
|
|
Alexander Strizhakov
|
96e2796557
|
use in timelines benchmark new user generator
|
2020-03-30 11:59:14 +03:00 |
|
|
Alexander Strizhakov
|
56503c385e
|
fix
|
2020-03-30 11:42:25 +03:00 |
|
|
Alexander Strizhakov
|
1f29ecdcd7
|
sync with develop
|
2020-03-30 11:42:25 +03:00 |
|