Merge branch 'patch-2' into 'develop'
[akkoma] / priv / static / packs / features /
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-07-09 kaniiniMerge branch 'remove-avatar-header' into 'develop'
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-28 lainMerge branch 'release-docs' into 'develop'
2019-06-27 kaniiniMerge branch 'idempotency-plug' into 'develop'
2019-06-26 rinpatchMerge branch 'update-mastofe/glitch-soc-2019-06-26...
2019-06-26 Haelwenn (lanodan... Update mastofe to bundle-2019-06-26
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into...
2019-05-01 Alex SMerging with develop
2019-04-22 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-19 lambdaMerge branch '923_oauth_consumer_refactoring_ci' into...
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-13 Alex SMerge develop to 788-separate-email-addresses
2019-04-12 lambdaMerge branch 'bugfix/pleroma-email-naming' into 'develop'
2019-04-12 lambdaMerge branch 'features/mastoapi/2.6.0-min_id-pagination...
2019-04-12 lambdaMerge branch 'fix/732-password-align' into 'develop'
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-11 kaniiniMerge branch 'fix/hackney_max_body_param' into 'develop'
2019-04-11 lambdaMerge branch 'update-mastofe/glitch-soc-2019-04-11...
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-11 Haelwenn (lanodan... Update Mastodon Frontend to 2019-04-11 bundle
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-03-14 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-13 kaniiniMerge branch 'mastofe-content-types' into 'develop'
2019-03-08 kaniiniMerge branch 'fix-tlsv1.3' into 'develop'
2019-03-08 kaniiniMerge branch 'fetch-posts-on-first-federation' into...
2019-03-08 kaniiniMerge branch 'update-mastofe/glitch-soc-2019-03-07...
2019-03-07 Haelwenn (lanodan... Update Mastodon Frontend to 2019-03-07 bundle
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-11 Karen KonouMerge branch 'develop' into feature/thread-muting
2019-02-11 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-10 kaniiniMerge branch 'update-mastofe/glitch-soc-2019-02-10...
2019-02-10 Haelwenn (lanodan... Update Mastodon Frontend to 2019-02-10 bundle
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-31 HaelwennMerge branch 'update-mastofe/glitch-soc-2019-01-28...
2019-01-31 Haelwenn (lanodan... [MastodonFE] Update Frontend (glitch)
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-09-20 kaniiniMerge branch 'task-204-on-options-request' into 'develop'
2018-09-20 HaelwennMerge branch 'bump-mastofe-2018-09-20' into 'develop'
2018-09-20 Haelwenn (lanodan... Update mastodon frontend
2018-08-27 lambdaMerge branch 'bugfix/announce-timeline-flooding' into...
2018-08-26 kaniiniMerge branch 'develop' into 'feature/relay'
2018-08-16 kaniiniMerge branch 'dev-lanodan-url-regex' into 'develop'
2018-08-16 kaniiniMerge branch 'mastofe/system-font' into 'develop'
2018-08-16 kaniiniMerge branch 'develop' into 'patch-2'
2018-08-16 kaniiniMerge branch 'fix/put-repeats-at-activitypub-outbox...
2018-08-16 kaniiniMerge branch 'fix/normalize-file-extension' into 'develop'
2018-08-15 lambdaMerge branch 'feature/suggestions-api-with-third-party...
2018-08-12 lainUpdate Mastofe.
2018-06-02 lainRevert "Update Mastofe."
2018-06-02 lainUpdate Mastofe.
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-24 lambdaMerge branch 'favicon_tag' into 'develop'
2018-04-10 lambdaMerge branch 'mastofe-250c885de655ed0b45b76cc35c5782e01...
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-09 Morgan BazalgetteBring mastofe up-to-date with 250c885de655ed0b45b76cc35...
2018-04-03 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-04-02 lambdaMerge branch 'mastofe-5edce2030238293463c041537da4aaeea...
2018-04-02 Morgan BazalgetteBring mastofe up to date
2018-04-02 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-04-01 lambdaMerge branch 'mastofe-f48f11d4' into 'develop'
2018-04-01 Morgan Bazalgetteupdate mastofe
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-31 lambdaMerge branch 'new-mastofe' into 'develop'
2018-03-31 Morgan BazalgetteBring Mastodon frontend up-to-date
2018-03-20 lambdaMerge branch 'feld-varnish' into 'develop'
2018-03-20 lambdaMerge branch 'patch-README' into 'develop'
2018-03-20 lambdaMerge branch 'feld-mastoweb5000' into 'develop'
2018-03-15 Mark FelderSet max characters for the compose field to 5000 to...
2017-12-09 Roger BraunMerge branch 'develop' into feature/activitypub
2017-11-12 Roger BraunMerge branch 'develop' of git.pleroma.social:pleroma...
2017-11-12 Roger BraunAdd Mastodon frontend.