[#534] Merged `upstream/develop`.
[akkoma] / priv / static /
2019-01-28 Ivan Tashkinov[#534] Merged `upstream/develop`.
2019-01-25 kaniiniMerge branch 'oembed_provider' into 'develop'
2019-01-25 lambdaMerge branch 'update/pleroma-fe-20190125-hotfix' into...
2019-01-25 William Pitcockupdate pleroma frontend (summary_html hotfix)
2019-01-25 kaniiniMerge branch 'fix/tusky-dm' into 'develop'
2019-01-25 kaniiniMerge branch 'develop' into 'oembed_provider'
2019-01-25 kaniiniMerge branch 'classic-flakeids' into 'develop'
2019-01-25 kaniiniMerge branch 'update/pleroma-fe-20190125' into 'develop'
2019-01-25 William Pitcockupdate pleroma frontend
2019-01-23 kaniiniMerge branch 's3-namespace' into 'develop'
2019-01-23 lainMerge branch 'develop' into rename/pleroma_activity_con...
2019-01-21 lambdaMerge branch '530_federator_user_info_overwrite_fix...
2019-01-21 lambdaMerge branch 'feature/dm-sanity' into 'develop'
2019-01-20 lambdaMerge branch 'add-custom-emoji-test' into 'develop'
2019-01-20 lambdaMerge branch '2019-1-20-update-frontend' into 'develop'
2019-01-20 lainupdate frontend
2019-01-20 William Pitcocklitepub schema: add litepub:directMessage flag
2019-01-13 rinpatchResolve merge conflict
2019-01-13 rinpatchReset index.html to develop
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop'
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2019-01-02 rinpatchMerge branch 'fix/reserve-media-username' into 'develop'
2019-01-01 kaniiniMerge branch 'pool-usage' into 'develop'
2019-01-01 rinpatchMerge branch 'configurable-federator' into 'develop'
2019-01-01 lambdaMerge branch '2019-1-1-update-frontend' into 'develop'
2019-01-01 lainupdate frontend
2018-12-31 kaniiniMerge branch 'features/admin-api-user-views' into ...
2018-12-30 Rin ToshakaResolve merge conflict
2018-12-29 HaelwennMerge branch 'fix_485' into 'develop'
2018-12-29 lambdaMerge branch '2018-12-29-update-frontend' into 'develop'
2018-12-29 lainupdate frontend
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-23 lambdaMerge branch 'hotfix/activity-without-content' into...
2018-12-20 lambdaMerge branch 'ci-test-fix' into 'develop'
2018-12-20 kaniiniMerge branch '114_email_confirmation' into 'develop'
2018-12-20 kaniiniMerge branch 'documentation/copy-pleroma-api' into...
2018-12-19 raenoMerge branch 'develop' into oembed_provider
2018-12-18 rinpatchMerge branch 'develop' into fix/formatter-ignore-html...
2018-12-18 lambdaMerge branch 'feature/new-user-routes' into 'develop'
2018-12-18 lambdaMerge branch 'new-routes-integration' into 'develop'
2018-12-18 lainupdate frontend
2018-12-18 raenoMerge branch 'develop' into oembed_provider
2018-12-17 lambdaMerge branch '2018-12-17-update-frontend' into 'develop'
2018-12-17 lainMerge remote-tracking branch 'origin/develop' into...
2018-12-17 lainupdate frontend
2018-12-16 ealMerge branch 'fix/masto-put-settings' into 'develop'
2018-12-14 raenoMerge branch 'develop' into oembed_provider
2018-12-14 raenoFix tests
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-14 hrefMerge branch '114_user_registration_emails' into 'develop'
2018-12-14 lambdaMerge branch 'fix/double-rt-or-fav' into 'develop'
2018-12-14 lambdaMerge branch 'fix/qvitter-fav-object' into 'develop'
2018-12-14 lambdaMerge branch '2018-12-13-update-frontend' into 'develop'
2018-12-13 lainupdate frontend
2018-12-10 lambdaMerge branch '2018-12-10-update-frontend' into 'develop'
2018-12-10 lainupdate frontend
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into...
2018-12-09 Maxim FilippovUse "~" as a route namespace symbol on FE
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-05 lainMerge remote-tracking branch 'origin' into follower...
2018-12-05 Rin ToshakaMerge develop to refactor/mix-tasks
2018-12-03 lambdaMerge branch 'fix/parse-user-bio' into 'develop'
2018-12-03 lambdaMerge branch 'fix-media-proxy-defaults' into 'develop'
2018-12-03 kaniiniMerge branch 'update-pleroma-frontend' into 'develop'
2018-12-03 hakabahitoyoupdate-pleroma-frontend
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-11-30 lainMerge remote-tracking branch 'origin' into validate...
2018-11-27 kaniiniMerge branch 'ogg-theora-detection' into 'develop'
2018-11-22 kaniiniMerge branch 'feature/admin-api' into 'develop'
2018-11-20 HaelwennMerge branch 'feature/retry-queue' into 'develop'
2018-11-18 kaniiniMerge branch 'update/pleroma-fe-20181118' into 'develop'
2018-11-18 William Pitcockupdate pleroma frontend
2018-11-15 Hakaba HitoyoMerge remote-tracking branch 'official/develop' into...
2018-11-15 Hakaba HitoyoRevert "update pleroma frontend"
2018-11-14 lambdaMerge branch 'fix-media-proxy-filename' into 'develop'
2018-11-14 kaniiniMerge branch 'update/pleroma-fe-20181114' into 'develop'
2018-11-14 William Pitcockupdate pleroma frontend
2018-11-10 kaniiniMerge branch 'bugfix/ostatus-as2-reflection' into ...
2018-11-10 kaniiniMerge branch 'bugfix/local-jsonld-context' into 'develop'
2018-11-08 Haelwenn (lanodan... Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld
2018-11-08 Haelwenn (lanodan... priv/static/litepub-1.0.jsonld: Local copy of https...
2018-10-26 kaniiniMerge branch 'update-pleroma-frontend' into 'develop'
2018-10-26 hakabahitoyoupdate pleroma frontend
2018-10-26 hakabahitoyoupdate pleroma frontend
2018-10-25 kaniiniMerge branch 'finmoji-optional' into 'develop'
2018-10-25 kaniiniMerge branch 'update-pleroma-frontend' into 'develop'
2018-10-23 scarlettupdate pleroma-fe
2018-10-23 scarlettupdate pleroma-fe
2018-10-07 kaniiniMerge branch 'security/follow-always-async' into 'develop'
2018-10-07 kaniiniMerge branch 'patch-2' into 'develop'
2018-10-07 kaniiniMerge branch 'update-pleroma-frontend' into 'develop'
2018-10-07 hakabahitoyoupdate-pleroma-frontend
2018-09-22 kaniiniMerge branch 'update/pleroma-fe-20180922' into 'develop'
2018-09-22 William Pitcockupdate pleroma frontend
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-09-16 kaniiniMerge branch 'update-pleroma-frontend' into 'develop'
2018-09-14 hakabahitoyoupdate-pleroma-frontend
next