Commits · revert-db045c20 · mfc / pleroma · GitLab

Snippets Groups Projects

Jul 30, 2019
- Revert "Merge branch 'to-jpeg' into 'mfc-develop'" · e240784f
  feld authored 5 years ago
  e240784f
- Merge branch 'to-jpeg' into 'mfc-develop' · db045c20
  feld authored 5 years ago
  db045c20
Jul 24, 2019
- Merge branch 'merge/develop-20190724' into 'mfc-develop' · 5ceaf63d
  feld authored 5 years ago
  5ceaf63d
- Merge branch 'develop' into merge/develop-20190724 · 97560e0a
  feld authored 5 years ago
  
  97560e0a
- Merge branch 'mfc-develop' of git.pleroma.social:mfc/pleroma into mfc-develop · 875e067a
  feld authored 5 years ago
  
  875e067a
- update frontend for socialdev via pleroma-fe@b15880cc · d7a7df0b
  feld authored 5 years ago
  
  d7a7df0b
- Merge branch 'egor/custom-fields' into 'mfc-develop' · 449d02dc
  feld authored 5 years ago
  449d02dc
- Merge branch 'egor/fix-meta' into 'mfc-develop' · 93671d48
  feld authored 5 years ago
  93671d48
- Merge branch 'fix/Upload_base_url' into 'develop' · acd20914
  kaniini authored 5 years ago
  acd20914
- Do not prepend /media/ when using base_url · 84fca14c
  feld authored 5 years ago and kaniini committed 5 years ago
  84fca14c
- Merge branch 'tests/web_finger' into 'develop' · 7286cdff
  kaniini authored 5 years ago
  7286cdff
- tests WebFinger · 55341ac7
  Maksim authored 5 years ago and kaniini committed 5 years ago
  
  55341ac7
- Merge branch 'domain-blocking-relationship-api' into 'develop' · b7fae304
  kaniini authored 5 years ago
  b7fae304
- Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships) · 45041358
  Eugenij authored 5 years ago and kaniini committed 5 years ago
  
  45041358
- Fix tests · c71b7ad5
  minibikini authored 5 years ago
  
  c71b7ad5
- Add custom profile fields · 5b8fe2d2
  minibikini authored 5 years ago
  
  5b8fe2d2
- Merge branch 'develop' into 'develop' · 53fad36b
  lain authored 5 years ago
  53fad36b
- check both item and parent domain blocks · f5d574f4
  Sadposter authored 5 years ago
  
  f5d574f4
- move domain block check to with block · 48bd3be9
  Sadposter authored 5 years ago
  
  48bd3be9
- honour domain blocks on streaming notifications · 4af4f616
  Sadposter authored 5 years ago
  
  4af4f616
- Fix warnings · f6f7abb6
  minibikini authored 5 years ago
  
  f6f7abb6
- Merge remote-tracking branch 'origin/mfc-develop' into egor/fix-meta · b3fea82c
  minibikini authored 5 years ago
  
  b3fea82c
- Merge branch 'Fix-static-dir-doc' into 'develop' · 0be548b9
  kaniini authored 5 years ago
  0be548b9
- Add text about gitignore · 9638da43
  aries authored 5 years ago
  
  9638da43
Jul 23, 2019
- Merge branch 'feature/admin-api-user-statuses' into 'develop' · 9c635732
  kaniini authored 5 years ago
  9c635732
- Merge branch 'bugfix/rich-media-splice-url' into 'develop' · 2ae510ee
  kaniini authored 5 years ago
  2ae510ee
- rich media: parser: splice the given URL into the result · d3bdb8e7
  kaniini authored 5 years ago
  
  d3bdb8e7
- Merge branch 'develop' into feature/admin-api-user-statuses · f46805bb
  Maxim Filippov authored 5 years ago
  
  f46805bb
- AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses) · 03471151
  Maxim Filippov authored 5 years ago
  
  03471151
- Merge branch 'chore/update-mix-lock' into 'develop' · 1a751529
  kaniini authored 5 years ago
  1a751529
- update mix.lock · 0afaf966
  kaniini authored 5 years ago
  
  0afaf966
- Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop' · bd265acf
  kaniini authored 5 years ago
  bd265acf
- Router: Remove deprecated AdminAPI endpoints · 90be91b0
  Haelwenn authored 5 years ago
  
  90be91b0
- Merge branch 'admin-config-fix' into 'develop' · 5230b9ef
  kaniini authored 5 years ago
  5230b9ef
- Admin config fix · 5e72554f
  Alexander Strizhakov authored 5 years ago and kaniini committed 5 years ago
  
  5e72554f
- Merge branch 'tests/activity_pub_publisher' into 'develop' · dd96be5c
  kaniini authored 5 years ago
  dd96be5c
- tests for Pleroma.Web.ActivityPub.Publisher · c49a09ed
  Maksim authored 5 years ago and kaniini committed 5 years ago
  
  c49a09ed
- Merge branch 'bugfix/unauthed-liked-by' into 'develop' · 8d3cf7e5
  kaniini authored 5 years ago
  8d3cf7e5
- Merge branch 'patch-2' into 'develop' · ad608373
  kaniini authored 5 years ago
  ad608373
- Merge branch 'fix/subscriber-notifications' into 'develop' · 03d89e18
  kaniini authored 5 years ago
  03d89e18