Commit Graph

  • 8ecd14c625 tests: fix formatting William Pitcock 2019-02-20 20:49:10 +00:00
  • 84fe83c32f fix fetching AP objects with application/json William Pitcock 2019-02-20 20:45:40 +00:00
  • e890870399 tests: add test for fetching AP objects with application/json. William Pitcock 2019-02-20 20:45:09 +00:00
  • c5f920ac94 update frontend for mfcsocial Mark Felder 2019-02-20 13:06:12 -06:00
  • 568a769d7a update frontend for mfcsocial Mark Felder 2019-02-20 12:26:42 -06:00
  • 3f128dc0df update frontend for mfcsocial Mark Felder 2019-02-20 11:07:28 -06:00
  • 09c270266d update frontend for mfcsocial Mark Felder 2019-02-19 18:15:49 -06:00
  • d51a0c386c Improve color match with the green on MFC Share Mark Felder 2019-02-19 12:39:25 -06:00
  • 672899381c add nginx rewrite rule for mediaproxy iodine 2019-01-26 01:13:29 -08:00
  • 4de7bea00e Remove slicing. lain 2019-02-19 17:21:12 +01:00
  • d3f8468f6f update frontend lain 2019-02-19 17:09:54 +01:00
  • a42ae1685f update frontend for mfcsocial Mark Felder 2019-02-19 09:39:02 -06:00
  • 7da421ae11 Fix incorrect merge conflict work Mark Felder 2019-02-19 08:23:24 -06:00
  • 63b1f73307 Use new API feature still_seek_percentage Mark Felder 2019-02-18 16:45:35 -06:00
  • edc412f853 update frontend for mfcsocial Mark Felder 2019-02-18 16:43:22 -06:00
  • ae053d1355 Merge branch 'develop' into mfc-develop Mark Felder 2019-02-18 16:35:58 -06:00
  • 94e562f0a4 Merge pull request #84 from pleroma/send-since-id markf 2019-02-18 16:25:52 -06:00
  • 04b69bbf6d Move user sync into registration. Roger Braun 2019-02-18 19:53:16 +01:00
  • ee2800faa5 Add and option to send a since parameter for the following sync. Roger Braun 2019-02-18 19:02:35 +01:00
  • 8a9a923d32 update frontend for mfcsocial Mark Felder 2019-02-16 11:58:41 -06:00
  • f241bcc812 update frontend for social.im Mark Felder 2019-02-16 11:57:53 -06:00
  • 744c7ebb43 update frontend for mfcsocial Mark Felder 2019-02-16 11:52:05 -06:00
  • 418958df46 Merge pull request #83 from pleroma/safer-api-usage markf 2019-02-16 10:56:34 -06:00
  • 1e923efd71 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2019-02-15 10:03:32 -06:00
  • 4fcdd0f780 Merge branch 'develop' into mfc-develop Mark Felder 2019-02-15 10:03:23 -06:00
  • 5b25e2e0cd Merge pull request #82 from pleroma/post-and-creation-api markf 2019-02-15 08:22:45 -06:00
  • e411e64739 Get followers through new HMAC signed API. Roger Braun 2019-02-15 14:33:12 +01:00
  • c7442b4fc3 Add note pushing mix task. Roger Braun 2019-02-15 11:28:52 +01:00
  • c07d56599b Merge pull request #81 from pleroma/post-and-creation-api markf 2019-02-14 13:21:12 -06:00
  • 9cf25ffae3 Better logging for user push to share. Roger Braun 2019-02-14 19:15:28 +01:00
  • 46910c05be Merge pull request #80 from pleroma/post-and-creation-api markf 2019-02-14 09:46:52 -06:00
  • c6d4f4c08a Share API client_id is our server_id. Roger Braun 2019-02-14 16:16:53 +01:00
  • 573bab1073 Only notify about posts when sync is enabled. Roger Braun 2019-02-14 16:16:36 +01:00
  • 78bf2a25af update frontend for social.im Mark Felder 2019-02-14 08:57:32 -06:00
  • fc96bc6c75 update frontend for mfcsocial Mark Felder 2019-02-14 08:56:33 -06:00
  • 1bb7a8cc90 Merge branch 'develop' into mfc-develop Mark Felder 2019-02-14 08:41:53 -06:00
  • bb14849423 update frontend for mfcsocial Mark Felder 2019-02-13 12:03:27 -06:00
  • bf4ab3c902 update frontend for social.im Mark Felder 2019-02-13 12:02:35 -06:00
  • cb6844d513 Merge branch 'develop' into mfc-develop Mark Felder 2019-02-13 11:30:39 -06:00
  • 81303acf44 Merge pull request #76 from pleroma/post-and-creation-api markf 2019-02-13 11:28:19 -06:00
  • 314294dfac Add initial import for accounts to share. Roger Braun 2019-02-13 16:51:04 +01:00
  • 64c389131b Merge remote-tracking branch 'origin/mfc-develop' into post-and-creation-api Roger Braun 2019-02-13 16:36:37 +01:00
  • 9f77250ace Merge pull request #78 from pleroma/disable-sync markf 2019-02-13 09:32:33 -06:00
  • f74591b716 Merge pull request #79 from pleroma/fix-autofollow markf 2019-02-13 09:31:15 -06:00
  • bb33d69441 Use normal registration flow for mfc users. Roger Braun 2019-02-13 15:55:13 +01:00
  • 9d416d44c8 Add option to disble follower and state sync. Roger Braun 2019-02-13 13:00:42 +01:00
  • 1b3bdb25eb Add a clean NSFW cover image Mark Felder 2019-02-12 15:32:48 -06:00
  • 1148ee4f1b New logo, looks much nicer at the top Mark Felder 2019-02-12 15:11:41 -06:00
  • 2b297f5e1d Make login errors stand out more and only draw their elements if an error condition occurs. Mark Felder 2019-02-11 22:20:33 -06:00
  • b31fe81981 Change to image API v2 which supports fallback_method and will return metadata for objects keyed on the names we provide Mark Felder 2019-02-11 13:58:32 -06:00
  • 7de4c4346e Add new optional parameter "fallback_method" Mark Felder 2019-02-11 12:26:54 -06:00
  • bc5693e9dc Revert "encoding-api default quality is 94, let's keep that" Mark Felder 2019-02-11 12:25:57 -06:00
  • 58341e923a Merge branch 'develop' into mfc-develop Mark Felder 2019-02-11 10:35:40 -06:00
  • a23210fce6 encoding-api default quality is 94, let's keep that Mark Felder 2019-02-11 10:30:37 -06:00
  • 7be386b15d Add user creation hook. Roger Braun 2019-02-11 13:20:45 +01:00
  • 0c7cec26b7 Add post notification hook. Roger Braun 2019-02-11 13:17:20 +01:00
  • ea1e3e95ef Revert "Do object insertion through Cachex" lain 2019-02-11 09:52:19 +01:00
  • f8f1309465 Add share api functions. Roger Braun 2019-02-10 22:53:28 +01:00
  • 8a270b438c Do object insertion through Cachex lain 2019-02-09 22:01:08 +01:00
  • 1aebe8c6d9 Disable rich media by default. lain 2019-02-09 12:33:11 +01:00
  • 7b3dea4ed7 update frontend for social.im Mark Felder 2019-02-08 16:16:52 -06:00
  • 0f25169d23 update frontend for mfcsocial Mark Felder 2019-02-08 16:05:16 -06:00
  • c71702194f Merge branch 'develop' into mfc-develop Mark Felder 2019-02-08 16:04:25 -06:00
  • a66e3cb1b7 Merge pull request #74 from pleroma/mfc-telemetry markf 2019-02-07 15:23:49 -06:00
  • 634ef6beda
    Add recon href 2019-02-06 10:33:05 +01:00
  • e80234b07f update frontend for mfcsocial Mark Felder 2019-02-06 17:37:04 -06:00
  • 4ab1aa2497 update frontend for social.im Mark Felder 2019-02-06 17:32:37 -06:00
  • 970f24be91 Merge branch 'develop' into mfc-develop Mark Felder 2019-02-06 16:43:53 -06:00
  • 0e57bc1346 update frontend for mfcsocial Mark Felder 2019-02-06 15:23:55 -06:00
  • d4913540c7 Merge branch 'develop' into mfc-develop Mark Felder 2019-02-06 15:22:51 -06:00
  • 6172b67042 Merge pull request #73 from pleroma/online-state-mod markf 2019-02-06 11:47:05 -06:00
  • 3847f503be MFC online state: Everything except 90 is 'online' Roger Braun 2019-02-06 18:45:14 +01:00
  • eae6b237a5 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2019-02-06 11:24:29 -06:00
  • cec66288ce Update maintenance wording per suggestion by Florian Mark Felder 2019-02-06 11:24:12 -06:00
  • 1992f677c6 Merge pull request #72 from pleroma/allow-external-emoji markf 2019-02-06 11:10:28 -06:00
  • 4206e0cc9b allow external emoji Roger Braun 2019-02-06 18:05:34 +01:00
  • bf8e23f33f update frontend for mfcsocial Mark Felder 2019-02-06 10:34:57 -06:00
  • c84ab2774a Merge pull request #71 from pleroma/model-badge markf 2019-02-06 10:03:45 -06:00
  • af2051d401 Add missing cron and fixture. Roger Braun 2019-02-06 17:02:26 +01:00
  • 2614c2220f Merge pull request #70 from pleroma/model-badge markf 2019-02-06 09:57:46 -06:00
  • 4f86e75972 MFC: Give out model state in user view. Roger Braun 2019-02-06 16:35:42 +01:00
  • 2b741520c5 Mfc.Utils: Add function to set model online state. Roger Braun 2019-02-06 16:11:18 +01:00
  • d4bab45f7f update frontend for social.im Mark Felder 2019-02-05 14:57:01 -06:00
  • 53a3774141 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2019-02-05 14:55:37 -06:00
  • 20ac0a5352 update frontend for mfcsocial Mark Felder 2019-02-05 14:55:28 -06:00
  • 7c4c5e6506 Merge pull request #69 from pleroma/mfc-conversion-defaults markf 2019-02-05 14:20:07 -06:00
  • 34e6075685 Merge branch 'mfc-develop' into mfc-conversion-defaults markf 2019-02-05 14:19:57 -06:00
  • 6d63c7bba4
    conversion defaults, smartcrop href 2019-02-05 21:17:27 +01:00
  • 19e2af0324 Merge pull request #68 from pleroma/mfc-preview-url-fix-media-content-type markf 2019-02-05 13:18:08 -06:00
  • 925b60f037
    Fix preview_url with a shortened content-type href 2019-02-05 20:10:51 +01:00
  • f6ec7f217d We now have SmartCrop, so let's use it! Mark Felder 2019-02-05 12:46:24 -06:00
  • 5516a02019 Forgot to commit logo image Mark Felder 2019-02-05 11:58:30 -06:00
  • b405d5d380 Store the Social logo with the maintenance page Mark Felder 2019-02-05 11:57:26 -06:00
  • f42a3cd9d8 Raise redirect to 15 seconds Mark Felder 2019-02-05 09:54:42 -06:00
  • 73518e599f Auto refresh to social in 5 seconds Mark Felder 2019-02-05 09:46:23 -06:00
  • 04557c9252 Make it better on mobile Mark Felder 2019-02-05 09:33:58 -06:00
  • ab7d30e7d7 Better messaging Mark Felder 2019-02-05 09:31:04 -06:00
  • 88610cd108 Add an ugly maintenance page Mark Felder 2019-02-05 09:23:37 -06:00
  • e1e6bbdd0c update frontend for social.im Mark Felder 2019-02-04 21:17:34 -06:00
  • d155d656c3 update frontend for social.im Mark Felder 2019-02-04 12:34:21 -06:00