Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,558 Commits 1 Branch 0 Tags 222 MiB
24c8c13640
Commit Graph

9558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
kPherox
7408f003a6
Use Pleroma.Formatter.linkify instead of AutoLinker.link 2020-04-01 02:52:30 +09:00
kPherox
dbf9d719f9
split test for update profile fields 2020-04-01 02:52:30 +09: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
kPherox
d191b0942f
Remove no longer used function 2020-03-31 22:50:18 +09:00
lain
f6835333be Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex 2020-03-31 12:55:25 +00:00
Ivan Tashkinov
ea9c57b26e [#2332] Misc. improvements per code change requests. 2020-03-31 09:21:42 +03:00
Ivan Tashkinov
9c94b6a327 [#2332] Misc. fixes per code change requests. 2020-03-30 19:08:37 +03: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
Alexander Strizhakov
eb9744cade
activities generation tasks 2020-03-30 11:42:25 +03:00
Haelwenn
e999c67cee Merge branch 'feature/funkwhale-audio' into 'develop' 
Add support for funkwhale Audio activity

Closes #764 and #1624

See merge request pleroma/pleroma!2287
 2020-03-29 19:18:22 +00:00
Maksim Pechnikov
dfd2c74184 Merge branch 'develop' into issue/1276 2020-03-29 06:57:34 +03:00
Ivan Tashkinov
be9d18461a FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.). 2020-03-28 18:49:03 +03:00
lain
4e81b4b190 Merge branch 'relations-preloading-for-statuses-rendering' into 'develop' 
Performance improvements (timeline / statuses / notifications / accounts rendering)

See merge request pleroma/pleroma!2323
 2020-03-27 19:14:46 +00:00
Ivan Tashkinov
dfbc05d496 Misc refactoring / tweaks (ThreadMute.exists?/2). 2020-03-27 08:01:03 +03:00
Ivan Tashkinov
6b793d3f83 Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering). 2020-03-26 21:54:01 +03:00
lain
29ab1d9f8d Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 2020-03-26 17:24:10 +01:00
lain
69fc1dd69f Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex 2020-03-26 14:45:28 +00:00
lain
0c60c0a76a Validators: Use correct type for IDs. 2020-03-26 15:44:14 +01:00
lain
0adaab8e75 Bump copyright dates. 2020-03-26 15:37:42 +01:00
lain
eaacc64839 Refactors. 2020-03-26 15:33:10 +01:00
lain
ee979dd6d7 Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 2020-03-26 15:24:06 +01:00
lain
d7aa0b645b Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex 2020-03-26 14:23:19 +00:00
lain
4cf1007a7d ActivityPub: Small refactor. 2020-03-26 15:16:54 +01:00
Ivan Tashkinov
112101ca52 Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering 
# Conflicts:
#	lib/pleroma/thread_mute.ex
 2020-03-26 09:43:58 +03:00