Commits · 0283b9c4dd84b0564ff25f404131d5bb44fcbb36 · mfc / pleroma · GitLab

Snippets Groups Projects

May 16, 2019
- update frontend for mfcsocial via pleroma-fe@2069f07c · 0283b9c4
  feld authored 5 years ago
  
  0283b9c4
May 15, 2019
- update frontend for mfcsocial via pleroma-fe@e37fe6cf · 2c526017
  feld authored 5 years ago
  
  2c526017
May 11, 2019
- update frontend for mfcsocial via pleroma-fe@603ba4d7 · 6f46d3e8
  feld authored 5 years ago
  
  6f46d3e8
May 10, 2019
- Merge branch 'conversations-import' of git.pleroma.social:/pleroma/pleroma into mfc-develop · 8a7da56e
  feld authored 5 years ago
  
  8a7da56e
May 09, 2019
- update frontend for mfcsocial via pleroma-fe@58cd7814 · a9808c76
  feld authored 5 years ago
  
  a9808c76
- update frontend for social.im via pleroma-fe@7e65698b · e18cbf13
  feld authored 5 years ago
  
  e18cbf13
- Conversations: Import order, import as read. · a33bec7d
  lain authored 5 years ago
  
  a33bec7d
May 08, 2019
- update frontend for mfcsocial via pleroma-fe@db86f438 · a18613f4
  feld authored 5 years ago
  
  a18613f4
- Merge remote-tracking branch 'origin/conversations-import' into mfc-develop · 885ea487
  feld authored 5 years ago
  
  885ea487
- Merge branch 'develop-sync-2019-05-08' into 'mfc-develop' · e667bb33
  feld authored 5 years ago
  e667bb33
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into mfc-develop · f7c96e3c
  lain authored 5 years ago
  
  f7c96e3c
- Credo fixes. · e6d7f8d2
  lain authored 5 years ago
  
  e6d7f8d2
- Conversations: Add mix task to 'import' old DMs. · 6d19bb4e
  lain authored 5 years ago
  
  6d19bb4e
- Visibility: Make it more resilient. · a4598b5e
  lain authored 5 years ago
  
  a4598b5e
- ActivityPub: Remove leftover printf debugging. · 920bd470
  lain authored 5 years ago
  
  920bd470
- Conversations: Add a function to 'import' old DMs. · fcf2f38d
  lain authored 5 years ago
  
  fcf2f38d
- Merge branch 'feature/761-add-users-filtration' into 'develop' · c2efc689
  kaniini authored 5 years ago
  c2efc689
- Merge develop · bfeb33e9
  Alexander Strizhakov authored 5 years ago
  bfeb33e9
- Merge branch 'fix/851-emoji-redirect-follow' into 'develop' · 289b8224
  lain authored 5 years ago
  289b8224
- emoji dowload follow redirects · a76e2622
  Alexander Strizhakov authored 5 years ago
  
  a76e2622
- Merge branch 'refactor/oauth_scopes' into 'develop' · aa8a6e7b
  lain authored 5 years ago
  aa8a6e7b
- Refactoring functions for dealing with oauth scopes. · 799e1f48
  Maksim authored 5 years ago and lain committed 5 years ago
  
  799e1f48
May 07, 2019
- Merge branch 'mfc-develop' of git.pleroma.social:mfc/pleroma into mfc-develop · ca94293f
  feld authored 5 years ago
  
  ca94293f
- update frontend for mfcsocial via pleroma-fe@ddb3f6ec · 3cb472ea
  feld authored 5 years ago
  
  3cb472ea
- Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop' · 14deed7f
  kaniini authored 5 years ago
  14deed7f
- twitterapi: use order constraint to force descending order · d64c3b60
  kaniini authored 5 years ago
  
  d64c3b60
- activitypub: add optional order constraint to timeline query builder · 6020ff3f
  kaniini authored 5 years ago
  
  6020ff3f
- Remove `bookmarks` assoc and add a fake `bookmark` assoc instead · 4c5125de
  rinpatch authored 5 years ago and kaniini committed 5 years ago
  
  4c5125de
- Use with_preloaded_bookmark in create_by_object_ap_id_with_object · be067ec2
  rinpatch authored 5 years ago and kaniini committed 5 years ago
  
  be067ec2
- - Actually use preloaded bookmarks in views · 3a7c1464
  rinpatch authored 5 years ago and kaniini committed 5 years ago
  3a7c1464
- Preload bookmarks wherever the object is preloaded · f841eb7c
  rinpatch authored 5 years ago and kaniini committed 5 years ago
  
  f841eb7c
- Remove bookmarks assoc · 06947c91
  rinpatch authored 5 years ago and kaniini committed 5 years ago
  
  06947c91
- Merge branch 'merge/20190507' into 'mfc-develop' · a7bdb0bf
  feld authored 5 years ago
  a7bdb0bf
- Merge branch 'develop' into merge/20190507 · 5e281aee
  feld authored 5 years ago
  
  5e281aee
- Merge branch 'docs/MRF-modules' into 'develop' · a1a0df19
  kaniini authored 5 years ago
  a1a0df19
- containment: remove pointless moduledoc line · e71ddf23
  kaniini authored 5 years ago
  
  e71ddf23
- Merge branch 'conversations_three' into 'develop' · 238dd72f
  lain authored 5 years ago
  238dd72f
- Merge branch 'unused-config-parameter' into 'develop' · 6518644d
  rinpatch authored 5 years ago
  6518644d
- unused config paramater · f46295fa
  Alexander Strizhakov authored 5 years ago
  
  f46295fa
- Merge branch 'fix/ex_doc-source-links' into 'develop' · d26998c2
  rinpatch authored 5 years ago
  d26998c2