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

Commit Graph

  • 284cee6c35 Merge pull request #65 from pleroma/mfc-opengraph-image-preview markf 2019-02-04 10:06:57 -06:00
  • 0a31664290
         Opengraph: return preview url for images href 2019-02-04 17:02:48 +01:00
  • bd3f913160 Merge pull request #64 from pleroma/mfc-image-resize markf 2019-02-04 09:54:41 -06:00
  • 220b8593d3
         Resize uploaded image to max 2048x2048 href 2019-02-04 16:45:31 +01:00
  • 3ec1605ee8 Merge branch 'develop' into mfc-develop Mark Felder 2019-02-03 12:28:01 -06:00
  • 88781553f6 update frontend for mfcsocial Mark Felder 2019-02-03 09:10:04 -06:00
  • 07e056c00b Revert "Revert "Update instance panel"" Mark Felder 2019-02-02 17:52:33 -06:00
  • be6aa9c377 Revert "Update instance panel" Mark Felder 2019-02-02 14:16:34 -06:00
  • 4fce479041 Update instance panel Mark Felder 2019-02-02 14:08:28 -06:00
  • faad51ac0e Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2019-02-02 10:44:50 -06:00
  • 2241746314 update frontend for mfcsocial Mark Felder 2019-02-02 10:43:51 -06:00
  • 298211966b Merge pull request #59 from pleroma/fix-twitter-follows markf 2019-02-02 09:59:59 -06:00
  • 131b008301 Twitter friends api returns a 'following_id' Roger Braun 2019-02-02 16:57:03 +01:00
  • 5fb6678ea9 update frontend for mfcsocial Mark Felder 2019-02-02 09:49:11 -06:00
  • 2cac41249e Merge pull request #58 from pleroma/53-configurable-sync markf 2019-02-02 09:45:59 -06:00
  • b0ce738342 Merge branch 'develop' into mfc-develop Mark Felder 2019-02-02 09:45:35 -06:00
  • 56d94b51dc
         Fix bad return href 2019-02-02 10:03:10 +01:00
  • 3f65b8f68d Give out mfc_follower_sync in user view. Roger Braun 2019-02-01 18:38:15 +01:00
  • 1d9b70c04e Don't sync if the option is off. Roger Braun 2019-02-01 17:59:50 +01:00
  • f991b84e73 Add mfc_following_sync option to update profile. Roger Braun 2019-02-01 17:43:08 +01:00
  • 8c0e4e826c Merge branch 'develop' into mfc-develop Mark Felder 2019-02-01 08:55:53 -06:00
  • 9fb50e2f93 update frontend for mfcsocial Mark Felder 2019-02-01 07:53:10 -06:00
  • 9fa18bc628 Merge pull request #52 from pleroma/fix-image-preview-url markf 2019-01-31 13:09:11 -06:00
  • 43c46f4b73
         Leave original extension in image previews filenames href 2019-01-31 18:54:19 +01:00
  • 46bcc21dc2
         Merge branch 'develop' into mfc-develop href 2019-01-31 18:21:27 +01:00
  • 4fe0784c5d
         User.follow_all: ensure its stays unique href 2019-01-31 18:07:46 +01:00
  • 4d9001d57a
         mfc/application.ex : reorder syncfollower job href 2019-01-31 15:23:09 +01:00
  • 25e1e41054 update frontend for mfcsocial Mark Felder 2019-01-30 20:48:51 -06:00
  • b3125989d9 update frontend for mfcsocial Mark Felder 2019-01-30 19:55:08 -06:00
  • b702beeddf Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2019-01-30 19:29:35 -06:00
  • 56d57ed359 update frontend for social.im Mark Felder 2019-01-30 19:23:00 -06:00
  • b413fde5b1 Merge pull request #51 from pleroma/more-follower-sync-stuff markf 2019-01-30 11:48:33 -06:00
  • 98d5682800 Add twitter friends endpoint for user sync. Roger Braun 2019-01-30 18:06:54 +01:00
  • 5c08625db3 Change to jpg previews due to smaller size / better performance Mark Felder 2019-01-30 09:59:53 -06:00
  • b40f439617 update frontend for mfcsocial Mark Felder 2019-01-30 09:50:49 -06:00
  • db249d01be Merge pull request #50 from pleroma/mfc-prometheus markf 2019-01-30 09:47:44 -06:00
  • 9f78255f39
         Serve metrics at /api/pleroma/app_metrics href 2019-01-30 16:44:38 +01:00
  • f1c844c227
         Add prometheus_process_collector (Requires erlang sources) href 2019-01-30 16:37:41 +01:00
  • 1771598097
         Set up telemetry and prometheus href 2019-01-30 16:32:30 +01:00
  • 5099b4e419 Add basic periodic follower syncing. Roger Braun 2019-01-30 16:08:27 +01:00
  • 721957b3d2 Fix specs. Roger Braun 2019-01-30 15:36:34 +01:00
  • dda2edbb0f Merge pull request #49 from pleroma/mfc-ignore-autofollow-errors markf 2019-01-29 16:33:59 -06:00
  • a04c21c8f9
         MFC: Ignore autofollow errors href 2019-01-29 23:31:44 +01:00
  • dc0ec9970a update frontend for mfcsocial Mark Felder 2019-01-29 14:22:53 -06:00
  • 64832cc1c7 Found how ToS kept getting overwritten -- from FE updates/deploys Mark Felder 2019-01-29 14:13:58 -06:00
  • 716bfd951f update frontend for mfcsocial Mark Felder 2019-01-29 14:09:48 -06:00
  • e686e1948a Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2019-01-29 10:39:33 -06:00
  • 231e63d34e update frontend for mfcsocial Mark Felder 2019-01-29 10:39:04 -06:00
  • 90dffb18ad
         the fuck git conflicts? href 2019-01-29 16:47:34 +01:00
  • 14b898ea9d
         Merge branch 'develop' into mfc-develop href 2019-01-29 16:36:02 +01:00
  • c7960c84bb update frontend for mfcsocial Mark Felder 2019-01-29 09:18:11 -06:00
  • 51c68f2228 shrink logo Mark Felder 2019-01-28 21:31:01 -06:00
  • ad094783fc Update instance logo Mark Felder 2019-01-28 21:27:11 -06:00
  • 96dc37ae54 Fix Terms of Service Mark Felder 2019-01-28 21:24:13 -06:00
  • f2b45ad0bf update frontend for mfcsocial Mark Felder 2019-01-28 17:54:48 -06:00
  • dec4621624 update frontend for social.im Mark Felder 2019-01-28 17:32:48 -06:00
  • 55abbb82c4 Merge pull request #45 from pleroma/mfc-no-gif-conversion markf 2019-01-28 17:30:46 -06:00
  • 1f4d5973f8
         MFC: Don't convert gifs href 2019-01-29 00:13:53 +01:00
  • 10684977c6
         Merge branch 'mfc-uploader-fix-test' into mfc-no-gif-conversion href 2019-01-29 00:12:08 +01:00
  • 9ce1537281 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2019-01-28 14:39:23 -06:00
  • 76b37ee1e2 update frontend for mfcsocial Mark Felder 2019-01-28 14:34:55 -06:00
  • 4b4bd4d4c4 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into mfc-develop Roger Braun 2019-01-28 21:16:25 +01:00
  • 266425958e update frontend for mfcsocial Mark Felder 2019-01-28 13:32:19 -06:00
  • 72d2f535b4 update frontend for social.im Mark Felder 2019-01-28 13:26:29 -06:00
  • f947d7d272 update frontend for mfcsocial Mark Felder 2019-01-28 07:36:38 -06:00
  • 8298744084 update frontend for mfcsocial Mark Felder 2019-01-28 07:14:34 -06:00
  • 01945c7c35 Update ToS Mark Felder 2019-01-28 07:08:33 -06:00
  • 680fc3e927 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2019-01-27 16:19:28 -06:00
  • c850dd67e2 Merge branch 'develop' into mfc-develop Mark Felder 2019-01-27 16:18:55 -06:00
  • d44939f0ec
         Fix MFC uploader test href 2019-01-27 22:28:11 +01:00
  • 7911576906 Merge pull request #43 from pleroma/mfc-uploader-original-file markf 2019-01-27 15:05:58 -06:00
  • 6e3391fa65
         Prefix original videos with _original href 2019-01-27 22:02:53 +01:00
  • e9aa25782d Merge pull request #42 from pleroma/mfc-conversion-ignore-duplicates markf 2019-01-27 14:46:33 -06:00
  • ae52080ff6
         Ignore duplicates properly in MFC uploader href 2019-01-27 21:33:46 +01:00
  • 05be3601f7 Merge pull request #41 from pleroma/twitter-api-upload-preview markf 2019-01-26 11:07:10 -06:00
  • 6cdc3e405a update frontend for mfcsocial Mark Felder 2019-01-26 10:57:40 -06:00
  • f1cbc79461 update frontend for social.im Mark Felder 2019-01-26 10:48:07 -06:00
  • 397adb9096 Add a placeholder ToS Mark Felder 2019-01-26 09:37:07 -06:00
  • d6e0c270ee Add a default user avatar Mark Felder 2019-01-26 09:30:11 -06:00
  • d7df478d9d Added instance panel in wrong dir Mark Felder 2019-01-25 15:35:02 -06:00
  • 134e25b6bf Add instance panel for social.im too Mark Felder 2019-01-25 15:33:53 -06:00
  • b96021dc25 Add Social.im logo Mark Felder 2019-01-25 14:30:09 -06:00
  • e6e022fd48 Add local config.json Mark Felder 2019-01-25 14:28:14 -06:00
  • 4a6e819fdf Do not need a copy of this in the local static dir Mark Felder 2019-01-25 14:26:24 -06:00
  • 191019294f update frontend for social.im Mark Felder 2019-01-25 14:25:20 -06:00
  • c2fd9f8ea4 Add favicon Mark Felder 2019-01-25 14:25:05 -06:00
  • a2746e9083 update frontend for social.im Mark Felder 2019-01-25 14:20:27 -06:00
  • 55c636d576 update frontend for mfcsocial Mark Felder 2019-01-25 12:34:22 -06:00
  • fa4e353e16 update frontend for mfcsocial Mark Felder 2019-01-25 12:00:24 -06:00
  • 0eebed5744 Revert static files to originals from develop branch Mark Felder 2019-01-25 11:42:26 -06:00
  • a1a68b5d6c Restore missing css files Mark Felder 2019-01-25 11:39:34 -06:00
  • 5f882581fc Clean up files; trying to sync up with develop to prevent conflicts Mark Felder 2019-01-25 11:36:54 -06:00
  • f019c2523c Move instance specific changes to /local Mark Felder 2019-01-25 11:24:19 -06:00
  • 71ac52352e Merge branch 'develop' into mfc-develop Mark Felder 2019-01-25 11:21:11 -06:00
  • 32ca794ecd
         TwitterAPI: return media_large_thumb_url on upload endpoint href 2019-01-25 15:29:07 +01:00
  • 3579002082 update frontend Mark Felder 2019-01-24 17:18:12 -06:00
  • 0866d18949 update frontend Mark Felder 2019-01-24 16:03:12 -06:00
  • 653e28f463 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2019-01-24 15:14:47 -06:00
  • dd2eabc9be update frontend Mark Felder 2019-01-24 15:13:55 -06:00
  • 063c129df2 Merge branch 'develop' of git.pleroma.social:/pleroma/pleroma into mfc-develop Mark Felder 2019-01-24 15:12:18 -06:00