aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-02-12Make test output easier to read.lain
2018-02-12Fix some test warnings.lain
2018-02-12Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into developlain
2018-02-12Fix spec.lain
2018-02-11update frontendlain
2018-02-11update frontendlain
2018-02-11Merge branch 'feature/instance-specific-panel' into 'develop'lambda
2018-02-11Merge remote-tracking branch 'hakabahitoyo/feature/instance-specific-panel' i...Hakaba Hitoyo
2018-02-09update frontendRoger Braun
2018-02-09print <link rel="next"> element in atom.feedhakabahitoyo
2018-02-09introduce max_id parameter in feed.atom (debug)Hakaba Hitoyo
2018-02-09UtilController: Fix statusnet config api compatibility.Roger Braun
2018-02-09introduce max_id parameter in feed.atomHakaba Hitoyo
2018-02-09Merge branch 'develop' into 'develop'lambda
2018-02-08Merge branch 'fix/config-disable-chat' into 'develop'lambda
2018-02-08Changed fallback controller to handle all cases from OAuthControllerCalv Collins
2018-02-08Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into developCalv Collins
2018-02-08Create action_fallback for username/password incorrect inputCalv Collins
2018-02-08Fix compile errors on 1.4.5Roger Braun
2018-02-07update frontendRoger Braun
2018-02-06Update required Elixir version in READMEeal
2018-02-05Merge branch 'fix/no-image-upload-filetype' into 'develop'eal
2018-02-04Detect file type if none given.eal
2018-02-04adjust panel.htmlHakaba Hitoyo
2018-02-03add backend default for instance specific panelHakaba Hitoyo
2018-02-03Merge branch 'move-backend-images' into 'develop'lambda
2018-02-03add backend endpoint /imagesHakaba Hitoyo
2018-02-03move avi.png & banner.png from /priv/static/static to /priv/static/imagesHakaba Hitoyo
2018-02-03Add config option for enabling/disabling chat.eal
2018-02-02Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun
2018-02-02Update frontend.Roger Braun
2018-02-02Merge branch 'feature/remote-follow' into 'develop'lambda
2018-02-02Add remote following of local profiles.eal
2018-02-01TwitterAPI: Add is_local to user view.eal
2018-01-31Revert renaming emoji.txteal
2018-01-31Merge branch 'feature/instance-thumbnail-api' into 'develop'eal
2018-01-31Merge branch 'fix/split-custom-emoji' into 'develop'lambda
2018-01-31Split emoji to default and custom.eal
2018-01-31provide instance thumbnail at /api/v1/instance (debug)Hakaba Hitoyo
2018-01-31provide instance thumbnail at /api/v1/instance (debug)Hakaba Hitoyo
2018-01-31provide instance thumbnail at /api/v1/instance (debug)Hakaba Hitoyo
2018-01-31provide instance thumbnail at /api/v1/instanceHakaba Hitoyo
2018-01-30Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun
2018-01-30Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into developRoger Braun
2018-01-30Make specs less breaky.Roger Braun
2018-01-30Fix specs.Roger Braun
2018-01-30provide logo at feed.atom (debug)Hakaba Hitoyo
2018-01-30provide logo at feed.atomHakaba Hitoyo
2018-01-30Merge branch 'pr-upstream-http-proxy' into 'develop'lambda
2018-01-30Merge branch 'feature/caddyfile' into 'develop'lambda