Commits · 06947c91471fda6e774c5b6fc04720b87db2b1e6 · jeff / pleroma

May 07, 2019
- Remove bookmarks assoc · 06947c91
  rinpatch authored 5 years ago and kaniini committed 5 years ago
  
  06947c91
- 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
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
May 03, 2019
- Merge branch 'fix/embeded-relationship-in-follows' into 'develop' · d089ff24
  rinpatch authored 5 years ago
  d089ff24
- Merge branch 'fix-search-speed' into 'develop' · 9907e974
  rinpatch authored 5 years ago
  9907e974
- Just have Benchee in all environments. · a23206a4
  lain authored 5 years ago
  
  a23206a4
- Mix: Also have benchee in test. · a7709cc2
  lain authored 5 years ago
  
  a7709cc2
- Merge branch 'bugfix/emoji-size' into 'develop' · 4948a73e
  lain authored 5 years ago
  4948a73e
- Search: Add fts index on objects table. · 0e37fddd
  lain authored 5 years ago
  
  0e37fddd
- MastoAPI: profile update with emoji_map · b5ad1715
  Haelwenn authored 6 years ago
  
  b5ad1715
- TwitterAPI: profile update with emoji_map · 46bbf9e1
  Haelwenn authored 6 years ago
  
  46bbf9e1
- Web.TwitterAPI.UserView: Also view local user emojis · 85434669
  Haelwenn authored 6 years ago
  
  85434669
- formatter.ex: Add get_emoji_map/1 · 2f76a40d
  Haelwenn authored 6 years ago
  
  2f76a40d
- Pleroma.User: remove emojify on parse_bio · d70af321
  Haelwenn authored 6 years ago
  
  d70af321
- Pleroma.Formatter: width/height to class=emoji · 85b5c606
  Haelwenn authored 6 years ago
  
  85b5c606
- Credo fixes. · c42ded13
  lain authored 5 years ago
  
  c42ded13
- Merge branch 'fix/replace-ws' into 'develop' · 027ded0d
  lain authored 5 years ago
  027ded0d
- Standardize construction of websocket URL · acb04306
  feld authored 5 years ago and lain committed 5 years ago
  acb04306
- MastodonApi: Bump api level. · a0c755cc
  lain authored 5 years ago
  
  a0c755cc
- Streamer: Stream out Conversations/Participations. · 81d1aa42
  lain authored 5 years ago
  
  81d1aa42
May 02, 2019
- Fix embeded relationships in Mastodon API · 38b79461
  rinpatch authored 5 years ago
  38b79461
- Merge branch 'iss-849' into 'develop' · 497d34b8
  lain authored 5 years ago
  497d34b8
- Add oauth plug tests for url and body parameters · a53a6c9d
  h3poteto authored 5 years ago
  
  a53a6c9d
- fix: Add mix deps.get before unit-testing · dff6afc7
  h3poteto authored 5 years ago
  
  dff6afc7
- Parse access_token from body parameters and URL parameters · 533d8cd5
  h3poteto authored 5 years ago
  
  533d8cd5
May 01, 2019
- Fix tests · 8af55728
  Roman Chvanikov authored 6 years ago and lain committed 5 years ago
  
  8af55728
- Merge remote-tracking branch 'origin/develop' into conversations_three · 45f790be
  lain authored 5 years ago
  
  45f790be