Commits · af68a42ef7841013476831e92d3841088fa875df · NEETzsche / pleroma

Mar 20, 2019
- [#923 ] Support for multiple OAuth consumer strategies. · af68a42e
  Ivan Tashkinov authored 6 years ago
  
  af68a42e
- [#923 ] Nickname & email selection for external registrations, option to... · e17a9a1f
  Ivan Tashkinov authored 6 years ago
  
  [#923] Nickname & email selection for external registrations, option to connect to existing account.
  e17a9a1f
Mar 18, 2019
- [#923 ] Registration validations & unique index on [:user_id, :provider]. · 40e9a04c
  Ivan Tashkinov authored 6 years ago
  
  40e9a04c
- [#923 ] External User registration refactoring, password randomization. · 8d218597
  Ivan Tashkinov authored 6 years ago
  
  8d218597
- [#923] Support for multiple (external) registrations per user via Registration. · 26b63540
  Ivan Tashkinov authored 6 years ago
  
  26b63540
- [#923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth · 2a96283e
  Ivan Tashkinov authored 6 years ago
  
  # Conflicts: # config/config.exs # lib/pleroma/web/auth/pleroma_authenticator.ex
  2a96283e
- Merge branch 'feature/allow-link-rel-attribute' into 'develop' · 1344e34e
  kaniini authored 6 years ago
  
  Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition). See merge request !946
  1344e34e
Mar 17, 2019
- Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition). · 4ed2618f
  Fong-Wan Chau authored 6 years ago
  
  4ed2618f
Mar 16, 2019
- Merge branch 'feature/federated-flags' into 'develop' · 6d6f48d0
  kaniini authored 6 years ago
  
  Federated reports See merge request pleroma/pleroma!935
  6d6f48d0
- Merge branch 'feature/oauth-me' into 'develop' · 28df3974
  lain authored 6 years ago
  
  oauth: add me property to token responses See merge request pleroma/pleroma!942
  28df3974
- Merge branch 'feature/reblog-muting' into 'develop' · c69dc2ac
  kaniini authored 6 years ago
  
  Implement mastodon's reblog hiding feature See merge request pleroma/pleroma!916
  c69dc2ac
- Merge branch 'bugfix/ldap-test-fix' into 'develop' · f58d47d6
  kaniini authored 6 years ago
  
  test: fix defective ldap setup/teardown See merge request pleroma/pleroma!943
  f58d47d6
- test: fix defective ldap setup/teardown · 40134598
  kaniini authored 6 years ago
  
  40134598
- oauth: add me property to token responses · e0edc706
  kaniini authored 6 years ago
  
  e0edc706
- Merge branch 'mark-notifications-as-read' into 'develop' · 532e8b0a
  kaniini authored 6 years ago
  
  Allow to mark a single notification as read See merge request pleroma/pleroma!941
  532e8b0a
Mar 15, 2019
- Allow to mark a single notification as read · 43fb03be
  Eugenij authored 6 years ago
  
  43fb03be
- Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into 'develop' · 4b3c86c1
  kaniini authored 6 years ago
  
  MediaProxy: parse filename from content-disposition for non-whitelisted types See merge request pleroma/pleroma!936
  4b3c86c1
- Merge branch 'feature/openldap-support' into 'develop' · 8b352af4
  kaniini authored 6 years ago
  
  OpenLDAP support Closes #203 See merge request pleroma/pleroma!859
  8b352af4
- Merge branch 'enable-dedupe-by-default' into 'develop' · acf215d9
  kaniini authored 6 years ago
  
  Enable dedupe by default See merge request pleroma/pleroma!939
  acf215d9
- Merge branch 'docs/ex_doc-929-wiki-imports' into 'develop' · b010f973
  kaniini authored 6 years ago
  
  Fix headers and add !929 docs to extras See merge request pleroma/pleroma!940
  b010f973
- Add tests for LDAP authorization · a070dd4a
  link0ff authored 6 years ago
  
  a070dd4a
- Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth · 27390574
  Ivan Tashkinov authored 6 years ago
  
  27390574
- [#923 ] OAuth: prototype of sign in / sign up with Twitter. · aacbf0f5
  Ivan Tashkinov authored 6 years ago
  
  aacbf0f5
- remove unused function · d8244c2a
  Karen Konou authored 6 years ago
  
  d8244c2a
- fix credo warning · dfeb3aec
  Karen Konou authored 6 years ago
  
  dfeb3aec
- formatting · 094e1ef0
  Karen Konou authored 6 years ago
  
  094e1ef0
- Fix streamer test · ebfc10c8
  Karen Konou authored 6 years ago
  
  ebfc10c8
- Refactor to store user ap_id, add tests · da53c079
  Karen Konou authored 6 years ago
  
  da53c079
- formatting · be465c76
  Karen Konou authored 6 years ago
  
  be465c76
- refactor filtering mechanism · 15b21d19
  Karen Konou authored 6 years ago
  
  15b21d19
- Fix elixir 1.8 vs 1.7 format conflict · aa71139e
  Karen Konou authored 6 years ago
  
  aa71139e
- Add ActivityPub.contain_activity checks to streamer · fe4c1d26
  Karen Konou authored 6 years ago
  
  fe4c1d26
- Fix tests to assume reblogs shown by default · 13c298d3
  Karen Konou authored 6 years ago
  
  13c298d3
- Implement mastodon's reblog hiding feature · c8f31e0b
  Karen Konou authored 6 years ago
  
  c8f31e0b
- Fix headers and add !929 docs to extras · f5b54acc
  Haelwenn authored 6 years ago
  
  [ci skip]
  Verified
  
  f5b54acc
- Merge branch 'mastoapi/mime_type' into 'develop' · 41fc67aa
  Haelwenn authored 6 years ago
  
  Extend MastoAPI to provide attachment mimetypes See merge request !938
  41fc67aa
- Enable dedupe by default · 28cfb2c3
  rinpatch authored 6 years ago
  
  28cfb2c3
- Extend MastoAPI to provide attachment mimetypes · d7a34b60
  rinpatch authored 6 years ago
  
  d7a34b60
- Content-Disposition regex improvements · d02f1120
  rinpatch authored 6 years ago
  
  d02f1120
- Merge branch 'notifications-is-seen' into 'develop' · 0f42ea87
  kaniini authored 6 years ago
  
  MastoAPI notifications is_seen See merge request !934
  0f42ea87