Merge branch 'develop' into feature/digest-email
[akkoma] / lib / pleroma / web / templates / mastodon_api /
2019-06-03 Mark FelderMerge branch 'develop' into feature/digest-email
2019-06-03 lambdaMerge branch 'align-mastodon-conversations' into 'develop'
2019-06-03 rinpatchMerge branch 'develop' into feature/polls-2-electric...
2019-06-02 kaniiniMerge branch 'feature/notification-control-part-2'...
2019-06-01 rinpatchResolve merge conflicts
2019-06-01 kaniiniMerge branch 'bugfix/visibility-indicator-litepub-dm...
2019-06-01 kaniiniMerge branch 'bugfix/remove-vanilla-flavour' into ...
2019-05-31 Haelwenn (lanodan... Remove now useless flavours switching
2019-05-31 HaelwennMerge branch 'dokku' into 'develop'
2019-05-31 lambdaMerge branch 'hotfix/leaking-lists' into 'develop'
2019-05-30 lambdaMerge branch 'use-pleroma-config' into 'develop'
2019-05-30 Egor KislitsynUse Pleroma.Config everywhere
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-02-19 Mark FelderMerge branch 'develop' into fix/twittercards
2019-02-19 Ivan Tashkinov[#468] Merged `upstream/develop`.
2019-02-19 lambdaMerge branch 'fix/check-follower-collection-in-is_priva...
2019-02-19 lambdaMerge branch 'fix/ap_id-unique_constraint' into 'develop'
2019-02-18 kaniiniMerge branch 'feature/jobs' into 'develop'
2019-02-18 kaniiniMerge branch 'patch-image-description' into 'develop'
2019-02-18 kaniiniMerge branch 'feature/add-oauth-tokens-endpoint' into...
2019-02-18 kaniiniMerge branch 'features/flavour-switching' into 'develop'
2019-02-16 Haelwenn (lanodan... [MastoAPI] Add switching of frontend flavours
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-04 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-01 kaniiniMerge branch 'feature/split-hide-network' into 'develop'
2019-02-01 hrefMerge branch '534_federation_targets_reachability'...
2019-01-31 HaelwennMerge branch 'docs/pleroma-api-invite-token' into ...
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop'
2019-01-31 HaelwennMerge branch 'features/glitch-soc-frontend' into 'develop'
2019-01-28 Haelwenn (lanodan... /web/index template: Modify for glitch-soc
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-11-15 Hakaba HitoyoMerge remote-tracking branch 'official/develop' into...
2018-11-10 kaniiniMerge branch 'tests/prismo-url-map' into 'develop'
2018-11-07 kaniiniMerge branch 'runtime-config' into 'develop'
2018-11-06 kaniiniMerge branch 'patch-2' into 'develop'
2018-11-06 kaniiniMerge branch 'unify-mastodon-oauth' into 'develop'
2018-11-06 lainUnify Mastodon Login with OAuth login.
2018-09-02 kaniiniMerge branch 'hotfix_broken_likes' into 'develop'
2018-08-27 lambdaMerge branch 'bugfix/announce-timeline-flooding' into...
2018-08-26 kaniiniMerge branch 'feature/emoji-in-local-users' into 'develop'
2018-08-26 kaniiniMerge branch 'develop' into 'feature/relay'
2018-08-20 ealMerge branch 'fix/redirect-on-user-fetch' into 'develop'
2018-08-16 kaniiniMerge branch 'patch-2' into 'develop'
2018-08-16 kaniiniMerge branch 'dev-lanodan-url-regex' into 'develop'
2018-08-16 kaniiniMerge branch 'mastofe/system-font' into 'develop'
2018-07-03 Haelwenn (lanodan... /web/* template: Add class system-font
2018-05-13 lambdaMerge branch 'feature/unrepeats' into 'develop'
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-28 lambdaMerge branch 'fix/blocked-user-boosts' into 'develop'
2018-04-28 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2018-04-27 lambdaMerge branch 'bugfix/mrf-simple-media-stripping' into...
2018-04-26 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-04-25 ealMerge branch 'patch-1' into 'develop'
2018-04-24 NormandyFix typo in MastoFE login page.
2018-04-24 lambdaMerge branch 'feature/message-rewrite-facility' into...
2018-04-24 lambdaMerge branch 'favicon_tag' into 'develop'
2018-04-20 Francis DinhMerge branch 'develop' of https://git.pleroma.social...
2018-04-18 lambdaMerge branch 'fix/rm-user-task' into 'develop'
2018-04-18 lambdaMerge branch 'fix/login-with-username-or-email' into...
2018-04-18 ealMastoAPI and OAuth: allow login with either email or...
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-02 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-31 lambdaMerge branch 'new-mastofe' into 'develop'
2018-03-31 Morgan BazalgetteRemove pl-dark-masto-fe, add preloading for common...
2018-03-20 lambdaMerge branch 'patch-README' into 'develop'
2018-03-13 lainMerge branch 'andarna/pleroma-develop' into develop
2018-03-13 lainMove stuff around.
2018-03-13 Wim VanderbauwhedeA small patch to show the instance name and favicon...
2017-12-09 Roger BraunMerge branch 'develop' into feature/activitypub
2017-11-23 Roger BraunMastodonUI login: Show error message on error.
2017-11-22 lambdaMerge branch 'develop' into 'develop'
2017-11-19 Hyper! (Stitch)Add Custom Pleroma-dark theme
2017-11-16 lambdaMerge branch 'feature/masto-styled-login-page' into...
2017-11-16 Shpuld ShpuldsonAdd styles to make login page resemble mastodon's
2017-11-12 Roger BraunMerge branch 'develop' of git.pleroma.social:pleroma...
2017-11-12 Roger BraunAdd Mastodon frontend.