Commits · 8d13c42926450aff6a0062f092cd1a5d59f99869 · jeff / pleroma

May 11, 2019
- Merge branch 'feature/adminfe' into 'develop' · 8d13c429
  Haelwenn authored 5 years ago
  8d13c429
- Initial bundle of basic AdminFE · c953ae8c
  feld authored 5 years ago and Haelwenn committed 5 years ago
  c953ae8c
May 10, 2019
- Merge branch 'fix/retweet-language' into 'develop' · 17d01869
  lain authored 5 years ago
  17d01869
May 09, 2019
- Use "repeated" instead of "retweeted" for repeated statuses in Twitter API · 2a54e8c1
  Francis Dinh authored 5 years ago
  2a54e8c1
- Merge branch 'improve/gitignore' into 'develop' · e4bc4408
  Haelwenn authored 5 years ago
  e4bc4408
- Prevent committing code coverage results to the repo · c869ec25
  feld authored 5 years ago
  
  c869ec25
May 08, 2019
- 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 '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 '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
- Fix/ex_doc source links · c81b7070
  xse authored 5 years ago
  
  c81b7070
May 06, 2019
- Merge branch 'issue_800' into 'develop' · 6b79be4a
  lain authored 5 years ago
  6b79be4a
- fix format · 1040caf0
  Maksim authored 5 years ago and lain committed 5 years ago
  1040caf0
- Merge branch 'feature/bbs' into 'develop' · aacac9da
  lain authored 5 years ago
  aacac9da
- Merge branch 'feature/845-improve-status-deletion' into 'develop' · 4dabf64a
  lain authored 5 years ago
  4dabf64a
- Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into... · ce6ca0fe
  Alexander Strizhakov authored 5 years ago and lain committed 5 years ago
  ce6ca0fe
- Remove H1 in @moduledoc · 69a50748
  Haelwenn authored 5 years ago
  
  69a50748
- mrf/tag_policy.ex: Add some documentation · e41a2f98
  Haelwenn authored 5 years ago
  e41a2f98
- Add short documentation on every MRF Policy · af62ace9
  Haelwenn authored 5 years ago
  
  af62ace9
May 04, 2019
- BBS: Credo fixes. · eb0fb73d
  lain authored 5 years ago
  
  eb0fb73d
- BBS: Fix tests. · c58fd4c0
  lain authored 5 years ago
  
  c58fd4c0
- BBS: Use cached user fetcher. · c9d1cb2d
  lain authored 5 years ago
  
  c9d1cb2d
- BBS: small fixes. · 4c76f49e
  lain authored 5 years ago
  
  4c76f49e
- Merge remote-tracking branch 'origin/develop' into feature/bbs · 6ad8ddfd
  lain authored 5 years ago
  
  6ad8ddfd