projects / akkoma / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Fix merge conflict
[akkoma] / lib / pleroma / web /
2019-06-05 Egor KislitsynFix merge conflict tree | commitdiff
2019-06-05 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-06-05 kaniiniMerge branch 'explicit-addressing' into 'develop' tree | commitdiff
2019-06-05 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-06-04 HaelwennMerge branch 'remove-tag-warning' into 'develop' tree | commitdiff
2019-06-04 HaelwennMerge branch 'bugfix/956-activity-id-nil-conversations... tree | commitdiff
2019-06-04 lainNodeInfo: Add explicit addressing to nodeinfo. tree | commitdiff
2019-06-04 lainMerge branch 'issue/941' into 'develop' tree | commitdiff
2019-06-04 Maksim Pechnikovupdate ActivityPub#fetch_activities_query tree | commitdiff
2019-06-04 Maksim PechnikovMerge branch 'develop' into issue/941 tree | commitdiff
2019-06-04 Maksim Pechnikovupdate ActivityPub#fetch_activities_query tree | commitdiff
2019-06-04 HaelwennMerge branch 'emoji-loader-fix' into 'develop' tree | commitdiff
2019-06-04 lainMerge branch 'fix/fetch-votes-restrict-create' into... tree | commitdiff
2019-06-04 rinpatchFix CommonAPI.vote returning tuples inside of the activ... tree | commitdiff
2019-06-04 rinpatchRestrict `get_existing_votes` to only get Create activities tree | commitdiff
2019-06-04 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-06-04 lainMerge remote-tracking branch 'origin/develop' into... tree | commitdiff
2019-06-04 kaniiniMerge branch 'fix/poll-performance' into 'develop' tree | commitdiff
2019-06-04 William Pitcockutils: access inReplyTo as an explicit string when... tree | commitdiff
2019-06-04 Maksim PechnikovMerge branch 'develop' into issue/941 tree | commitdiff
2019-06-04 kaniiniMerge branch 'feature/nodeinfo-polls' into 'develop' tree | commitdiff
2019-06-04 William Pitcocknodeinfo: add pollLimits to metadata tree | commitdiff
2019-06-04 kaniiniMerge branch 'feature/mrf-subchain' into 'develop' tree | commitdiff
2019-06-04 kaniiniMerge branch 'generic-fe-settings' into 'develop' tree | commitdiff
2019-06-04 kaniiniMerge branch 'ueberauth_config_extension' into 'develop' tree | commitdiff
2019-06-04 kaniiniMerge branch 'update-oauth-template-css-fix' into ... tree | commitdiff
2019-06-03 Maksim Pechnikovupdate api to set skip_thread_containment tree | commitdiff
2019-06-03 eugenijmRemove repeated scope lists tree | commitdiff
2019-06-03 lainCommonAPI: Add explicit addressing. tree | commitdiff
2019-06-03 eugenijmUse workaround for the heavy checkmark symbol in iOS tree | commitdiff
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template tree | commitdiff
2019-06-03 Maksim Pechnikovadd option skip_thread_containment tree | commitdiff
2019-06-03 rinpatchMerge branch 'feature/polls-2-electric-boogalo' into... tree | commitdiff
2019-06-03 rinpatchMerge branch 'develop' into feature/polls-2-electric... tree | commitdiff
2019-06-03 rinpatchMerge branch 'fix-dokku' into 'develop' tree | commitdiff
2019-06-03 lambdaMerge branch 'align-mastodon-conversations' into 'develop' tree | commitdiff
2019-06-03 rinpatchMerge branch 'develop' into feature/polls-2-electric... tree | commitdiff
2019-06-03 rinpatchChange query order in fetch_activities_for_context_quer... tree | commitdiff
2019-06-02 rinpatchRemove a TODO comment as the tests for poll view were... tree | commitdiff
2019-06-02 rinpatchMake error message about author's inability to vote... tree | commitdiff
2019-06-02 rinpatchRefresh the object in CommonAPI.vote instead of MastoAP... tree | commitdiff
2019-06-02 William Pitcockformatting tree | commitdiff
2019-06-02 William Pitcockmrf: add subchain policy tree | commitdiff
2019-06-02 William Pitcockmrf: allow a policy chain to be specified when filtering tree | commitdiff
2019-06-02 kaniiniMerge branch 'feature/notification-control-part-2'... tree | commitdiff
2019-06-01 rinpatchMastodon API: Refresh the object before rendering it... tree | commitdiff
2019-06-01 rinpatchMastodon API: actually check for poll votes tree | commitdiff
2019-06-01 rinpatchResolve merge conflicts tree | commitdiff
2019-06-01 rinpatchAdd poll votes tree | commitdiff
2019-06-01 kaniiniMerge branch 'bugfix/visibility-indicator-litepub-dm... tree | commitdiff
2019-06-01 kaniiniMerge branch 'bugfix/remove-others-follower-collections... tree | commitdiff
2019-06-01 Sergey SuprunenkoRemove all follower collections but actor's from "cc" tree | commitdiff
2019-06-01 kaniiniMerge branch 'bugfix/remove-vanilla-flavour' into ... tree | commitdiff
2019-06-01 William Pitcockvisibility: if litepub:directMessage is asserted, alway... tree | commitdiff
2019-05-31 Haelwenn (lanodan... Remove now useless flavours switching tree | commitdiff
2019-05-31 Haelwenn (lanodan... mastodon_api_controller.ex: Remove vanilla from support... tree | commitdiff
2019-05-31 HaelwennMerge branch 'dokku' into 'develop' tree | commitdiff
2019-05-31 lambdaMerge branch 'hotfix/leaking-lists' into 'develop' tree | commitdiff
2019-05-31 lainMastodonAPI: Add extension to set and get pleroma_setti... tree | commitdiff
2019-05-31 lainAccountView: settings -> settings_store tree | commitdiff
2019-05-31 lainUser: Add settings store to Info, AccountView tree | commitdiff
2019-05-31 rinpatchMastodon API: Fix lists leaking private posts tree | commitdiff
2019-05-31 rinpatchFix fix_explicit_addressing moving follower collection... tree | commitdiff
2019-05-31 lainMastodon Conversation API: Don't return own account... tree | commitdiff
2019-05-30 feldMerge branch 'fix/ogp-missing-data' into 'develop' tree | commitdiff
2019-05-30 Sergey SuprunenkoReplace missing non-nullable Card attributes with empty... tree | commitdiff
2019-05-30 lambdaMerge branch 'use-pleroma-config' into 'develop' tree | commitdiff
2019-05-30 Egor KislitsynUse Pleroma.Config everywhere tree | commitdiff
2019-05-29 kaniiniMerge branch 'revert-57e58d26' into 'develop' tree | commitdiff
2019-05-29 kaniiniRevert "Merge branch 'feature/search-authenticated... tree | commitdiff
2019-05-29 lambdaMerge branch 'fix/mastodon-search-limit' into 'develop' tree | commitdiff
2019-05-29 Mark FelderDefault search limit should be 40 tree | commitdiff
2019-05-29 kaniiniMerge branch 'feature/search-authenticated-only' into... tree | commitdiff
2019-05-29 William Pitcockrouter: require oauth_read for searching tree | commitdiff
2019-05-26 lambdaMerge branch 'refactor/die-httpoison-die' into 'develop' tree | commitdiff
2019-05-26 kaniiniMerge branch 'fix/mrf-simple' into 'develop' tree | commitdiff
2019-05-26 William Pitcockmrf: simple policy: fix matching imported activitypub... tree | commitdiff
2019-05-25 William Pitcocktwitter api: user view: expose user notification settin... tree | commitdiff
2019-05-25 William Pitcockremove @websub and @ostatus module-level constants tree | commitdiff
2019-05-25 William Pitcockkill @httpoison tree | commitdiff
2019-05-25 kaniiniMerge branch 'fix/nodeinfo-unavailable-when-not-federat... tree | commitdiff
2019-05-25 Aaron TinioKeep nodeinfo available when not federating tree | commitdiff
2019-05-24 kaniiniMerge branch 'feature/static-headers' into 'develop' tree | commitdiff
2019-05-24 feldMove the Cache Control header test to its own file tree | commitdiff
2019-05-24 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... tree | commitdiff
2019-05-23 rinpatchChange the order of preloading when fetching activities... tree | commitdiff
2019-05-22 kaniiniMerge branch 'feature/mrf-user-filter' into 'develop' tree | commitdiff
2019-05-22 rinpatchFix credo issues tree | commitdiff
2019-05-22 kaniiniMerge branch 'ssh-fixes' into 'develop' tree | commitdiff
2019-05-22 William Pitcockmrf: simple policy: add the ability to strip avatars... tree | commitdiff
2019-05-22 William Pitcockactivitypub: run user objects through MRF filters tree | commitdiff
2019-05-22 William Pitcockmrf: defang policy modules for filtering user profile... tree | commitdiff
2019-05-22 rinpatchExclude Answers from fetching by default tree | commitdiff
2019-05-22 rinpatchNormalize poll votes to Answer objects tree | commitdiff
2019-05-22 lambdaMerge branch 'issue/699' into 'develop' tree | commitdiff
2019-05-22 Maksim[#699] add worker to clean expired oauth tokens tree | commitdiff
2019-05-22 lambdaMerge branch 'feature/object-pruning' into 'develop' tree | commitdiff
2019-05-22 lambdaMerge branch 'refactor/keys' into 'develop' tree | commitdiff
2019-05-22 William Pitcocksalmon: fix credo tree | commitdiff
2019-05-22 rinpatchMerge branch 'bugfix/account_view_source.note' into... tree | commitdiff
next
Fork of https://akkoma.dev/AkkomaGang/akkoma.git