itepechi/akkoma
1
0
Fork 0
Code Issues Pull requests Releases Activity

Commit graph

  • 56956de6fa Merge branch 'fix/status-reblogged' into 'develop' lambda 2019-04-15 10:26:23 +0000
  • f358295cbe Merge branch 'unfollow-oneself' into 'develop' lambda 2019-04-15 10:24:37 +0000
  • f896699357 Merge branch 'refactor/remove-inReplyToStatusId' into 'develop' lambda 2019-04-15 10:23:06 +0000
  • 38926a063a add /api/pleroma/disable_account to docs/api/pleroma_api.md Egor Kislitsyn 2019-04-15 16:39:42 +0700
  • 27d78dc526 Use User.get_cached_by* eugenijm 2019-04-15 12:37:49 +0300
  • fd2e31af86 oops rinpatch 2019-04-15 11:59:01 +0300
  • 5d73dca064 Remove inReplyToStatusId rinpatch 2019-04-15 11:50:36 +0300
  • 507e7821e3 Handle follow/unfollow directed to themselves eugenijm 2019-04-15 09:44:16 +0300
  • c02d52c9f7 Update instance panel Sadposter 2019-04-14 19:01:01 +0100
  • b134bd83ca Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop Sadposter 2019-04-14 19:00:50 +0100
  • 8c6d5a6b4d Merge branch 'bugfix/registration-email-pattern' into 'develop' rinpatch 2019-04-14 17:54:32 +0000
  • dc21181f65 Update updated_at field on notification read Roman Chvanikov 2019-04-14 22:29:05 +0700
  • e513504e88 Revert "Assert on the success of enqueue before returning" Sadposter 2019-04-14 16:12:54 +0100
  • 16d8c8b33b Assert on the success of enqueue before returning Sadposter 2019-04-14 16:05:26 +0100
  • 5e45557751 Always return {atom, _} from try_send_confirmation Sadposter 2019-04-14 16:01:48 +0100
  • ec42b639a3 fix pattern match on user registration Sadposter 2019-04-14 15:46:54 +0100
  • 679a8ef629 Assign reblogged in the Mastodon reblog status view eugenijm 2019-04-14 05:15:03 +0300
  • 0cd4b6024d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email Roman Chvanikov 2019-04-14 14:05:21 +0700
  • 7304e0ce18 Merge branch 'docs/archlinux-odbc' into 'develop' kaniini 2019-04-14 05:34:17 +0000
  • 48982169dc
         docs/installation/arch_linux_en.md: Remove useless ODBC Haelwenn (lanodan) Monnier 2019-04-13 22:41:54 +0200
  • 050339c223 Merge branch 'docs/changelog' into 'develop' Haelwenn 2019-04-13 20:29:05 +0000
  • 3018d81d87 Put an actual description of the vulnerability and add **Breaking:** to breaking changes rinpatch 2019-04-13 21:17:10 +0300
  • 371a4aed2c Add User.Info.email_notifications Roman Chvanikov 2019-04-13 17:40:42 +0700
  • c5d0fffeaf naming fix Alex S 2019-04-13 14:55:42 +0700
  • c349573791 Merge develop to 788-separate-email-addresses Alex S 2019-04-13 12:24:38 +0700
  • a64eb2b389 fallback to the old behaviour Alex S 2019-04-13 12:20:36 +0700
  • 3a805cc35c Add a changelog rinpatch 2019-04-13 00:31:18 +0300
  • 334b2d78dc Merge branch 'improve-formatter' into 'develop' Haelwenn 2019-04-12 19:25:53 +0000
  • f9af90c5aa Revert "simplify mentions escape" Egor 2019-04-12 19:25:53 +0000
  • 184ae60b21 Merge branch 'bugfix/pleroma-email-naming' into 'develop' lambda 2019-04-12 10:41:09 +0000
  • d0304b4f92 more tests Egor Kislitsyn 2019-04-12 16:51:28 +0700
  • dd097a406b add tests Egor Kislitsyn 2019-04-12 16:38:32 +0700
  • 0a09692c7d Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop' lambda 2019-04-12 09:34:12 +0000
  • 57d5ff57d6 Merge branch 'fix/732-password-align' into 'develop' lambda 2019-04-12 09:13:30 +0000
  • 1b4c4d29a3 Merge branch 'ssl_trusted_cert' into 'develop' lambda 2019-04-12 08:58:46 +0000
  • 378b964d8e
         installation/download-mastofe-build.sh: Add copyright header Haelwenn (lanodan) Monnier 2019-04-12 07:39:49 +0200
  • b421dd3dd2
         installation/download-mastofe-build.sh: Add mastofe CI-artifacts download Haelwenn (lanodan) Monnier 2019-04-12 07:32:46 +0200
  • 30a4318ef1 Merge branch 'feature/801-add-support-destroy-multiple-mastofe' into 'develop' kaniini 2019-04-12 02:28:46 +0000
  • 711ade961e adding destroy multiple for mastofe Alexander Strizhakov 2019-04-12 02:28:46 +0000
  • 9825a94391 Merge branch 'bug/790-repeated-posts-that-are-replies-have-in-reply-to-id-null' into 'develop' kaniini 2019-04-12 02:21:32 +0000
  • e03d24af96 in_reply_to_id - null Alexander Strizhakov 2019-04-12 02:21:32 +0000
  • 31c06dba5a Merge branch 'fix/hackney_max_body_param' into 'develop' kaniini 2019-04-11 17:54:31 +0000
  • 4615e56219 Add with_body: true to requests relying on max_body: val Roman Chvanikov 2019-04-12 00:16:15 +0700
  • d6d5f46bae Update OAuth web template Mark Felder 2019-04-11 16:02:38 +0000
  • 6f880b1627 Conversation: Fix tests. lain 2019-04-11 13:31:20 +0200
  • 42d2c8d95b Merge branch 'update-mastofe/glitch-soc-2019-04-11' into 'develop' lambda 2019-04-11 11:24:36 +0000
  • 36ec8d9694 ActivityPub: Fix specs. lain 2019-04-11 13:20:46 +0200
  • 46bd5c1d87 fix format Egor Kislitsyn 2019-04-11 17:28:12 +0700
  • db4badc6aa move user disable into deactivation Egor Kislitsyn 2019-04-11 17:22:42 +0700
  • d5e5e87d01 Update emojo Sadposter 2019-04-11 10:52:44 +0100
  • 0f2f7d2cec Merge remote-tracking branch 'pleroma/develop' into feature/disable-account Egor Kislitsyn 2019-04-11 15:51:52 +0700
  • 51c97d71af
         Update Mastodon Frontend to 2019-04-11 bundle Haelwenn (lanodan) Monnier 2019-04-11 07:29:03 +0200
  • 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. Ivan Tashkinov 2019-04-10 21:40:38 +0300
  • d115d2a27e Conversations: Tidying up. lain 2019-04-10 18:17:22 +0200
  • c352a0aba6 Conversations: Make tests run. lain 2019-04-10 17:48:31 +0200
  • de57094fca Participations: Add sort index. lain 2019-04-10 17:30:25 +0200
  • cf353514fe Participations: Add last activity. lain 2019-04-10 17:28:02 +0200
  • 20d9b90760 Participation: Get for a user. lain 2019-04-10 17:05:33 +0200
  • 280172f6f6 Conversations: Create or bump on inserting a dm. lain 2019-04-10 16:33:45 +0200
  • 64c1c3a407 Participations: Add marking as read and unread. lain 2019-04-10 15:12:01 +0200
  • d1da6b155a Conversation: Add Conversations and Participations. lain 2019-04-10 09:34:53 +0200
  • fe511a6c65 Merge branch 'develop' into feature/788-separate-email-addresses Alex S 2019-04-10 18:06:54 +0700
  • fe13a1d78c adding notify_email setting for trigger emails Alex S 2019-04-10 17:57:41 +0700
  • 527093e357 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop Sadposter 2019-04-10 11:27:41 +0100
  • e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop' lambda 2019-04-10 10:10:08 +0000
  • 6504b43f96 Merge branch 'feature/user-status-subscriptions' into 'develop' lambda 2019-04-10 10:04:20 +0000
  • be8350baa2
         Merge branch 'develop' into feature/user-status-subscriptions Sadposter 2019-04-10 10:44:54 +0100
  • b5cecebbc1 Conversations: Fix specs. lain 2019-04-10 09:32:17 +0200
  • c8440b5e0c Merge branch 'fix/emoji-api-nonsense' into 'develop' lambda 2019-04-10 06:22:51 +0000
  • 9c1b36856b
         s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ Haelwenn (lanodan) Monnier 2019-04-10 06:14:37 +0200
  • cae0231731
         s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/ Haelwenn (lanodan) Monnier 2019-04-10 06:13:46 +0200
  • 1791ee8ec4
         s/Pleroma.Mailer/Pleroma.Emails.Mailer/ Haelwenn (lanodan) Monnier 2019-04-10 06:05:05 +0200
  • 0ab563d334 Merge branch 'hotfix/fix_undefined_summary' into 'develop' kaniini 2019-04-10 02:10:47 +0000
  • 97395e013e Merge branch 'notification-pleroma-settings' into 'develop' kaniini 2019-04-10 02:10:31 +0000
  • cf9ba8fe1b
         transmogrifier.ex: Add fix_summary/1 Haelwenn (lanodan) Monnier 2019-04-10 02:32:04 +0200
  • b57b43027c Change response format of /api/pleroma/emoji to the one that actually makes sense rinpatch 2019-04-09 23:20:31 +0300
  • 144648de92 Merge branch 'mastoapi/plaintext-statuses' into 'develop' rinpatch 2019-04-09 17:25:31 +0000
  • 0a02ed7a2f Merge branch 'bugfix/follower_count' into 'develop' lambda 2019-04-09 07:30:38 +0000
  • 07afb9b537 update the follower count when a follower is blocked Sachin Joshi 2019-04-08 15:16:18 +0545
  • 589629cf3e
         Used cached user resources in subscriptions Sadposter 2019-04-08 15:56:14 +0100
  • fee50636d0 removing not needed invite update Alex S 2019-04-08 20:08:16 +0700
  • d0696fdfd6 fix for elixir 1.7.4 Alex S 2019-04-08 19:16:59 +0700
  • a9f805c871 Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations lain 2019-04-08 14:10:51 +0200
  • 5d871173d1 Merge branch 'features/mastoapi/2.6.0-conversations' of git.pleroma.social:pleroma/pleroma into features/mastoapi/2.6.0-conversations lain 2019-04-08 14:10:43 +0200
  • 87a01f9ee0
         Use Pleroma.Config instead of Application.get_env Sadposter 2019-04-08 13:04:30 +0100
  • 13ff312c48
         Sever subscription in case of block Sadposter 2019-04-08 12:46:12 +0100
  • f0ca0696c8 test for valid_invite? Alex S 2019-04-08 17:06:04 +0700
  • 012bb5dcc9 renaming expire_at -> expires_at Alex S 2019-04-08 16:01:28 +0700
  • 76fdfd1c7f Add check on activity visibility in sub notification Sadposter 2019-04-07 15:11:29 +0100
  • 56c75aec12 credo fix Alex S 2019-04-07 20:59:53 +0700
  • b810aac117 added docs to docs/api/admin_api.md Alex S 2019-04-07 19:48:52 +0700
  • ce8d457132 little channges Alex S 2019-04-06 22:38:35 +0700
  • e6778003ab
         JSON need quotes! Sadposter 2019-04-06 16:24:21 +0100
  • c05fe4da0a
         Document subscription endpoints, fix typos Sadposter 2019-04-06 16:20:06 +0100
  • 76d8928cf1 fix for field name Alex S 2019-04-06 20:49:43 +0700
  • a53d591ac5 code style Alex S 2019-04-06 20:47:05 +0700
  • dcc54f8cfa admin api endpoints for invites Alex S 2019-04-06 20:25:19 +0700
  • 47b07cec49 token -> invite renaming Alex S 2019-04-06 20:24:22 +0700
  • be54e40890 twitter api registration Alex S 2019-04-06 17:18:59 +0700
  • 0484f3a8b1 generating tokens with mix Alex S 2019-04-06 16:58:22 +0700