squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,052 Commits 154 Branches 42 Tags 503 MiB
4711d8151c
Commit Graph

5052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kaniini
7304e0ce18 Merge branch 'docs/archlinux-odbc' into 'develop' 
docs/installation/arch_linux_en.md: Remove useless ODBC

See merge request pleroma/pleroma!1055
 2019-04-14 05:34:17 +00:00
Haelwenn (lanodan) Monnier
48982169dc
docs/installation/arch_linux_en.md: Remove useless ODBC 
See [1] for confirmation.
1: https://git.pleroma.social/pleroma/pleroma/merge_requests/1050#note_24402
 2019-04-13 22:41:54 +02:00
Haelwenn
050339c223 Merge branch 'docs/changelog' into 'develop' 
Add a changelog

See merge request pleroma/pleroma!1053
 2019-04-13 20:29:05 +00:00
rinpatch
3018d81d87 Put an actual description of the vulnerability and add **Breaking:** to breaking changes 2019-04-13 21:17:10 +03:00
Alex S
c5d0fffeaf naming fix 2019-04-13 14:55:42 +07:00
Alex S
c349573791 Merge develop to 788-separate-email-addresses 
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
 2019-04-13 12:24:38 +07:00
Alex S
a64eb2b389 fallback to the old behaviour 
admin and user mailers
 2019-04-13 12:20:36 +07:00
rinpatch
3a805cc35c Add a changelog 2019-04-13 00:31:18 +03:00
Haelwenn
334b2d78dc Merge branch 'improve-formatter' into 'develop' 
Improve formatter and update `auto_linker`

Closes #795

See merge request pleroma/pleroma!1036
 2019-04-12 19:25:53 +00:00
Egor
f9af90c5aa Revert "simplify mentions escape" 
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
 2019-04-12 19:25:53 +00:00
lambda
184ae60b21 Merge branch 'bugfix/pleroma-email-naming' into 'develop' 
Make the filename and module name of Pleroma.Emails.* orthogonal

See merge request pleroma/pleroma!1029
 2019-04-12 10:41:09 +00:00
Egor Kislitsyn
d0304b4f92 more tests 2019-04-12 16:51:28 +07:00
Egor Kislitsyn
dd097a406b add tests 2019-04-12 16:38:32 +07:00
lambda
0a09692c7d Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop' 
Features: mastoapi-2.6.0 `min_id` pagination

Closes #351

See merge request pleroma/pleroma!976
 2019-04-12 09:34:12 +00:00
lambda
57d5ff57d6 Merge branch 'fix/732-password-align' into 'develop' 
password reset page labels align

See merge request pleroma/pleroma!986
 2019-04-12 09:13:30 +00:00
lambda
1b4c4d29a3 Merge branch 'ssl_trusted_cert' into 'develop' 
ssl_trusted_certificate should point to chain.pem if we're demonstrating...

See merge request pleroma/pleroma!996
 2019-04-12 08:58:46 +00:00
Haelwenn (lanodan) Monnier
378b964d8e
installation/download-mastofe-build.sh: Add copyright header 
[ci skip]
 2019-04-12 07:39:49 +02:00
Haelwenn (lanodan) Monnier
b421dd3dd2
installation/download-mastofe-build.sh: Add mastofe CI-artifacts download 
[ci skip]
 2019-04-12 07:32:46 +02:00
kaniini
30a4318ef1 Merge branch 'feature/801-add-support-destroy-multiple-mastofe' into 'develop' 
adding destroy multiple for mastofe

See merge request pleroma/pleroma!1046
 2019-04-12 02:28:46 +00:00
Alexander Strizhakov
711ade961e adding destroy multiple for mastofe 2019-04-12 02:28:46 +00:00
kaniini
9825a94391 Merge branch 'bug/790-repeated-posts-that-are-replies-have-in-reply-to-id-null' into 'develop' 
in_reply_to_id - null

