Commits · 3d24a0917b7b781518e9194909ff73c0a6247218 · phaer / pleroma

Feb 28, 2020

feld authored 5 years ago

- Removed Grouped Reports; API needs proper architecture/refactor
- Cannot set Tesla adapter in AdminFE as it's not safe yet
- Layout/rendering improvements

3d24a091

Feb 26, 2020
- Merge branch 'feat/instance-gen-improvements' into 'develop' · fda6f35a
  lain authored 5 years ago
  
  small instance.gen task improvements See merge request pleroma/pleroma!2245
  fda6f35a
Feb 25, 2020
- instance.gen task: make example instance name less confusing · 3bbfebd1
  rinpatch authored 5 years ago
  
  See pleroma/pleroma!2245 (comment 52217)
  3bbfebd1
- instance.gen task: remind to transfer the config to the database after · 359faa86
  rinpatch authored 5 years ago
  
  migrations
  359faa86
- instance.gen task: make instance name default to the domain · cfa28dee
  rinpatch authored 5 years ago
  
  cfa28dee
- Merge branch 'fix/dialyzer-warnings' into 'develop' · 8b4d1a0b
  rinpatch authored 5 years ago
  
  Fix Dialyzer warnings See merge request pleroma/pleroma!2242
  8b4d1a0b
- Merge branch 'merge/admin-fe-20200225' into 'develop' · 2cd253f6
  feld authored 5 years ago
  
  Update AdminFE build See merge request !2244
  2cd253f6
- Update AdminFE build · 554bc88e
  feld authored 5 years ago
  
  554bc88e
- Merge branch 'token-web-push-test' into 'develop' · 97dae772
  feld authored 5 years ago
  
  Add a test to ensure OAuth tokens are tied to Push subscriptions Closes #1551 See merge request !2241
  97dae772
- Fix Dialyzer warnings · 22018ada
  minibikini authored 5 years ago
  
  22018ada
- Add a test to ensure OAuth tokens are tied to Push subscriptions · c495e6d3
  minibikini authored 5 years ago
  
  c495e6d3
- Merge branch 'test-fix' into 'develop' · 87e8d792
  lain authored 5 years ago
  
  Compile fix in tests See merge request !2239
  87e8d792
- compile fix · 3eccdd15
  Alexander Strizhakov authored 5 years ago
  
  3eccdd15
Feb 24, 2020
- Merge branch 'fix/instance-gen-custom-static' into 'develop' · 035c2c14
  rinpatch authored 5 years ago
  
  instance.gen task: fix crash when using custom static directory Closes #1082 See merge request pleroma/pleroma!2237
  035c2c14
- instance.gen task: fix crash when using custom static directory · 5e4fe0e8
  rinpatch authored 5 years ago
  
  Closes #1082
  5e4fe0e8
- Merge branch 'status-visibility-count-stats' into 'develop' · 908b6ee4
  Haelwenn authored 5 years ago
  
  Status count by visibility scope (`GET /api/pleroma/admin/stats` ) See merge request !2097
  908b6ee4
- Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope · 7ad5c51f
  Eugenij authored 5 years ago
  
  7ad5c51f
- Merge branch 'theming_your_instance' into 'develop' · d240ce41
  lain authored 5 years ago
  
  DOCS Theming your instance See merge request !2232
  d240ce41
- DOCS Theming your instance · c0146f48
  Ilja authored 5 years ago and lain committed 5 years ago
  
  I added a new file to explain * where a custom theme can be created * where themes can be downloaded * where to add the theme on the server * how to make the theme available on the instance * how to set the theme as default on the instance
  c0146f48
- Merge branch 'bugfix/captcha-nil-answer_data' into 'develop' · 81f29e7c
  lain authored 5 years ago
  
  Bugfix: return invalid when answer_data is nil Closes #1585 See merge request pleroma/pleroma!2236
  81f29e7c
- Merge branch '1505-threads-federation' into 'develop' · 1e1156b6
  Haelwenn authored 5 years ago
  
  [#1505] Threads / replies federation Closes #1505 See merge request pleroma/pleroma!2129
  1e1156b6
- Captcha: return invalid when answer_data is nil · f9fe6a9e
  Haelwenn authored 5 years ago
  
  f9fe6a9e
- captcha_test.exs: Use the same testing logic in Kocaptcha and native · ee57663d
  Haelwenn authored 5 years ago
  
  ee57663d
Feb 22, 2020
- Merge branch 'fix/missing-config-settings' into 'develop' · 1961a680
  feld authored 5 years ago
  
  Add missing invites_enabled and account_activation_required settings See merge request !2234
  1961a680
- Add missing invites_enabled and account_activation_required settings · 9fe60c3b
  feld authored 5 years ago
  
  9fe60c3b
- Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation · 8f0ca19b
  Ivan Tashkinov authored 5 years ago
  
  # Conflicts: # CHANGELOG.md # config/config.exs
  8f0ca19b
Feb 21, 2020
- Merge branch 'patch-1' into 'develop' · 114e7b76
  lain authored 5 years ago
  
  added why doing a vacuum after restoring a backup is so important See merge request pleroma/pleroma!2230
  114e7b76
- added why doing a vacuum after restoring a backup is so important · 1ed485ec
  Igeljäger authored 5 years ago
  
  1ed485ec
Feb 20, 2020
- Merge branch 'migration-fixes-20' into 'develop' · 292031f6
  Haelwenn authored 5 years ago
  
  Migrations: Make them not fail for old databases See merge request !2227
  292031f6
- Merge branch 'fix/gin-fuzzy' into 'develop' · 499d9405
  Haelwenn authored 5 years ago
  
  Improve GIN full text search performance See merge request !2228
  499d9405
- Merge branch 'single_emoji_reaction' into 'develop' · c5570e04
  Haelwenn authored 5 years ago
  
  Single emoji reaction Closes #1578 See merge request !2226
  c5570e04
- Apply database session parameter to improve GIN full text search · b6bb73f4
  feld authored 5 years ago
  
  b6bb73f4
- Migrations: Make them not fail for old databases · 2d5cf0f8
  lain authored 5 years ago
  
  2d5cf0f8
- [#1505 ] Typo fix. · 0d14c3f4
  Ivan Tashkinov authored 5 years ago
  
  0d14c3f4
- Merge branch 'require-signature' into 'develop' · 3eddd9ca
  lain authored 5 years ago
  
  Add an option to require fetches to be signed Closes #1444 See merge request pleroma/pleroma!2071
  3eddd9ca
- Merge branch 'features/remote-follow-userpage-redirect' into 'develop' · c69b04c4
  lain authored 5 years ago
  
  remote_follow_controller.ex: Redirect to the user page on success Closes #1245 See merge request pleroma/pleroma!2123
  c69b04c4
- Merge branch 'docs_updating' into 'develop' · d536a00d
  lain authored 5 years ago
  
  DOCS Add OTP to updating.md See merge request pleroma/pleroma!2108
  d536a00d
- Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation · 0c65a8c3
  Ivan Tashkinov authored 5 years ago
  
  # Conflicts: # config/config.exs
  0c65a8c3
- Merge branch 'feature/new-registrations-digest' into 'develop' · e0b2de63
  lain authored 5 years ago
  
  New users digest email Closes #1514 See merge request pleroma/pleroma!2128
  e0b2de63
- [#1505 ] Fixed @spec for Queries.by_object_in_reply_to_id/3 · 34322946
  Ivan Tashkinov authored 5 years ago
  
  34322946