phnt/pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 6894d935c2 update frontend for mfcsocial Mark Felder 2019-04-10 14:51:53 -05:00
  • 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 +03:00
  • fb49c8116d update frontend for mfcsocial Mark Felder 2019-04-10 12:04:18 -05:00
  • d115d2a27e Conversations: Tidying up. lain 2019-04-10 18:17:22 +02:00
  • c352a0aba6 Conversations: Make tests run. lain 2019-04-10 17:48:31 +02:00
  • de57094fca Participations: Add sort index. lain 2019-04-10 17:30:25 +02:00
  • cf353514fe Participations: Add last activity. lain 2019-04-10 17:28:02 +02:00
  • 20d9b90760 Participation: Get for a user. lain 2019-04-10 17:05:33 +02:00
  • 280172f6f6 Conversations: Create or bump on inserting a dm. lain 2019-04-10 16:33:45 +02:00
  • 64c1c3a407 Participations: Add marking as read and unread. lain 2019-04-10 15:12:01 +02:00
  • d1da6b155a Conversation: Add Conversations and Participations. lain 2019-04-10 09:34:53 +02:00
  • fe511a6c65 Merge branch 'develop' into feature/788-separate-email-addresses Alex S 2019-04-10 18:06:54 +07:00
  • fe13a1d78c adding notify_email setting for trigger emails Alex S 2019-04-10 17:57:41 +07:00
  • e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop' lambda 2019-04-10 10:10:08 +00:00
  • 6504b43f96 Merge branch 'feature/user-status-subscriptions' into 'develop' lambda 2019-04-10 10:04:20 +00:00
  • be8350baa2
         Merge branch 'develop' into feature/user-status-subscriptions Sadposter 2019-04-10 10:44:54 +01:00
  • b5cecebbc1 Conversations: Fix specs. lain 2019-04-10 09:32:17 +02:00
  • c8440b5e0c Merge branch 'fix/emoji-api-nonsense' into 'develop' lambda 2019-04-10 06:22:51 +00:00
  • 9c1b36856b
         s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ Haelwenn (lanodan) Monnier 2019-04-10 06:14:37 +02:00
  • cae0231731
         s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/ Haelwenn (lanodan) Monnier 2019-04-10 06:13:46 +02:00
  • 1791ee8ec4
         s/Pleroma.Mailer/Pleroma.Emails.Mailer/ Haelwenn (lanodan) Monnier 2019-04-10 06:05:05 +02:00
  • 0ab563d334 Merge branch 'hotfix/fix_undefined_summary' into 'develop' kaniini 2019-04-10 02:10:47 +00:00
  • 97395e013e Merge branch 'notification-pleroma-settings' into 'develop' kaniini 2019-04-10 02:10:31 +00:00
  • cf9ba8fe1b
         transmogrifier.ex: Add fix_summary/1 Haelwenn (lanodan) Monnier 2019-04-10 02:32:04 +02:00
  • b57b43027c Change response format of /api/pleroma/emoji to the one that actually makes sense rinpatch 2019-04-09 23:20:31 +03:00
  • 144648de92 Merge branch 'mastoapi/plaintext-statuses' into 'develop' rinpatch 2019-04-09 17:25:31 +00:00
  • 0a02ed7a2f Merge branch 'bugfix/follower_count' into 'develop' lambda 2019-04-09 07:30:38 +00:00
  • 07afb9b537 update the follower count when a follower is blocked Sachin Joshi 2019-04-08 15:16:18 +05:45
  • 736cf3c611 Merge branch 'develop-sync' into 'mfc-develop' feld 2019-04-08 15:58:53 +00:00
  • 589629cf3e
         Used cached user resources in subscriptions Sadposter 2019-04-08 15:56:14 +01:00
  • 37b6e7c081 Removed duplicate tests. Ivan Tashkinov 2019-04-08 16:22:18 +03:00
  • feba1e2c52 Merge remote-tracking branch 'remotes/origin/mfc-develop' into develop-sync Ivan Tashkinov 2019-04-08 16:12:38 +03:00
  • fee50636d0 removing not needed invite update Alex S 2019-04-08 20:08:16 +07:00
  • bb67e33461 Merge remote-tracking branch 'remotes/origin/mfc-develop' into develop-sync Ivan Tashkinov 2019-04-08 15:47:56 +03:00
  • d0696fdfd6 fix for elixir 1.7.4 Alex S 2019-04-08 19:16:59 +07:00
  • a9f805c871 Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations lain 2019-04-08 14:10:51 +02:00
  • 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 +02:00
  • 87a01f9ee0
         Use Pleroma.Config instead of Application.get_env Sadposter 2019-04-08 13:04:30 +01:00
  • 13ff312c48
         Sever subscription in case of block Sadposter 2019-04-08 12:46:12 +01:00
  • f0ca0696c8 test for valid_invite? Alex S 2019-04-08 17:06:04 +07:00
  • 012bb5dcc9 renaming expire_at -> expires_at Alex S 2019-04-08 16:01:28 +07:00
  • 76fdfd1c7f Add check on activity visibility in sub notification Sadposter 2019-04-07 15:11:29 +01:00
  • 56c75aec12 credo fix Alex S 2019-04-07 20:59:53 +07:00
  • b810aac117 added docs to docs/api/admin_api.md Alex S 2019-04-07 19:48:52 +07:00
  • ce8d457132 little channges Alex S 2019-04-06 22:38:35 +07:00
  • e6778003ab
         JSON need quotes! Sadposter 2019-04-06 16:24:21 +01:00
  • c05fe4da0a
         Document subscription endpoints, fix typos Sadposter 2019-04-06 16:20:06 +01:00
  • 76d8928cf1 fix for field name Alex S 2019-04-06 20:49:43 +07:00
  • a53d591ac5 code style Alex S 2019-04-06 20:47:05 +07:00
  • dcc54f8cfa admin api endpoints for invites Alex S 2019-04-06 20:25:19 +07:00
  • 47b07cec49 token -> invite renaming Alex S 2019-04-06 20:24:22 +07:00
  • be54e40890 twitter api registration Alex S 2019-04-06 17:18:59 +07:00
  • 0484f3a8b1 generating tokens with mix Alex S 2019-04-06 16:58:22 +07:00
  • 3591b7c152 Update versions. v0.9.9999 lain 2019-04-05 22:26:08 +02:00
  • ef4e67d767 Fix and format. lain 2019-04-05 22:24:58 +02:00
  • d79a59c3b8 Add test. lain 2019-04-05 22:19:37 +02:00
  • ffac2593ea
         Add index on subscribers Sadposter 2019-04-05 17:30:54 +01:00
  • a270e7a191
         Mix format everything Sadposter 2019-04-05 17:07:58 +01:00
  • f6e131eeb9 Don't use twitterAPI for subscription tests Sadposter 2019-04-05 17:00:41 +01:00
  • 9ca91cbb87 Change relationship direction of subscriptions Sadposter 2019-04-05 16:51:45 +01:00
  • d35f6551c1 Move subscriptions endpoint to be under /pleroma Sadposter 2019-04-05 15:58:44 +01:00
  • 73afd13c21 Add subscription key to one test I forgot about Sadposter 2019-04-05 15:37:00 +01:00
  • 06cd547fc6 Format subscriptions related stuff Sadposter 2019-04-05 15:22:48 +01:00
  • d56866c824 Add subscribed status to user view Sadposter 2019-04-05 15:21:33 +01:00
  • 75c4ceb4a2 Add tests for subscriptions Sadposter 2019-04-05 15:14:19 +01:00
  • 316fe20d86 Make subscriptions the same direction as blocks Sadposter 2019-04-05 14:59:34 +01:00
  • 23c4f49494 Fix subscription endpoint return formats Sadposter 2019-04-05 14:27:26 +01:00
  • 007762e767 Add notification checks Sadposter 2019-04-05 14:20:13 +01:00
  • 79910ce5cc Add API endpoints and user column for subscription Sadposter 2019-04-05 13:49:33 +01:00
  • 7d535e34d9 Merge branch 'develop' into mfc-develop Mark Felder 2019-04-04 15:02:20 -05:00
  • 0f7b0c89b6 Merge branch 'merge/develop-20190404' into 'mfc-develop' feld 2019-04-04 15:52:18 +00:00
  • 8ca78f6995 Merge branch 'develop' into merge/develop-20190404 Mark Felder 2019-04-04 10:45:54 -05:00
  • 8db737d90b Merge branch 'develop-sync' into 'mfc-develop' feld 2019-04-04 15:44:45 +00:00
  • 5f0a98b6bc Merge branch 'mfc-develop' into develop-sync Ivan Tashkinov 2019-04-02 14:45:55 +03:00
  • aac48d0cc6 Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations Ivan Tashkinov 2019-04-02 09:19:10 +03:00
  • 754a3056da update frontend for mfcsocial Mark Felder 2019-04-01 12:02:28 -05:00
  • 4f278dfd54 Add hack to support GIFs uploaded before we started converting to MP4s Mark Felder 2019-04-01 11:56:10 -05:00
  • c873e795fd update frontend for mfcsocial Mark Felder 2019-04-01 10:45:19 -05:00
  • 433f20c420 MastoAPI AccountView: Add mfc extensions. lain 2019-04-01 17:16:46 +02:00
  • 629ad1766c BBS: Some fixes. lain 2019-03-31 21:53:17 +02:00
  • e3bf6655ba Add replying. lain 2019-03-31 21:14:21 +02:00
  • 10fdc080a0 BBS: Tests and formatting. lain 2019-03-31 20:35:10 +02:00
  • 10a9682596 ssl_trusted_certificate should point to chain.pem if we're demonstrating LetsEncrypt: https://community.letsencrypt.org/t/howto-ocsp-stapling-for-nginx/13611/5 Horsemans 2019-03-31 16:58:28 +00:00
  • 3fc4ea45df BBS: Add documentation. lain 2019-03-31 18:14:51 +02:00
  • 17ab9fa45b BBS: Some more functionality. lain 2019-03-31 18:01:16 +02:00
  • c810fb81a4 Basic SSH daemon. lain 2019-03-31 14:55:09 +02:00
  • ec72d1c90e update frontend for mfcsocial Mark Felder 2019-03-29 12:40:28 -05:00
  • 8dbbf339b5 update frontend for mfcsocial Mark Felder 2019-03-29 12:29:31 -05:00
  • c8abef373b
         mastodon_api_controller.ex: fallback to first for min_id Haelwenn (lanodan) Monnier 2019-03-28 17:18:44 +01:00
  • 6b407872b4
         mastodon_api_controller.ex: Use min_id in link header instead of since_id Haelwenn (lanodan) Monnier 2019-03-25 22:19:57 +01:00
  • e83ad12c57
         pagination.ex: Drop atom keys in params Haelwenn (lanodan) Monnier 2019-03-26 00:07:33 +01:00
  • 6f15224053
         activity_pub.ex: Move limit/max_id restrictions to Pagination helpers Haelwenn (lanodan) Monnier 2019-03-25 23:13:58 +01:00
  • cd90695a34 Add PUT /api/pleroma/notification_settings endpoint eugenijm 2019-03-28 14:52:09 +03:00
  • 55d086b520 Notification controls eugenijm 2019-03-27 22:09:39 +03:00
  • b9786660a7 update frontend for mfcsocial Mark Felder 2019-03-27 15:26:56 -05:00
  • 1c84af10b9 update frontend for mfcsocial Mark Felder 2019-03-27 13:25:54 -05:00
  • 94209016a9 Merge branch 'gif-conversion' into 'mfc-develop' feld 2019-03-27 16:58:35 +00:00
  • e6f6fd8a4f Uploading: Handle gifvs. lain 2019-03-27 17:35:09 +01:00
  • 3ca6c4f443 password reset page labels align Alex S 2019-03-27 22:37:20 +06:30
  • ddbd2aaf4e MFC Uploaders: Fix image previews. lain 2019-03-27 13:52:46 +01:00