See merge request pleroma/pleroma!1037
 2019-04-12 02:21:32 +00:00
Alexander Strizhakov
e03d24af96 in_reply_to_id - null 2019-04-12 02:21:32 +00:00
kaniini
31c06dba5a Merge branch 'fix/hackney_max_body_param' into 'develop' 
Add `with_body: true` to requests relying on `max_body: val`

Closes #778

See merge request pleroma/pleroma!1049
 2019-04-11 17:54:31 +00:00
Roman Chvanikov
4615e56219 Add with_body: true to requests relying on max_body: val 2019-04-12 00:16:33 +07:00
lain
6f880b1627 Conversation: Fix tests. 2019-04-11 13:31:20 +02:00
lambda
42d2c8d95b Merge branch 'update-mastofe/glitch-soc-2019-04-11' into 'develop' 
Update Mastodon Frontend to 2019-04-11 bundle

See merge request pleroma/pleroma!1044
 2019-04-11 11:24:36 +00:00
lain
36ec8d9694 ActivityPub: Fix specs. 2019-04-11 13:20:46 +02:00
Egor Kislitsyn
46bd5c1d87 fix format 2019-04-11 17:28:12 +07:00
Egor Kislitsyn
db4badc6aa move user disable into deactivation 2019-04-11 17:22:42 +07:00
Egor Kislitsyn
0f2f7d2cec Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-04-11 15:51:52 +07:00
Haelwenn (lanodan) Monnier
51c97d71af
Update Mastodon Frontend to 2019-04-11 bundle 
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-04-11

[ci skip]
 2019-04-11 07:29:03 +02:00
Ivan Tashkinov
c3f12cf3c3 [#923] OAuth consumer params handling refactoring. 
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
 2019-04-10 21:40:38 +03:00
lain
d115d2a27e Conversations: Tidying up. 2019-04-10 18:17:22 +02:00
lain
c352a0aba6 Conversations: Make tests run. 2019-04-10 17:48:31 +02:00
lain
de57094fca Participations: Add sort index. 2019-04-10 17:30:25 +02:00
lain
cf353514fe Participations: Add last activity. 2019-04-10 17:28:02 +02:00
lain
20d9b90760 Participation: Get for a user. 2019-04-10 17:05:33 +02:00
lain
280172f6f6 Conversations: Create or bump on inserting a dm. 2019-04-10 16:33:45 +02:00
lain
64c1c3a407 Participations: Add marking as read and unread. 2019-04-10 15:12:01 +02:00
lain
d1da6b155a Conversation: Add Conversations and Participations. 2019-04-10 15:01:42 +02:00
Alex S
fe511a6c65 Merge branch 'develop' into feature/788-separate-email-addresses 2019-04-10 18:06:54 +07:00
Alex S
fe13a1d78c adding notify_email setting for trigger emails 2019-04-10 17:57:41 +07:00
lambda
e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop' 
Feature/767 multiple use invite token

See merge request pleroma/pleroma!1032
 2019-04-10 10:10:08 +00:00
lambda
6504b43f96 Merge branch 'feature/user-status-subscriptions' into 'develop' 
Add ability to subscribe to users

See merge request pleroma/pleroma!1024
 2019-04-10 10:04:20 +00:00
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions 2019-04-10 10:44:54 +01:00
lain
b5cecebbc1 Conversations: Fix specs. 2019-04-10 09:32:17 +02:00
lambda
c8440b5e0c Merge branch 'fix/emoji-api-nonsense' into 'develop' 
Change response format of /api/pleroma/emoji so it makes sense

See merge request pleroma/pleroma!1038
 2019-04-10 06:22:51 +00:00
Haelwenn (lanodan) Monnier
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ 2019-04-10 06:33:20 +02:00
Haelwenn (lanodan) Monnier
cae0231731
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/ 2019-04-10 06:33:20 +02:00
Haelwenn (lanodan) Monnier
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/ 2019-04-10 06:33:19 +02:00