Commits · 94708d63705f1e4e7f3aaebb6744634237b0cf21 · normandy / pleroma

Feb 17, 2019
- Render only "id", "valid_until" and "app_name" in TokenView · 94708d63
  Maxim Filippov authored 6 years ago
  
  94708d63
Feb 13, 2019
- Update token.ex · 760fec4c
  Maxim Filippov authored 6 years ago
  
  760fec4c
- Add revoke token · 62a45bdc
  Maxim Filippov authored 6 years ago
  
  62a45bdc
- Add OAuth tokens endpoint · 61a4bc50
  Maxim Filippov authored 6 years ago
  
  61a4bc50
- Merge branch 'doc/mark-streaming-feature-for-apps-2' into 'develop' · 33f8f3c3
  kaniini authored 6 years ago
  
  Mark streaming feature for desktop apps in Clients.md See merge request pleroma/pleroma!818
  33f8f3c3
- Mark streaming feature for desktop apps in Clients.md · 16b7c071
  Hakaba Hitoyo authored 6 years ago
  
  16b7c071
- Merge branch 'bugfix/mdii-uploader' into 'develop' · 4bdb2d44
  kaniini authored 6 years ago
  
  Bugfix for MDII Uploader See merge request pleroma/pleroma!822
  4bdb2d44
- bugfix mdii uploader · b7bc6662
  hakabahitoyo authored 6 years ago
  
  b7bc6662
Feb 12, 2019
- Merge branch 'feature/csp_mastofe-dev' into 'develop' · 0534463c
  kaniini authored 6 years ago
  
  Add CSP for mastofe development, remove secure-cookies in MIX_ENV=dev See merge request pleroma/pleroma!820
  0534463c
- Plugs.HTTPSecurityPlug: Add webpacker to connect-src · da4c662a
  Haelwenn authored 6 years ago
  
  da4c662a
- Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev mode · 00e8f0b0
  Haelwenn authored 6 years ago
  
  This is needed to run dev mode mastofe at the same time
  00e8f0b0
- config/dev.exs: Don’t put secure cookies on dev · 71ce564e
  Haelwenn authored 6 years ago
  
  71ce564e
- Merge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop' · c71b3a1b
  Haelwenn authored 6 years ago
  
  Fix CSP check for 'upgrade-insecure-requests' See merge request pleroma/pleroma!814
  c71b3a1b
- Merge branch 'doc/mark-streaming-feature-for-apps' into 'develop' · e1983fca
  Haelwenn authored 6 years ago
  
  Mark streaming feature for mobile/web apps in Clients.md See merge request pleroma/pleroma!816 [ci skip]
  e1983fca
- Mark streaming feature for mobile/web apps in Clients.md · 84f22d1c
  Hakaba Hitoyo authored 6 years ago and Haelwenn committed 6 years ago
  
  84f22d1c
Feb 11, 2019
- Use url[:scheme] instead of protocol to determine if https is enabled · ea105892
  shibayashi authored 6 years ago
  
  ea105892
- Merge branch 'bugfix/keyword-policy-check-summary' into 'develop' · 39548c38
  kaniini authored 6 years ago
  
  Filter summary field in KeywordPolicy See merge request pleroma/pleroma!812
  39548c38
- Filter summary in keywordpolicy · 379d0469
  rinpatch authored 6 years ago
  
  379d0469
- Merge branch 'feature/thread-muting' into 'develop' · 39383a6b
  rinpatch authored 6 years ago
  
  Feature/thread muting See merge request pleroma/pleroma!796
  39383a6b
- Merge branch 'feature/rich-media-limits' into 'develop' · 04461629
  lain authored 6 years ago
  
  rich media: tighten fetching timeouts and size limits See merge request pleroma/pleroma!809
  04461629
- Merge branch 'develop' into feature/thread-muting · ac72b578
  Karen Konou authored 6 years ago
  
  ac72b578
- Refactor as per Rin's suggestions, add endpoint tests · c01ef574
  Karen Konou authored 6 years ago
  
  c01ef574
- Merge branch 'revert-e0de0fcf ' into 'develop' · 48552b38
  lain authored 6 years ago
  
  Revert "Merge branch 'object-creation' into 'develop'" See merge request pleroma/pleroma!810
  48552b38
- Revert "Merge branch 'object-creation' into 'develop'" · d53e36bf
  lain authored 6 years ago
  
  This reverts merge request !802
  d53e36bf
Feb 10, 2019
- rich media: tighten fetching timeouts and size limits · 45e57dd1
  kaniini authored 6 years ago
  
  45e57dd1
- Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop' · 06c4935c
  kaniini authored 6 years ago
  
  Update Mastodon Frontend to 2019-02-10 bundle See merge request pleroma/pleroma!806
  06c4935c
- Merge branch 'feather_mention' into 'develop' · 5d34e5a5
  kaniini authored 6 years ago
  
  Add Feather to the clients list See merge request pleroma/pleroma!804
  5d34e5a5
- Merge branch 'fix/credo-issues' into 'develop' · 6c8d15da
  kaniini authored 6 years ago
  
  Fix credo issues See merge request pleroma/pleroma!786
  6c8d15da
- Merge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop' · 49b5f8d7
  kaniini authored 6 years ago
  
  Update service files of OpenRC and systemd to new recommended paths See merge request pleroma/pleroma!798
  49b5f8d7
- Update service files of OpenRC and systemd to new recommended paths · d1752a81
  shibayashi authored 6 years ago
  
  d1752a81
- Update Mastodon Frontend to 2019-02-10 bundle · fcd8a2d0
  Haelwenn authored 6 years ago
  
  See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10 [ci skip]
  fcd8a2d0
- add feather to webclients · db407e4d
  succfemboi authored 6 years ago
  
  db407e4d
- Merge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop' · 57501def
  lain authored 6 years ago
  
  Recommend the acme-challenge path that is used in the installation guides See merge request pleroma/pleroma!803
  57501def
- Merge branch 'docs/pleroma-clients' into 'develop' · 612ace96
  lain authored 6 years ago
  
  docs/Clients.md: Add documentation about clients supporting pleroma See merge request pleroma/pleroma!726
  612ace96
- docs/Clients.md: Add Nekonium · 94385313
  Haelwenn authored 6 years ago
  
  [ci skip]
  94385313
- docs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabetically · daa25f34
  Haelwenn authored 6 years ago
  
  [ci skip]
  daa25f34
- docs/Clients.md: Add Social (GNOME) · f2d5989f
  Haelwenn authored 6 years ago
  
  [ci skip]
  f2d5989f
- docs/Clients.md: Add per-type sections · 91a41ec6
  Haelwenn authored 6 years ago
  
  helps differenciate between Electrons and others like Brutaldon. [ci skip]
  91a41ec6
- docs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore · 5f767be3
  Haelwenn authored 6 years ago
  
  5f767be3
- WIP: docs/Clients.md: Add documentation about clients supporting pleroma · d0cf58d0
  Haelwenn authored 6 years ago
  
  [ci skip]
  d0cf58d0