projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
:Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
installation
/
pleroma-apache.conf
2021-04-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2021-03-02
lain
Merge branch 'release/2.3.0' into 'stable'
blob
|
commitdiff
|
raw
2021-02-26
feld
Merge branch 'ecto-rollback-in-test-env' into 'develop'
blob
|
commitdiff
|
raw
2021-02-20
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2021-02-12
rinpatch
Merge branch 'bugfix/answer-outbox' into 'develop'
blob
|
commitdiff
|
raw
2021-02-03
rinpatch
Merge branch 'feat/openapi-spec-export' into 'develop'
blob
|
commitdiff
|
raw
2021-01-31
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
2021-01-26
feld
Merge branch 'service-worker-allowed-header' into ...
blob
|
commitdiff
|
raw
2021-01-26
lain
Merge branch 'develop' into '2435-list-multiple-users'
blob
|
commitdiff
|
raw
2021-01-26
Haelwenn
Merge branch 'fix/missing-own_votes' into 'develop'
blob
|
commitdiff
|
raw
2021-01-26
feld
Merge branch 'docs/apache-config' into 'develop'
blob
|
commitdiff
|
raw
2021-01-25
Mark Felder
Merge branch 'develop' into docs/apache-config
blob
|
commitdiff
|
raw
2021-01-21
Mark Felder
Update Apache configuration. This has been tested.
blob
|
commitdiff
|
raw
2020-06-20
lain
Merge branch 'bugfix/mix.exs-version-dot-git-less'...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-01
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-06-01
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-18
lain
Merge branch 'docs/storing-remote-media' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-16
lain
Merge branch 'develop' into 'remove-twitter-api'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-14
lain
Merge branch 'features/openrc-console' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-10
rinpatch
Merge branch 'release/2.0.4' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-10
lain
Merge branch 'shortening-modules-name' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-09
Alexander Strizhakov
apache chain issue fix
blob
|
commitdiff
|
raw
|
diff to current
2020-05-08
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-08
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-08
Maksim Pechnikov
Merge branch 'develop' into issue/1276-2
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
Haelwenn
Merge branch 'feature/restrict-c2s' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-07
lain
Merge branch 'openapi/polls' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
rinpatch
Merge branch 'feature/delete-validator' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
feld
Merge branch 'fix/apache-cert-chain' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-06
Alexander Strizhakov
apache chain issue fix
blob
|
commitdiff
|
raw
|
diff to current
2019-06-23
Sachin Joshi
Merge branch 'develop' into 'remove-avatar-header'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
Mark Felder
Merge branch 'develop' into update-oauth-template
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
rinpatch
Resolve merge conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
Sachin Joshi
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-30
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-29
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-24
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-24
lambda
Merge branch 'reverse_proxy_upstream_v4_fix' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-23
Alfie Pates
explicitly set reverse proxy upstream to IPv4
blob
|
commitdiff
|
raw
|
diff to current
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'ssl_trusted_cert' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-04
Karen Konou
Merge branch 'bugfix/delete-activity-audience' of git...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-03
link0ff
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-26
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-23
kaniini
Merge branch 'add-apache-cache-config' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-22
faried nawaz
apache config: add instructions for mediaproxy.
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
rinpatch
Attempt to resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-11-15
Hakaba Hitoyo
Merge remote-tracking branch 'official/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-13
lambda
Merge branch 'add-MIX_ENV-to-systemd-example' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-12
scarlett
Merge branch 'twitter-api-null-display-name' into ...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-12
kaniini
Merge branch 'feature/csp-plug' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-11
William Pitcock
example configs: kill STS/CT headers
blob
|
commitdiff
|
raw
|
diff to current
2018-11-11
William Pitcock
example configs: remove obsolete CSP configuration
blob
|
commitdiff
|
raw
|
diff to current
2018-11-10
kaniini
Merge branch 'tests/prismo-url-map' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-06
kaniini
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-06
kaniini
Merge branch 'runtime-router' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-06
kaniini
Merge branch 'use-the-same-example-domain-and-use-it...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-04
shibayashi
Use example.tld so a single search and replace works
blob
|
commitdiff
|
raw
|
diff to current
2018-11-03
shibayashi
Update instructions
blob
|
commitdiff
|
raw
|
diff to current
2018-11-03
shibayashi
Use the same example domain in all config examples
blob
|
commitdiff
|
raw
|
diff to current
2018-11-03
shibayashi
Use the server name as variable
blob
|
commitdiff
|
raw
|
diff to current
2018-09-08
lambda
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-07
kaniini
Merge branch 'add-secure-and-samesite-cookie-flags...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-07
kaniini
Merge branch 'improve-server-config-examples' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-03
shibayashi
installation/pleroma-apache.conf: OCSP stapling needs...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-30
shibayashi
Add frame-ancestors 'none' to all configs
blob
|
commitdiff
|
raw
|
diff to current
2018-08-28
shibayashi
installation/pleroma-apache.conf: Add TLS configuration...
blob
|
commitdiff
|
raw
|
diff to current
2018-05-06
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-24
lambda
Merge branch 'favicon_tag' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-10
lambda
Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e01...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-10
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-10
lambda
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-10
Stanislas
Indentation for Apache vhost
blob
|
commitdiff
|
raw
|
diff to current
2018-04-09
lambda
Merge branch 'bugfix/user-search-with-at-sign' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-04-09
lambda
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-09
lambda
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-08
nepfag
Apache config for everything on one host.
blob
|
commitdiff
|
raw
|
diff to current