Commits · 0a41786624454d26fd966748735a8f2333bf4012 · Pleroma / pleroma

28 Dec, 2018 2 commits
- [#467 ] Refactored valid / invalid user rendering. · 0a417866
  Ivan Tashkinov authored Dec 28, 2018
  
  0a417866
- [#471 ] Factored out User.visible_for?/2. · 0d1788ce
  Ivan Tashkinov authored Dec 28, 2018
  
  0d1788ce
27 Dec, 2018 1 commit
- [#471 ] Prevented rendering of inactive local accounts. · e6aeb1d4
  Ivan Tashkinov authored Dec 27, 2018
  
  e6aeb1d4
26 Dec, 2018 2 commits

Merge branch 'fix/ci-set-mix-env-globally' into 'develop' · 92b11449

Haelwenn authored Dec 26, 2018

[CI] Set MIX_ENV to test in `variables` section instead of specifying it before the command. Fix `mix compile` compiling in dev env.

See merge request !596

92b11449

[CI] Set MIX_ENV to test in `variables` section instead of specifying it... · e31b4d05

Rin Toshaka authored Dec 26, 2018

[CI] Set MIX_ENV to test in `variables` section instead of specifying it before the command. Fix `mix compile` compiling in the dev env.

e31b4d05

25 Dec, 2018 1 commit
- Merge branch 'legal-boilerplate' into 'develop' · 922abcda
  lain authored Dec 25, 2018
```
Legal boilerplate

See merge request !592
```
  922abcda
23 Dec, 2018 17 commits
- tests: add legal boilerplate · 3c08d229
  kaniini authored Dec 23, 2018
  
  3c08d229
- mix tasks: add legal boilerplate · 69ad1039
  kaniini authored Dec 23, 2018
  
  69ad1039
- add license boilerplate to pleroma core · 2791ce9a
  kaniini authored Dec 23, 2018
  
  2791ce9a
- Merge branch 'bugfix/trans_fix_url_videos' into 'develop' · 005b4194
  lain authored Dec 23, 2018
```
Fix "url" of Videos in transmogrifier

Closes #367

See merge request !459
```
  005b4194
- tests: twitter api: add test proving that peertube videos are correctly handled · a2bceaf6
  kaniini authored Dec 23, 2018
  
  a2bceaf6
- twitter api: add "Video" to supported activity types list · 34a4ed22
  kaniini authored Dec 23, 2018
  
  34a4ed22
- tests: twitter api: activity view test: enable tesla mock · 873938d2
  kaniini authored Dec 23, 2018
  
  873938d2
- twitter api: activity representer: remove peertube hack · 79b51a97
  kaniini authored Dec 23, 2018
  
  79b51a97
- tests: mastodon api: add test verifying that peertube videos are correctly rendered · 9f48485f
  kaniini authored Dec 23, 2018
  
  9f48485f
- mastodon api: status view: remove obsolete peertube hack · 32dfc1d1
  kaniini authored Dec 23, 2018
  
  32dfc1d1
- transmogrifier: significantly rework handling of peertube videos, add test · 71f6d9f4
  kaniini authored Dec 23, 2018
  
  71f6d9f4
- Merge branch 'hotfix/activity-without-content' into 'develop' · a3e33fa1
  lain authored Dec 23, 2018
```
Twitter ActivityView: fix crash with activity without content

See merge request !572
```
  a3e33fa1
- transmogrifier: When it’s a Video move "url" to "attachment" · 3aff8067
  Haelwenn authored Nov 17, 2018 and kaniini committed Dec 23, 2018
  
  3aff8067
- Merge branch 'feature/hellthread-mitigation' into 'develop' · 093d39b6
  kaniini authored Dec 23, 2018
```
implement hellthread mitigation

Closes #474

See merge request !588
```
  093d39b6
- Implement kaniini's tweaks · a7f07bb6
  Karen Konou authored Dec 23, 2018
  
  a7f07bb6
- Renamed the things · c7617941
  Karen Konou authored Dec 23, 2018
  
  c7617941
- Add documentation · c92f91ff
  Karen Konou authored Dec 23, 2018
  
  c92f91ff
22 Dec, 2018 2 commits
- Fix formatting · 409ff60b
  Karen Konou authored Dec 22, 2018
  
  409ff60b
- Implement large thread filter · 92362e1e
  Karen Konou authored Dec 22, 2018
  
  92362e1e
20 Dec, 2018 14 commits
- Merge branch 'ci-test-fix' into 'develop' · 61a88a67
  lain authored Dec 20, 2018
```
SetUserSessionIdPlugTest: try again to fix random ci failures

See merge request pleroma/pleroma!579
```
  61a88a67
- Merge branch '114_email_confirmation' into 'develop' · 2e2030ad
  kaniini authored Dec 20, 2018
```
[#114] Email confirmation

See merge request !546
```
  2e2030ad
- [#114 ] Fixed test. · 851db74f
  Ivan Tashkinov authored Dec 20, 2018
  
  851db74f
- [#114] Allowed unconfirmed users to authenticate if... · 7cab7de9
  Ivan Tashkinov authored Dec 20, 2018
```
[#114] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation.
Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.
```
  7cab7de9
- [#114] Added :user_id component to email confirmation path to improve the security. · f69cbf47
  Ivan Tashkinov authored Dec 20, 2018
```
Added tests for `confirm_email` action.
```
  f69cbf47
- [#114 ] Removed flash messages rendering on redirects. · 8adcd1e8
  Ivan Tashkinov authored Dec 20, 2018
  
  8adcd1e8
- [#114 ] Stylistic adjustments. · 501ce34d
  Ivan Tashkinov authored Dec 20, 2018
  
  501ce34d
- Merge branch 'support/issue_413' into 'develop' · 8de3138d
  kaniini authored Dec 20, 2018
```
[#413] fix parse mentions

See merge request !577
```
  8de3138d
- [#413] fix parse mentions · f1b93b5b
  Maksim authored Dec 20, 2018
  
  f1b93b5b
- Merge branch 'fix/readme-md-config-typo' into 'develop' · c52453fb
  kaniini authored Dec 20, 2018
```
Fix config.md path in README

See merge request !581
```
  c52453fb
- Fix config.md path in README · acfd9868
  rinpatch authored Dec 20, 2018
  
  acfd9868
- Fix config.md path in README · 6081c449
  rinpatch authored Dec 20, 2018
  
  6081c449
- Merge branch 'readme' into 'develop' · 2e4f73a9
  kaniini authored Dec 20, 2018
```
Improve systemd service documentation

See merge request !580
```
  2e4f73a9
- Merge branch 'documentation/copy-pleroma-api' into 'develop' · fda148a9
  kaniini authored Dec 20, 2018
```
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints

See merge request !571
```
  fda148a9
19 Dec, 2018 1 commit

Improve systemd service documentation · 8c4fa684

normandy authored Dec 19, 2018

Use `systemctl` instead of `service` since it's not guaranteed the
latter will be on the system (e.g. Arch does not have it).

8c4fa684