Commits · 7c7a6509b92e335c42c36f6b4b414305e0c09f4b · Alex Gleason / pleroma

Jun 26, 2020
- Merge branch 'hotfix/preload-tests-nodeinfo' into 'develop' · 7c7a6509
  Haelwenn authored 4 years ago
  
  nodeinfo: Fix MRF transparency See merge request pleroma/pleroma!2689
  7c7a6509
- nodeinfo: Fix MRF transparency · d6c958b4
  Haelwenn authored 4 years ago
  
  Verified
  
  d6c958b4
Jun 25, 2020
- Merge branch 'preload-data' into 'develop' · 82884196
  feld authored 4 years ago
  
  Preload data into index.html Closes #1660 See merge request pleroma/pleroma!2381
  82884196
- Merge branch 'mastoapi-omitted' into 'develop' · 2e39fbe0
  feld authored 4 years ago
  
  MastoAPI differences: Document not implemented features See merge request pleroma/pleroma!2687
  2e39fbe0
- Merge branch 'update/admin-fe-20200625' into 'develop' · bb275c49
  feld authored 4 years ago
  
  Update AdminFE build See merge request pleroma/pleroma!2688
  bb275c49
- Update AdminFE build · d9e46236
  feld authored 4 years ago
  
  d9e46236
- MastoAPI differences: Document not implemented features · 28d4e60f
  Alex Gleason authored 4 years ago
  
  Verified
  
  28d4e60f
- Merge branch 'chore/remove-reference-to-distsn' into 'develop' · 1d0804b4
  lain authored 4 years ago
  
  Remove reference to defunct distsn.org See merge request pleroma/pleroma!2675
  1d0804b4
- Apply suggestion to config/description.exs · f585622f
  lain authored 4 years ago
  
  f585622f
- Merge branch 'issue/1872-ex_aws' into 'develop' · 1cd1977c
  lain authored 4 years ago
  
  [#1872] use Pleroma.HTTP for ExAws.S3 See merge request pleroma/pleroma!2683
  1cd1977c
- Merge branch 'fix/following-request-from-deactivated' into 'develop' · 0e26ef2a
  lain authored 4 years ago
  
  Filter outstanding follower requests from deactivated accounts Closes #1771 See merge request pleroma/pleroma!2682
  0e26ef2a
- added wrapper Pleroma.HTTP for ExAws.S3 · 439a1a02
  Maksim authored 4 years ago
  
  439a1a02
Jun 24, 2020
- Filter outstanding follower requests from deactivated accounts · 67ab5805
  feld authored 4 years ago
  
  67ab5805
- Merge branch 'fix-emoji-pagination' into 'develop' · ae94fcc9
  lain authored 4 years ago
  
  Fix for emoji pagination in pack show See merge request pleroma/pleroma!2681
  ae94fcc9
- fix for emoji pagination in pack show · aae1af8c
  Alexander Strizhakov authored 4 years ago
  
  Verified
  
  aae1af8c
- Merge branch 'feature/admin-api-status-count-per-instance' into 'develop' · 88ccade1
  lain authored 4 years ago
  
  admin api status count per instance See merge request pleroma/pleroma!2500
  88ccade1
- Merge branch 'issue/1872-updated-tzdata' into 'develop' · 510031ec
  lain authored 4 years ago
  
  [#1872] use Pleroma.HTTP for Tzdata See merge request pleroma/pleroma!2678
  510031ec
- Apply suggestion to test/http/tzdata_test.exs · 65f3eb33
  lain authored 4 years ago
  
  65f3eb33
- added wrapper Pleroma.HTTP for Tzdata.HTTPClient · 721fc7c5
  Maksim authored 4 years ago
  
  721fc7c5
Jun 23, 2020
- Merge branch 'moving-mrf-namespace-migration-fix' into 'develop' · b4a502fc
  feld authored 4 years ago
  
  Moving to mrf namespace migration fix See merge request pleroma/pleroma!2676
  b4a502fc
- Merge branch 'update-validator' into 'develop' · 98af7b59
  lain authored 4 years ago
  
  Update validator See merge request pleroma/pleroma!2668
  98af7b59
- Merge develop · 1471b70e
  Roman Chvanikov authored 4 years ago
  
  1471b70e
- moving to mrf namespace migration fix · cb96c82f
  Alexander Strizhakov authored 4 years ago
  
  Verified
  
  cb96c82f
- Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop' · c7d69e92
  Haelwenn authored 4 years ago
  
  Moving mrf settings from instance to separate mrf group Closes #1631 See merge request pleroma/pleroma!2320
  c7d69e92
- Remove reference to defunct distsn.org · 54039100
  feld authored 4 years ago
  
  54039100
- Merge branch 'issue/1798' into 'develop' · b7f297f0
  lain authored 4 years ago
  
  [#1798] fixed migration the settings to DB See merge request pleroma/pleroma!2655
  b7f297f0
- ObjectValidator: Clarify type of object. · aee815b4
  lain authored 4 years ago
  
  aee815b4
- Merge branch 'fix_1586_provide_index_md' into 'develop' · 59e2a101
  lain authored 4 years ago
  
  Fix 1586 provide index md See merge request pleroma/pleroma!2669
  59e2a101
- ActivityPubControllerTest: Capture error log · adc199c6
  lain authored 4 years ago
  
  adc199c6
- ActivityPubControllerTest: Testing changes. · d93e0113
  lain authored 4 years ago
  
  d93e0113
- An act of desperation. · 2737809b
  lain authored 4 years ago
  
  2737809b
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator · 2c603f20
  lain authored 4 years ago
  
  2c603f20
- fix tests · 84aa9c78
  Maksim authored 4 years ago
  
  84aa9c78
- added tests · 2715c40e
  Maksim authored 4 years ago
  
  2715c40e
- Merge branch '@doc/apc2s-upload-media' into 'develop' · 3875a507
  Haelwenn authored 4 years ago
  
  ActivityPubController: Update upload_media @doc See merge request pleroma/pleroma!2673
  3875a507
- ActivityPubController: Update upload_media @doc · c116b6d6
  Haelwenn authored 4 years ago
  
  Small cherry-pick from pleroma/pleroma!1810
  Verified
  
  c116b6d6
- Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop' · d21ef5e6
  Haelwenn authored 4 years ago
  
  Add missing default config value for :instance, instance_thumbnail See merge request pleroma/pleroma!2672
  d21ef5e6
Jun 22, 2020
- Do not need a function to provide fallback value with default defined in config.exs · df5e048c
  feld authored 4 years ago
  
  df5e048c
- Add missing default config value for :instance, instance_thumbnail · bf8310f3
  feld authored 4 years ago
  
  Follows up on b7fc61e1
  bf8310f3
- Merge branch 'warning/mastofe-settings-blob' into 'develop' · 98f014d3
  Haelwenn authored 4 years ago
  
  Add warning against parsing/reusing MastoFE settings blob See merge request pleroma/pleroma!2671
  98f014d3