Merge branch 'develop' into fix/majic-nits
[akkoma] / lib / pleroma / web / preload /
2021-01-20 feldMerge branch 'deprecate-public_endpoint' into 'develop'
2021-01-19 rinpatchMerge branch 'stable' into mergeback/2.2.2
2021-01-15 HaelwennMerge branch 'optimize-command_available' into 'develop'
2021-01-13 HaelwennMerge branch 'chores/bump-copyright' into 'develop'
2021-01-13 Haelwenn (lanodan... Bump Copyright to 2021
2020-11-21 feldMerge branch 'libmagic' into 'develop'
2020-11-12 rinpatchMerge branch 'release/2.2.0' into 'stable'
2020-11-04 lainMerge branch 'default-mrf' into 'develop'
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-11-04 lainMerge branch 'ejabberd-pleroma-auth' into 'develop'
2020-10-29 HaelwennMerge branch 'issue/2069' into 'develop'
2020-10-26 HaelwennMerge branch 'docs/ap_c2s' into 'develop'
2020-10-17 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-10-14 Mark FelderMerge branch 'develop' into feature/account-export
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-14 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-13 Mark FelderMerge branch 'develop' into feature/gen-magic
2020-10-13 Mark FelderMerge branch 'develop' into chore/elixir-1.11
2020-10-13 Mark FelderMerge branch 'develop' into refactor/locked_user_field
2020-10-13 Mark FelderMerge branch 'develop' into refactor/discoverable_user_...
2020-10-13 feldMerge branch 'feature/1822-files-consistency' into...
2020-10-13 Alexander Strizhakovfix after rebase
2020-10-13 Alexander Strizhakovupdate files consistency after rebase
2020-10-13 lainMerge branch 'preload-frontend-config' into 'develop'
2020-10-12 Alex GleasonPreload `/api/pleroma/frontend_configurations`, fixes...
2020-10-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-10-08 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-09-10 Mark FelderMerge branch 'develop' into feature/gen-magic
2020-08-28 lainMerge branch 'release/2.1.0' into 'stable'
2020-08-25 HaelwennMerge branch 'buildx-multiarch-arm32v7' into 'develop'
2020-08-25 feldMerge branch 'feature/1952-read-muted-notifications...
2020-08-25 lainMerge branch 'stable' of git.pleroma.social:pleroma...
2020-08-25 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-08-18 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-08-18 lainMerge branch 'freebsd-docs' into 'develop'
2020-08-18 lainMerge branch 'chore/improve-descriptions' into 'develop'
2020-08-18 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-08-17 lainMerge branch 'issue/1936' into 'develop'
2020-08-17 rinpatchMerge branch 'invisible-index' into 'develop'
2020-08-17 lainMerge branch '2046-default-restrict-unauthenticated...
2020-08-14 Ivan Tashkinov[#2046] Defaulted pleroma/restrict_unauthenticated...
2020-07-27 lainMerge branch 'develop' into 'cleanup/masto_fe-default_s...
2020-07-19 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-07-16 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-07-13 Mark FelderMerge branch 'develop' into refactor/notification_settings
2020-07-13 feldMerge branch 'fix/mediaproxy-cache-settings-types'...
2020-07-10 Mark FelderMerge branch 'develop' into issue/1790-updated-oban
2020-07-10 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-09 Mark FelderMerge branch 'develop' into fix/csp-for-captcha
2020-07-09 lainMerge branch '1723-token-fixes' into 'develop'
2020-07-09 lainMerge branch 'bugfix/status-deletion' into 'develop'
2020-07-08 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-08 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-08 lainMerge branch '1895-hashtag-timeline-restrict-unauthenti...
2020-07-08 HaelwennMerge branch '1918-avatar-background-header-reset-2...
2020-07-08 HaelwennMerge branch 'fix/twitter-rich-media-preview' into...
2020-07-07 lainMerge branch 'remove-twitter-api' into 'develop'
2020-07-06 lainPreloaders: Remove status_net preloader
2020-07-06 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-06 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-03 Mark FelderMerge branch 'develop' into issue/1790-updated-oban
2020-07-03 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2020-07-02 Mark FelderMerge branch 'develop' into feature/1885-MRF-metadata
2020-07-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-07-02 lainMerge branch 'feature/update-description' into 'develop'
2020-06-30 Mark FelderMerge branch 'develop' into activation-meta
2020-06-30 lainMerge branch 'preloadfixups' into 'develop'
2020-06-30 lainCredo fixes
2020-06-30 lainMerge branch 'preload-fixups-2' into preloadfixups
2020-06-30 lainPreload: Load the correct instance panel
2020-06-29 Egor KislitsynMerge branch 'develop' into remove-twitter-api
2020-06-29 lainPreloaders: Use strings as keys.
2020-06-29 lainUser preloader: Put user info at correct key
2020-06-29 lainMerge branch '1031-parent-visible' into 'develop'
2020-06-26 HaelwennMerge branch 'block-handling' into 'develop'
2020-06-26 HaelwennMerge branch '1258-anti-link-spam-exemption' into ...
2020-06-26 Mark FelderMerge branch 'develop' into refactor/notification_settings
2020-06-26 lainPreloading: Fix nodeinfo url.
2020-06-26 lainPreloading: Return correct data for statusnet stuff.
2020-06-25 feldMerge branch 'preload-data' into 'develop'
2020-06-15 stwffix tests
2020-06-12 Mark FelderMerge branch 'develop' into preload-data
2020-06-03 stwfMerge branch 'preload-data' of git.pleroma.social:stwf...
2020-06-03 stwfclean up
2020-06-03 stwfadd status_net/config
2020-06-03 stwfencode data properly
2020-06-03 stwfpreload data into index.html
2020-06-03 stwfadd status_net/config
2020-06-02 stwfencode data properly
2020-05-29 stwfpreload data into index.html