aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-05-11make url uniform in admin apiSachin Joshi
2019-05-11Merge branch 'feature/adminfe' into 'develop'Haelwenn
2019-05-11Initial bundle of basic AdminFEfeld
2019-05-10Merge branch 'fix/retweet-language' into 'develop'lambda
2019-05-09Use "repeated" instead of "retweeted" for repeated statuses in Twitter APIFrancis Dinh
2019-05-09Merge branch 'improve/gitignore' into 'develop'Haelwenn
2019-05-09Prevent committing code coverage results to the repoMark Felder
2019-05-08Merge branch 'feature/761-add-users-filtration' into 'develop'kaniini
2019-05-08Merge developAlexander Strizhakov
2019-05-08Merge branch 'fix/851-emoji-redirect-follow' into 'develop'lambda
2019-05-08emoji dowload follow redirectsAlex S
2019-05-08Merge branch 'refactor/oauth_scopes' into 'develop'lambda
2019-05-08Refactoring functions for dealing with oauth scopes.Maksim
2019-05-07Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'kaniini
2019-05-07twitterapi: use order constraint to force descending orderWilliam Pitcock
2019-05-07activitypub: add optional order constraint to timeline query builderWilliam Pitcock
2019-05-07Remove `bookmarks` assoc and add a fake `bookmark` assoc insteadrinpatch
2019-05-07Use with_preloaded_bookmark in create_by_object_ap_id_with_objectrinpatch
2019-05-07- Actually use preloaded bookmarks in viewsrinpatch
2019-05-07Preload bookmarks wherever the object is preloadedrinpatch
2019-05-07Remove bookmarks assocrinpatch
2019-05-07Merge branch 'docs/MRF-modules' into 'develop'kaniini
2019-05-07containment: remove pointless moduledoc lineWilliam Pitcock
2019-05-07Merge branch 'conversations_three' into 'develop'lambda
2019-05-07Merge branch 'unused-config-parameter' into 'develop'rinpatch
2019-05-07unused config paramaterAlex S
2019-05-07Merge branch 'fix/ex_doc-source-links' into 'develop'rinpatch
2019-05-07Fix/ex_doc source linksxse
2019-05-06Merge branch 'issue_800' into 'develop'lambda
2019-05-06fix formatMaksim
2019-05-06Merge branch 'feature/bbs' into 'develop'lambda
2019-05-06Merge branch 'feature/845-improve-status-deletion' into 'develop'lambda
2019-05-06Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fea...Alexander Strizhakov
2019-05-06Remove H1 in @moduledocHaelwenn (lanodan) Monnier
2019-05-06mrf/tag_policy.ex: Add some documentationHaelwenn (lanodan) Monnier
2019-05-06Add short documentation on every MRF PolicyHaelwenn (lanodan) Monnier
2019-05-04BBS: Credo fixes.lain
2019-05-04BBS: Fix tests.lain
2019-05-04BBS: Use cached user fetcher.lain
2019-05-04BBS: small fixes.lain
2019-05-04Merge remote-tracking branch 'origin/develop' into feature/bbslain
2019-05-03Merge branch 'fix/embeded-relationship-in-follows' into 'develop'rinpatch
2019-05-03Merge branch 'fix-search-speed' into 'develop'rinpatch
2019-05-03Just have Benchee in all environments.lain
2019-05-03Mix: Also have benchee in test.lain
2019-05-03Merge branch 'bugfix/emoji-size' into 'develop'lambda
2019-05-03Search: Add fts index on objects table.lain
2019-05-03MastoAPI: profile update with emoji_mapHaelwenn (lanodan) Monnier
2019-05-03TwitterAPI: profile update with emoji_mapHaelwenn (lanodan) Monnier
2019-05-03Web.TwitterAPI.UserView: Also view local user emojisHaelwenn (lanodan) Monnier