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

9054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Egor Kislitsyn
4a2538967c
Support pagination in conversations 2020-03-24 20:18:27 +04:00
Egor Kislitsyn
d1a9716a98
Fix activity deletion 2020-03-24 17:38:18 +04:00
rinpatch
fbf02a3722 Merge branch 'bugfix/profile-bio-newline' into 'develop' 
AccountView: fix for other forms of <br> in bio

Closes #1643

See merge request pleroma/pleroma!2322
 2020-03-23 19:32:01 +00:00
lain
3bd2829e5c Benchmarks: Add timeline benchmark 2020-03-23 18:56:01 +01:00
lain
eec1fcaf55 Home timeline tests: Add failing test for relationships 2020-03-23 15:58:55 +01:00
Ivan Tashkinov
86f2fbc81e Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering 2020-03-23 14:34:58 +03:00
rinpatch
d931a59072 Merge branch 'support-emoji-staticfe' into 'develop' 
Add emoji support in statuses in staticfe

Closes #1453

See merge request pleroma/pleroma!2324
 2020-03-23 10:43:20 +00:00
Egor Kislitsyn
5a34dca8ed
Add emoji support in statuses in staticfe 2020-03-23 14:03:31 +04:00
Ivan Tashkinov
3c78e5f327 Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring. 2020-03-23 12:01:11 +03:00
Ivan Tashkinov
c2e415143b WIP: preloading of user relations for timeline/statuses rendering (performance improvement). 2020-03-22 21:51:44 +03:00
Haelwenn (lanodan) Monnier
15be6ba9c2
AccountView: fix for other forms of <br> in bio 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
 2020-03-22 16:41:01 +01:00
rinpatch
7dbf1ffa86 Merge branch 'fix/ecto_ssl_option' into 'develop' 
Fix ssl option on Ecto config breaking release

See merge request pleroma/pleroma!2307
 2020-03-22 14:32:40 +00:00
Haelwenn
4633793bc1 Merge branch 'relationship-remove-outdated-hack' into 'develop' 
Mastodon API Account view: Remove an outdated hack

See merge request pleroma/pleroma!2321
 2020-03-22 14:25:11 +00:00
rinpatch
981e015f1b Mastodon API Account view: Remove an outdated hack 
The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary.
 2020-03-22 17:10:37 +03:00
Alexander Strizhakov
7f9b5284fa
updating clear_config 2020-03-20 20:58:47 +03:00
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun 2020-03-20 20:47:54 +03:00
lain
d74405fc1a Merge branch 'fix-feed-pagination' into 'develop' 
Fix for feed page pagination

Closes #1605

See merge request pleroma/pleroma!2281
 2020-03-20 16:57:51 +00:00
lain
d23e81903d Merge branch 'clear-config-test-improvements' into 'develop' 
Improved in-test config management

See merge request pleroma/pleroma!2312
 2020-03-20 16:54:55 +00:00
Ivan Tashkinov
1c05f539aa Improved in-test clear_config/n applicability (setup / setup_all / in-test usage). 2020-03-20 18:33:00 +03:00
Ivan Tashkinov
0e27c274f4 Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements 
# Conflicts:
#	test/web/mastodon_api/controllers/account_controller_test.exs
 2020-03-20 18:08:23 +03:00
lain
5efa5b0c4a Merge branch 'feature/1206-restrict-unauthenticated' into 'develop' 
restrict_unauthenticated setting

Closes #1206

See merge request pleroma/pleroma!2318
 2020-03-20 14:40:08 +00:00
lain
6c1232b486 NotificationController: Fix test. 2020-03-20 15:00:28 +01:00
lain
1aa8aa7d7f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 2020-03-20 14:52:58 +01:00
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting 2020-03-20 16:36:20 +03:00
lain
d63dca8d99 Merge branch 'feature/1635-notifications-include-types' into 'develop' 
include_types parameter in /api/v1/notifications

Closes #1635

See merge request pleroma/pleroma!2311
 2020-03-20 13:27:29 +00:00
Alexander Strizhakov
98a60df41f
include_types parameter in /api/v1/notifications 2020-03-20 13:18:12 +03:00
Haelwenn (lanodan) Monnier
a8aa917530
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity 2020-03-19 19:25:50 +01:00
lain
952cb589f4 Merge branch 'fix-testing' into 'develop' 
Fix CI by temporarily removing federated testing

See merge request pleroma/pleroma!2314
 2020-03-19 18:10:39 +00:00
Haelwenn (lanodan) Monnier
c1fd4f6653
transmogrifier.ex: rework fix_attachment for better IR 2020-03-19 19:10:03 +01:00
lain
9b9d67bbec Fix linting. 2020-03-19 18:16:12 +01:00
lain
3c2c32b460 Merge branch 'remake-remodel' into develop 2020-03-19 18:00:55 +01:00
stwf
a8c6933ca0 remove federated testing 2020-03-19 12:27:09 -04:00
Mark Felder
7d275970ab Add emoji reactions to features in nodeinfo 2020-03-19 10:08:11 -05:00
Haelwenn (lanodan) Monnier
f9d622d25a
WIP 2020-03-19 15:39:11 +01:00
Ivan Tashkinov
ec3719f539 Improved in-test config management functions. 2020-03-18 20:30:31 +03:00
Alexander Strizhakov
51ce0813d3
Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into gun 2020-03-18 14:08:40 +03:00
Alexander Strizhakov
f9ecb513fa
Merge branch 'develop' into gun 2020-03-18 14:08:21 +03:00
rinpatch
69341cbcba Merge branch 'feature/1530-removing-with_move' into 'develop' 
Feature/1530 removing with move

Closes #1530

See merge request pleroma/pleroma!2306
 2020-03-18 10:12:50 +00:00
Haelwenn (lanodan) Monnier
d3cf7e19fb
activity_pub_controller_test.exs: test posting with AP C2S uploaded media 2020-03-17 14:00:19 +01:00
Cevado
4705590f76 Fix ssl option on Ecto config breaking release 
To use `:ssl` option on Ecto config it's required to include Erlang ssl
application, this prevents releases to start when `:ssl` option is set
to true.
 2020-03-16 22:02:01 -03:00
Mark Felder
b17d8d305f Enable Gun adapter by default 
We need devs to dogfood this before we merge it into the 2.1 release
 2020-03-16 15:39:34 -05:00
Ivan Tashkinov
7438833685 [#1364] Improved notification-related tests. 2020-03-16 21:58:10 +03:00
eugenijm
13cce9c0de Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials. 2020-03-16 20:42:37 +03:00
Haelwenn
e4380afc18 Merge branch 'docs/mrf_object_age' into 'develop' 
Improve documentation of mrf_object_age

See merge request pleroma/pleroma!2305
 2020-03-16 17:42:10 +00:00
eugenijm
d198e7fa2a Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password 2020-03-16 20:32:07 +03:00
Alexander Strizhakov
f3791add99
removing with_move parameter 2020-03-16 20:07:45 +03:00
Mark Felder
8dd01b24d2 Improve documentation of mrf_object_age 2020-03-16 11:44:53 -05:00
Ivan Tashkinov
0e07c5ef57 Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control 2020-03-16 17:58:42 +03:00
rinpatch
b80958d4e3 Merge branch 'feat/templates' into 'develop' 
gitlab: create templates for bug reports and release MRs

See merge request pleroma/pleroma!2304
 2020-03-16 14:32:23 +00:00
rinpatch
7829de6da4 gitlab: create templates for bug reports and release MRs 2020-03-16 17:30:50 +03:00