Commits · 38ff9b3568c637bd69a4bdadbdeb147d7871b09a · normandy / pleroma

Feb 08, 2019
- fix typo in config.md · 38ff9b35
  rinpatch authored 6 years ago
  
  38ff9b35
- wow · 73566592
  rinpatch authored 6 years ago
  
  73566592
- What idiot did that? (me) · f88dec8b
  rinpatch authored 6 years ago
  
  f88dec8b
- Merge branch 'develop' into feature/keyword-policy · 6c21f5aa
  rinpatch authored 6 years ago
  
  6c21f5aa
- rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy · 8a0b755c
  rinpatch authored 6 years ago
  
  8a0b755c
- Add default config for keyword policy · 2174f6eb
  rinpatch authored 6 years ago
  
  2174f6eb
- Add keyword policy · 46aa8c18
  rinpatch authored 6 years ago
  
  46aa8c18
Feb 07, 2019
- Merge branch 'remove-pawoo-apps-from-readme' into 'develop' · d84392c9
  kaniini authored 6 years ago
  
  Remove Pawoo apps from README.md See merge request pleroma/pleroma!788
  d84392c9
- Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop' · 24dd0fc5
  kaniini authored 6 years ago
  
  Mark streaming feature for Apps in README.md See merge request !789
  24dd0fc5
- Mark streaming feature for Apps in README.md · 902c72bb
  hakabahitoyo authored 6 years ago
  
  902c72bb
- Update README.md · 06373905
  Hakaba Hitoyo authored 6 years ago
  
  06373905
Feb 06, 2019
- Merge branch 'rename-followings' into 'develop' · 430f2332
  kaniini authored 6 years ago
  
  hide_followings was renamed to hide_followers in the FE, but never synced up in the BE See merge request !787
  430f2332
- hide_followings was renamed to hide_followers in the FE, but never synced up in the BE · 74518d0b
  feld authored 6 years ago
  
  This was a dirty regex replace which worked on my server
  74518d0b
- Merge branch 'bugfix/rich-media-card' into 'develop' · 1220a171
  Haelwenn authored 6 years ago
  
  rich media cards: bugfixes and regression tests See merge request !785
  1220a171
- tests: add a rich media card that contains all relevant fields · 26670b09
  kaniini authored 6 years ago
  
  26670b09
- Merge branch 'add-admin-and-moderator-fields' into 'develop' · 18e783bc
  kaniini authored 6 years ago
  
  Add admin and moderator badges to user view and make their visibility configurable See merge request !767
  18e783bc
- test: add some regression tests for the rich media card rendering · 6eb8c1eb
  kaniini authored 6 years ago
  
  6eb8c1eb
- mastodon api: rich media: don't clobber %URI struct with a string · 65a4b9fb
  kaniini authored 6 years ago
  
  65a4b9fb
- Merge branch 'mr/exsyslogger-doc-and-format' into 'develop' · 09b71a90
  Haelwenn authored 6 years ago
  
  Adds a couple examples to docs/config.md for ExSyslogger and removes duplicate timestamps from default format. See merge request !784
  09b71a90
- adds a couple of explicit examples for ExSyslogger · ab80c8eb
  Michael Loftis authored 6 years ago
  
  ab80c8eb
- Merge branch 'fix/activitypub-user-view-badmap' into 'develop' · f7aedbcc
  rinpatch authored 6 years ago
  
  Fix if clause in activity_pub user_view See merge request !783
  f7aedbcc
- Fix if clause in activity_pub user_view · f753043c
  href authored 6 years ago
  
  f753043c
- rids the duplicate timestamp from default ExSyslogger config · 43b3f9e9
  Michael Loftis authored 6 years ago
  
  43b3f9e9
- Merge branch '2019-02-06-update-frontend' into 'develop' · 3c08e20d
  lain authored 6 years ago
  
  update frontend See merge request !780
  3c08e20d
- update frontend · 78a51f4d
  lain authored 6 years ago
  
  78a51f4d
- Allow to configure visibility for admin and moderator badges · 035eaeb9
  Eugenij authored 6 years ago
  
  035eaeb9
Feb 05, 2019
- Add is_admin and is_moderator boolean fields to the user view · 398c81f9
  Eugenij authored 6 years ago
  
  398c81f9
- Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop' · c46490b1
  rinpatch authored 6 years ago
  
  rich media: parser: reject any data which cannot be explicitly encoded into JSON Closes #596 See merge request !779
  c46490b1
- rich media: parser: reject any data which cannot be explicitly encoded into JSON · d83dbd90
  kaniini authored 6 years ago
  
  d83dbd90
- Merge branch 'fix-dm-index' into 'develop' · d120aa63
  kaniini authored 6 years ago
  
  Massage index until it actually does the stuff we want. See merge request !772
  d120aa63
- Merge branch 'feature/ap-c2s-whoami' into 'develop' · 681ba1e5
  kaniini authored 6 years ago
  
  activitypub: c2s: add /api/ap/whoami endpoint for andstatus See merge request !773
  681ba1e5
- Merge branch 'testfix/twitter-api' into 'develop' · 00d572fd
  kaniini authored 6 years ago
  
  test: twitterapi: fix another possible test failure case See merge request !778
  00d572fd
- test: twitterapi: fix another possible test failure case · 73e6a1f1
  kaniini authored 6 years ago
  
  73e6a1f1
- Merge branch 'feature/split-hide-network-v2' into 'develop' · eb2b1960
  kaniini authored 6 years ago
  
  Split hide_network into hide_followers & hide_followings (fixed) See merge request !765
  eb2b1960
- Merge branch 'bugfix/rich-media-image-nil' into 'develop' · ecdb0b7f
  kaniini authored 6 years ago
  
  mastodon api: fix rendering of cards without image URLs (closes #597) Closes #597 See merge request !777
  ecdb0b7f
- test: twitterapi: fix the test breakage for real · c4d317cc
  kaniini authored 6 years ago
  
  c4d317cc
- mastodon api: fix rendering of cards without image URLs (closes #597) · 1d94b67e
  kaniini authored 6 years ago
  
  1d94b67e
- Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop' · f8b831ec
  lain authored 6 years ago
  
  activitypub: transmogrifier: fix bare tags See merge request pleroma/pleroma!774
  f8b831ec
- Merge branch 'patch-2' into 'develop' · 040ab352
  lain authored 6 years ago
  
  ARGLE GARBLE See merge request pleroma/pleroma!776
  040ab352
- Merge branch 'bugfix/rich-media-nil' into 'develop' · 8892f446
  lain authored 6 years ago
  
  html: don't attempt to parse nil content See merge request pleroma/pleroma!775
  8892f446