Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
[akkoma] / lib / pleroma / web / views / masto_fe_view.ex
2020-07-27 lainMerge branch 'develop' into 'cleanup/masto_fe-default_s...
2020-07-27 Haelwenn (lanodan... masto_fe_view: Remove @default_settings
2020-07-16 Alex GleasonMerge remote-tracking branch 'upstream/develop' into...
2020-07-13 Mark FelderMerge branch 'develop' into refactor/notification_settings
2020-07-09 lainMerge branch '1723-token-fixes' into 'develop'
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-03 lainMerge branch '1892-exclude-bots-from-search-results...
2020-07-02 Mark FelderMerge branch 'develop' into activation-meta
2020-07-02 Mark FelderMerge branch 'develop' into feature/1885-MRF-metadata
2020-07-02 lainMerge branch 'feature/update-description' into 'develop'
2020-06-30 HaelwennMerge branch 'chore/rename-user-settings-column' into...
2020-06-30 Mark FelderRename user.settings column
2020-05-18 lainMerge branch 'docs/storing-remote-media' into 'develop'
2020-05-14 lainMerge branch 'features/openrc-console' into 'develop'
2020-04-22 lainMerge branch 'docs/debian-packages' into 'develop'
2020-03-19 lainMerge branch 'remake-remodel' into develop
2020-03-13 rinpatchMerge branch 'feature/mastofe-admin-scope' into 'develop'
2020-03-13 rinpatchMerge branch 'docs/direct_conversation_id' into 'develop'
2020-03-13 rinpatchMerge branch 'static-accept-missing' into 'develop'
2020-03-12 Egor KislitsynMerge remote-tracking branch 'origin/develop' into...
2020-03-11 feldMerge branch 'fix/signup-without-email' into 'develop'
2020-03-11 feldMerge branch 'relay-list-change' into 'develop'
2020-03-09 lainMerge branch 'patch-1' into 'develop'
2020-03-08 Maksim PechnikovMerge branch 'develop' into issue/1276
2020-03-08 rinpatchMerge branch 'release/2.0.0' into 'stable'
2020-03-07 rinpatchMerge branch 'restart-fix-for-mix-tasks' into 'develop'
2020-03-06 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-05 rinpatchMerge branch 'stable' into release/2.0.0
2020-03-04 feldMerge branch 'exclude-reblogs-from-admin-api-by-default...
2020-03-04 lainMerge branch 'fix/no-email-no-fail' into 'develop'
2020-03-03 Mark FelderMerge branch 'develop' into gun
2020-03-03 HaelwennMerge branch 'chore/update-copyrights' into 'develop'
2020-03-03 Mark FelderUpdate Copyrights
2020-01-28 lainMerge branch 'translation/errors-french' into 'develop'
2019-11-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-11-05 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-11-04 Maxim FilippovMerge branch 'develop' into feature/reports-groups...
2019-10-27 Maxim FilippovMerge branch 'develop' into feature/store-statuses...
2019-10-24 Egor KislitsynMerge remote-tracking branch 'upstream/develop' into...
2019-10-24 Maksim PechnikovMerge branch 'develop' into issue/1276
2019-10-23 feldMerge branch '1304-user-info-deprecation' into 'develop'
2019-10-23 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-21 kaniiniMerge branch 'feature/push-subject-for-dm' into 'develop'
2019-10-21 Maksim PechnikovMerge branch 'develop' into feature/masto_api_markers
2019-10-21 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-21 Egor KislitsynMerge branch 'develop' into refactor/following-relation...
2019-10-20 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-19 HaelwennMerge branch 'feature/mastofe-pwa' into 'develop'
2019-10-19 KokaKiwiMastoFE: Add PWA manifest.
2019-10-19 rinpatchMerge branch 'mix-emoji-task-pack-json' into 'develop'
2019-10-16 Ivan Tashkinov[#1304] Moved all non-mutes / non-blocks fields from...
2019-10-10 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-07 lainMerge branch 'misskey-compat' into 'reactions'
2019-10-06 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-06 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-06 HaelwennMerge branch 'fix-prameter-name-of-accounts-update...
2019-10-05 kaniiniMerge branch 'accept-embedded-announce-object' into...
2019-10-05 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-04 lainMerge branch 'featrue/job-monitor' into 'develop'
2019-10-04 lainMerge branch 'bugfix/notification-nil-actor' into ...
2019-10-02 rinpatchMerge branch 'split-masto-api/masto_fe_and_custom_emoji...
2019-10-02 Egor KislitsynAdd MastoFEController