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

Commit Graph

  • 05a2dfe4a0 MFC Uploaders: Add gif conversion. lain 2019-03-27 13:23:54 +01:00
  • ce7bd38a3c Merge branch 'merge/20190326-develop' into 'mfc-develop' feld 2019-03-26 20:39:43 +00:00
  • dc415f78b5 Update OAuth error messages to match the new responses for Mastodon API 2.7.0 Mark Felder 2019-03-26 11:58:55 -05:00
  • 2076f0ef95 Return alias for Repo Mark Felder 2019-03-26 11:49:57 -05:00
  • 8826159303 Merge branch 'develop' into merge/20190326-develop Mark Felder 2019-03-26 11:07:20 -05:00
  • 037fefe218 Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations lain 2019-03-25 13:37:32 +01:00
  • 2716d7ab19 Fix credo issues. Roger Braun 2019-03-25 13:10:54 +01:00
  • d1cfaac7de Merge branch 'fix/fix-tests' into 'mfc-develop' lambda 2019-03-25 11:51:00 +00:00
  • c2319d3a08 Merge branch 'fix-telemetry' into 'mfc-develop' lambda 2019-03-25 11:50:20 +00:00
  • e711266912 [#1] fix telemetry Egor Kislitsyn 2019-03-25 15:29:04 +07:00
  • f0aa41db99 Fix Elixir warnings and Credo issues eugenijm 2019-03-25 08:36:04 +03:00
  • 24ddfa5766 Fix specs. Roger Braun 2019-03-24 19:15:15 +01:00
  • 13bd37cfab Merge branch 'fix/formatting' into 'mfc-develop' feld 2019-03-24 17:30:02 +00:00
  • 7e4bcd9872 Fix formatting so we pass lint stage... Mark Felder 2019-03-24 12:27:50 -05:00
  • b46ac71de8 Merge pull request #105 from eugenijm/fix/video-with-no-audio markf 2019-03-24 11:24:50 -05:00
  • 7bf80a5408 Handle video metadata without audio, added controller tests eugenijm 2019-03-22 08:18:23 +03:00
  • b956989d5b Merge pull request #106 from pleroma/grant_type_password_mfc_auth roger 2019-03-22 16:03:31 +01:00
  • 042e53cc39 "password" grant type support for MFC auth. Adjusted MFC-specific OAuthControllerTest module name. Ivan Tashkinov 2019-03-22 17:57:43 +03:00
  • ee29ccbb43 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2019-03-22 09:38:07 -05:00
  • b14341dce5 Merge branch 'develop' into mfc-develop Mark Felder 2019-03-22 09:37:55 -05:00
  • 9012d4a61b Merge pull request #102 from pleroma/fix/preview-uri-parsing markf 2019-03-21 16:57:09 -05:00
  • a5fd0dd633 Merge pull request #95 from eugenijm/video-metadata markf 2019-03-19 14:26:12 -05:00
  • 85c3d7c78f Fix preview link generation to work with link_name and add tests for it rinpatch 2019-03-19 20:42:06 +03:00
  • 7bdff675a4 Merge pull request #101 from pleroma/mfc-integration-granularity markf 2019-03-19 12:22:02 -05:00
  • b17255576f Use if statements instead of cond because it's shorter Mark Felder 2019-03-19 12:20:18 -05:00
  • b0f44e449b update frontend for mfcsocial Mark Felder 2019-03-19 10:12:47 -05:00
  • b1085d69ee Use same method for public notes in sync as in CommonApi. Roger Braun 2019-03-19 14:24:57 +01:00
  • 9de8f40292 Separate settings into their own cond statements so they are evaluated separately Mark Felder 2019-03-18 15:01:03 -05:00
  • 97b35e00b0 Fix with expression always matching Zachary Dunn 2019-03-18 14:59:52 +00:00
  • e572786dad Run Zachary Dunn 2019-03-18 14:53:30 +00:00
  • af4338da0c Use better error message Zachary Dunn 2019-03-18 14:52:24 +00:00
  • 5ba14c664b Fix missing end brace Zachary Dunn 2019-03-18 14:05:10 +00:00
  • a2e03d4f3c Initial attempt at updating return type Zachary Dunn 2019-03-18 13:56:59 +00:00
  • f6fab01ba7
         Web.Router: Add routes for Conversation mastoAPI Haelwenn (lanodan) Monnier 2019-03-17 17:06:28 +01:00
  • 42d034505a
         Add test for conversation API beforehand Haelwenn (lanodan) Monnier 2019-03-17 15:37:55 +01:00
  • aad78b469c Merge branch 'develop' into mfc-develop Mark Felder 2019-03-16 16:56:24 -05:00
  • 0cafa1ed59 Add configuration granularity for the different sync tasks Mark Felder 2019-03-15 11:13:56 -05:00
  • 923ee4966c Merge pull request #100 from pleroma/mfc-sync-deletion-notification markf 2019-03-14 15:28:56 -05:00
  • b2973aa0f9 Add timestamp to deletion notification. Roger Braun 2019-03-14 18:58:31 +01:00
  • 83724e0262 Merge pull request #99 from pleroma/mfc-sync-deletion-notification markf 2019-03-14 08:59:55 -05:00
  • ec3b0b4d44 Add post deletion notifications. Roger Braun 2019-03-14 08:52:44 +01:00
  • 8912546255 Merge pull request #98 from pleroma/add-reply-id-to-notification markf 2019-03-13 15:12:46 -05:00
  • e319fa25ee MFC status notifications: add the reply id. Roger Braun 2019-03-13 19:18:09 +01:00
  • 337ea3e107 Merge branch 'hotfix-0.9.999' v0.9.999 lain 2019-03-13 18:41:30 +01:00
  • 480da5d026 Update version. lain 2019-03-13 18:40:44 +01:00
  • d6c70e2ce3 Update frontend lain 2019-03-13 18:39:20 +01:00
  • ee2514a3e4 Merge branch 'develop' into mfc-develop Mark Felder 2019-03-13 10:34:31 -05:00
  • a8563d1dbd Login button clarification redux Mark Felder 2019-03-12 15:37:18 -05:00
  • d024f0ec16 Revert "Clarify login button" Mark Felder 2019-03-12 15:37:07 -05:00
  • c37784abb8 Clarify login button Mark Felder 2019-03-12 15:36:29 -05:00
  • 5fb839452a Merge pull request #97 from pleroma/feat/change-mfc-auth-page-styles markf 2019-03-12 15:14:50 -05:00
  • 90a5927814 update mfc auth styles further Shpuld Shpuldson 2019-03-12 18:14:46 +02:00
  • a80de9d537 Merge pull request #96 from pleroma/feat/change-mfc-auth-page-styles markf 2019-03-12 09:23:44 -05:00
  • 398c45949e Update mfc auth styles Shpuld Shpuldson 2019-03-11 18:21:27 +02:00
  • d87e4ae568 update frontend for mfcsocial Mark Felder 2019-03-10 10:29:48 -05:00
  • 29255cda8d Update smaller version. Mistakenly pushed full size earlier. Mark Felder 2019-03-10 10:25:32 -05:00
  • 7f33d225ae Update MFC Social square instance logo too Mark Felder 2019-03-09 18:35:30 -06:00
  • c7b7d20091 Update default avatar and favicon to new Social logo Mark Felder 2019-03-09 18:30:45 -06:00
  • 5e0a4d1f59 Correctly identify release. v0.9.99 lain 2019-03-08 12:28:57 +01:00
  • 7e67a29852 Merge branch 'master' of git.pleroma.social:pleroma/pleroma lain 2019-03-08 12:19:46 +01:00
  • 23efad96c1 Merge branch 'hotfix-0.9.99' lain 2019-03-08 12:18:03 +01:00
  • 1a64eaf554 Bump version to 0.9.99. lain 2019-03-08 12:11:30 +01:00
  • 3446de3701 Add changelog. lain 2019-03-08 12:11:18 +01:00
  • 57e9fe4dfc Update frontend lain 2019-03-08 11:55:50 +01:00
  • 5b9e4ddd6f Add video metadata eugenijm 2019-03-08 00:19:37 +03:00
  • 62463b8362 Merge pull request #94 from eugenijm/image-metadata markf 2019-03-06 10:55:18 -06:00
  • 18631e28be Pass metadata to attachments from the image converter (use Mastodon-like JSON format) eugenijm 2019-03-06 00:59:25 +03:00
  • 0f5f498ec0 Lower rich media cache TTL to 60 mins for better behavior with Share's expiring URLs Mark Felder 2019-03-06 08:52:07 -06:00
  • ad6d473e29 Merge branch 'develop' into mfc-develop Mark Felder 2019-03-05 13:06:55 -06:00
  • 8d9e6cbd57 Merge branch 'develop' into mfc-develop Mark Felder 2019-03-04 12:33:59 -06:00
  • 81cabd6880 update frontend for mfcsocial Mark Felder 2019-03-04 12:11:38 -06:00
  • 25bb11f8f6 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2019-03-04 12:09:39 -06:00
  • 558ea479c1 update frontend for social.im Mark Felder 2019-03-04 12:09:12 -06:00
  • 75cd10bb01 Merge pull request #92 from pleroma/mfc_auth_tests markf 2019-03-04 11:30:19 -06:00
  • 58512a6a67 Merge branch 'develop' into mfc-develop Mark Felder 2019-03-04 11:05:39 -06:00
  • 22ac2288be Merge remote-tracking branch 'pleroma/develop' into feature/disable-account Egor Kislitsyn 2019-03-04 20:48:43 +07:00
  • eb84de0143 allow users to disable their own account Egor Kislitsyn 2019-03-04 19:55:11 +07:00
  • 7343d9875c Added support for MFC-specific tests. Extracted MFC-specific auth tests. Ivan Tashkinov 2019-03-02 10:31:59 +03:00
  • b437598502 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2019-03-01 14:49:20 -06:00
  • 6a9c3b5f15 Add MFC auth for testing Mark Felder 2019-03-01 14:48:21 -06:00
  • a0f1c0246b Merge branch 'cherry-pick-877-to-master' into 'master' rinpatch 2019-03-01 19:37:27 +00:00
  • 28578c6ab5 activitypub: fix date header format William Pitcock 2019-03-01 12:21:09 +00:00
  • b60c05c8cd Merge pull request #91 from pleroma/mfc-auth-customization-redux markf 2019-03-01 13:09:03 -06:00
  • f2a4947643 Default auth can be declared in secrets file Mark Felder 2019-03-01 09:45:13 -06:00
  • 965b7dcdeb Merge pull request #90 from pleroma/feld-develop-sync-20180301 markf 2019-03-01 09:42:47 -06:00
  • 56c5d3fc34 MFC auth & app template customization. Ivan Tashkinov 2019-03-01 14:37:56 +03:00
  • c8d6b36e5b Merge branch 'mfc-develop' into develop-sync. Ivan Tashkinov 2019-03-01 13:44:02 +03:00
  • 1a8251ba4b Change push messages to use the same verbiage we use elsewhere in mfc-develop Mark Felder 2019-02-27 15:39:57 -06:00
  • 1ff1f7829f Merge branch 'develop' into mfc-develop Mark Felder 2019-02-26 18:12:08 -06:00
  • 7c60576d9b Merge pull request #88 from pleroma/develop-sync markf 2019-02-26 09:34:12 -06:00
  • 6a53fbe56c Merge branch 'mfc-develop' into develop-sync. Resolved conflicts, adjusted tests. Ivan Tashkinov 2019-02-26 18:21:49 +03:00
  • 8ab14ab2b0 Merge pull request #87 from pleroma/better-online-state markf 2019-02-26 07:50:36 -06:00
  • 4d59a6ee1b Save model online state in cachex to take load of the DB. Roger Braun 2019-02-26 10:48:19 +01:00
  • c91c1406ee update frontend for social.im Mark Felder 2019-02-22 16:00:29 -06:00
  • 9333e80f20 update frontend for mfcsocial Mark Felder 2019-02-22 15:49:23 -06:00
  • e58596bbdc Bump version. v0.9.9 lain 2019-02-22 16:12:04 +01:00
  • f93f79eadc Merge pull request #85 from pleroma/mfc-sync-additions markf 2019-02-21 13:51:22 -06:00
  • 044949cb22 Add username to share account sync Roger Braun 2019-02-21 20:38:24 +01:00
  • 9c10e7c78d activitypub: sign http date header William Pitcock 2019-02-21 00:23:17 +00:00
  • 9da9cacbf2 mix: add timex dependency William Pitcock 2019-02-21 00:19:49 +00:00