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

Commit Graph

  • e0deaf3acb Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-08 06:42:14 -06:00
  • 50416afde8 update frontend Mark Felder 2018-12-08 06:36:28 -06:00
  • cc0c400cdd Merge branch 'develop' of git.pleroma.social:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-08 06:35:18 -06:00
  • 8c65357237 Merge pull request #17 from pleroma/spark/video-conversion markf 2018-12-06 13:51:18 -06:00
  • e85512a320
         MFC.Uploaders: ignore already-converted keys. href 2018-12-06 20:42:03 +01:00
  • 692002def7 Merge pull request #16 from pleroma/spark/video-conversion markf 2018-12-06 13:07:40 -06:00
  • 86bb2f3c80 Merge pull request #15 from pleroma/fix/login-text Eero Leno 2018-12-06 21:01:39 +02:00
  • 33aa8d2f43
         Uploaders.MFC: log HTTP error response href 2018-12-06 20:00:20 +01:00
  • 5e2b45f483 Revert "Add note to login page" eal 2018-12-06 21:00:23 +02:00
  • 6fa760b0a5 update frontend Mark Felder 2018-12-06 12:48:47 -06:00
  • 988dd6ed8c Merge branch 'develop' of git.pleroma.social:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-06 12:46:32 -06:00
  • bbe712cb00 Merge pull request #14 from pleroma/spark/video-conversion markf 2018-12-06 11:01:29 -06:00
  • e2ee473a9a Merge branch 'mfc-develop' into spark/video-conversion markf 2018-12-06 11:00:46 -06:00
  • 5ea1ceb57c update frontend Mark Felder 2018-12-06 08:23:59 -06:00
  • 385e90aab1 update frontend Mark Felder 2018-12-05 15:55:10 -06:00
  • 5b13199ed4 update frontend Mark Felder 2018-12-05 13:35:56 -06:00
  • 0099411b53 update frontend Mark Felder 2018-12-05 13:29:30 -06:00
  • 04a81808ae update frontend Mark Felder 2018-12-05 13:10:28 -06:00
  • 07bd9836b1 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-05 13:02:57 -06:00
  • e9813f4f22 update frontend Mark Felder 2018-12-05 13:02:10 -06:00
  • 11e9e0c7d3 Merge pull request #13 from pleroma/fix/login-text markf 2018-12-05 12:54:39 -06:00
  • be6c1a8704
         mfc uploader wip href 2018-12-05 17:08:24 +01:00
  • 6ba198c26c Add note to login page eal 2018-12-04 18:55:18 +02:00
  • d6ab701a14 formatting William Pitcock 2018-12-04 05:01:21 +00:00
  • 419d4bd5e4 tests: add tests for Object.normalize() William Pitcock 2018-12-04 05:00:11 +00:00
  • b3b52b58c3 activitypub: transmogrifier: remove obsolete fetch_obj_helper() William Pitcock 2018-12-04 03:18:10 +00:00
  • fed9b5404c object: rework Object.normalize() a bit to support transparent fetching William Pitcock 2018-12-04 03:17:25 +00:00
  • 02288b5f1c twitterapi: fix bad rebase William Pitcock 2018-12-01 23:08:23 +00:00
  • f0439617ef tests: some minor cleanups William Pitcock 2018-12-01 23:03:03 +00:00
  • 7a57db0d3a federator: fix up contain_origin_from_id() call William Pitcock 2018-12-01 23:02:32 +00:00
  • f85949cc69 object: factor out fetching functions into Pleroma.Object.Fetcher module William Pitcock 2018-12-01 22:53:10 +00:00
  • e8caecb5c7 object: move object containment out of transmogrifier into it's own module William Pitcock 2018-12-01 22:29:41 +00:00
  • 1a360a4eaa compact database task: fix formatting William Pitcock 2018-12-01 22:17:28 +00:00
  • ef56488349 mix: add task to compact the database William Pitcock 2018-11-29 06:53:17 +00:00
  • 5d753e1c7c activity: add helpers for updating activities in the database William Pitcock 2018-11-29 06:52:54 +00:00
  • 6f90f2c3ac activitypub: rework thread filtering for split object view William Pitcock 2018-11-29 03:34:57 +00:00
  • fe000f82f8 tests: activitypub: fix broken test due to invalid child object William Pitcock 2018-11-29 03:27:59 +00:00
  • f168a2add6 ostatus: fix representing external objects William Pitcock 2018-11-29 03:06:20 +00:00
  • f7e15d3257 tests: fix a lot of the remaining test failures William Pitcock 2018-11-25 22:49:39 +00:00
  • 4ca4c83871 tests: fix most remaining failures William Pitcock 2018-11-25 22:31:07 +00:00
  • cf139e3eec activitypub: transmogrifier: ensure we send nested object in Create William Pitcock 2018-11-25 22:11:10 +00:00
  • d6e65f9304 common api: fix up improper Object.normalize() calls William Pitcock 2018-11-25 21:50:46 +00:00
  • d13d953385 activitypub: implement activity flattening William Pitcock 2018-11-25 21:44:03 +00:00
  • 57d90e7afe activitypub: relay: fix improper use of Object.normalize() William Pitcock 2018-11-25 21:43:26 +00:00
  • 5ea64f4bf9 activity: minor cleanups to normalization functions to align them with the object normalizers William Pitcock 2018-11-25 21:34:36 +00:00
  • 5ba5df1321 object: normalize(): use object cache William Pitcock 2018-11-25 21:20:29 +00:00
  • e8570758f9 twitterapi: fix remaining test failures William Pitcock 2018-11-25 21:16:44 +00:00
  • 6f5f589f73 test: fix mastodon api test failure William Pitcock 2018-11-25 21:08:55 +00:00
  • 3b8e5bcbeb fix most tests William Pitcock 2018-11-25 20:56:12 +00:00
  • dd66cc2ca6 ostatus: use Object.normalize() where appropriate when representing activities William Pitcock 2018-11-25 20:40:16 +00:00
  • 5d4a71906a mastodon api: use Object.normalize() in a few missing spots William Pitcock 2018-11-25 20:27:00 +00:00
  • e9b718cea2 mastodon api: status view: use Object.normalize() William Pitcock 2018-11-25 20:21:42 +00:00
  • 95a458f392 twitterapi: more object normalization work William Pitcock 2018-11-25 20:14:00 +00:00
  • 4482ce7e2d activitypub: normalize objects when streaming them out William Pitcock 2018-11-25 20:09:28 +00:00
  • d3fde9b5f2 ostatus: note handler: appropriately use Object.normalize() William Pitcock 2018-11-25 19:05:17 +00:00
  • 67038ae15e common api: utils: access inReplyTo object ID correctly William Pitcock 2018-11-25 19:00:05 +00:00
  • d6b266163b common api: fetch visibility from normalized object William Pitcock 2018-11-25 18:57:38 +00:00
  • 0522b26883 gopher: use Object.normalize() William Pitcock 2018-11-25 18:48:37 +00:00
  • 663007b42c activity: clean up direct use of object data William Pitcock 2018-11-25 18:44:04 +00:00
  • b795dd1f47 update frontend Mark Felder 2018-12-03 16:24:14 -06:00
  • 45f54e398d update frontend Mark Felder 2018-12-03 16:09:39 -06:00
  • 11ca120baf Revert to original instance logo Mark Felder 2018-12-03 15:17:08 -06:00
  • 01fd09c8c6 Last image included all four samples instead of the one we intended to deploy Mark Felder 2018-12-02 07:51:53 -06:00
  • 9ca13e9df6 Update instance logo Mark Felder 2018-12-02 07:45:37 -06:00
  • 2c41f0358c update frontend Mark Felder 2018-11-30 14:43:19 -06:00
  • 25536de00b update frontend Mark Felder 2018-11-30 14:39:06 -06:00
  • d4c0fbf1d6 update frontend Mark Felder 2018-11-30 14:10:36 -06:00
  • 93973c5a2e Merge branch 'mfc-instance-panel' into mfc-develop Mark Felder 2018-11-20 17:23:53 -06:00
  • eeb2db3fe4 Remove recommendation of Mastalab and Pawoo for now Mark Felder 2018-11-20 17:23:26 -06:00
  • 0c44187726 update frontend lain 2018-11-19 18:22:52 +01:00
  • 661afc8c93 update frontend lain 2018-11-19 17:58:53 +01:00
  • 93264c58f8 Merge branch 'mfc-develop' of spark.your.org:pleroma/pleroma into mfc-develop lain 2018-11-19 17:58:17 +01:00
  • f8be6f638b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into mfc-develop lain 2018-11-19 17:57:43 +01:00
  • e946c71eb8 Merge pull request #7 from pleroma/mfc-login-form roger 2018-11-19 17:52:26 +01:00
  • f9236b9cae MFC changes to login form eal 2018-11-17 16:59:25 +02:00
  • 430c3a96cf Merge branch 'mfc-instance-panel' into mfc-develop User Pleroma 2018-11-16 19:07:53 +00:00
  • c60f72ebad Remove instance admin for now, add links to apps Mark Felder 2018-11-16 12:59:41 -06:00
  • 5f8dc8eecc Merge branch 'mfc-develop' of https://spark.your.org/pleroma/pleroma into mfc-develop User Pleroma 2018-11-16 18:50:19 +00:00
  • 12e65a92ef Add instance admin and recommended apps to instance panel Mark Felder 2018-11-16 12:47:43 -06:00
  • 6ee3d7bbc3 update frontend lain 2018-11-16 19:17:02 +01:00
  • 7a96a676c4 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into mfc-develop lain 2018-11-16 19:15:59 +01:00
  • ff306bd5b9 Merge branch 'mfc-develop' of spark.your.org:pleroma/pleroma into mfc-develop lain 2018-11-16 18:53:26 +01:00
  • b9b91ac606 Only username is valid. lain 2018-11-16 18:53:08 +01:00
  • b70b2d96f1 Merge remote-tracking branch 'origin/develop' into mfc-develop User Pleroma 2018-11-16 17:49:03 +00:00
  • 2c43fb0811 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2018-11-16 10:38:02 -06:00
  • 5791c4755b Update favicon for MFC Mark Felder 2018-11-16 10:36:40 -06:00
  • 4aef7de4b4 Basic layout changes for the login. lain 2018-11-15 19:14:33 +01:00
  • e0bc40be29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into mfc-develop lain 2018-11-14 19:17:36 +01:00
  • ae29feca8b update frontend lain 2018-11-14 18:29:34 +01:00
  • ed32aab227 update frontend lain 2018-11-14 18:11:26 +01:00
  • 3b1c019fd6 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into mfc-develop lain 2018-11-14 18:11:01 +01:00
  • 67a2630d76 Make uploaded avatars override mfc avatars. lain 2018-11-11 20:26:12 +01:00
  • b54ddd4df5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into mfc-develop lain 2018-11-11 19:57:30 +01:00
  • 06a6fb67a2 Merge branch 'mfc-develop' of spark.your.org:pleroma/pleroma into mfc-develop lain 2018-11-08 19:54:07 +01:00
  • 96c202096d update frontend lain 2018-11-08 19:53:22 +01:00
  • f0099ac5a0 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2018-11-08 11:45:44 -06:00
  • 83c1fc2126 Add default avatar for MFC Mark Felder 2018-11-08 11:45:18 -06:00
  • 7410fbc9eb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into mfc-develop lain 2018-11-08 18:29:36 +01:00
  • 3b1871bfb5 update frontend lain 2018-11-08 18:26:31 +01:00
  • 2795055cbd update frontend lain 2018-11-08 18:22:55 +01:00