summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-02-11Merge branch 'develop' into feature/activitypubRoger Braun
2018-02-09update frontendRoger Braun
2018-02-09UtilController: Fix statusnet config api compatibility.Roger Braun
2018-02-09Merge branch 'develop' into 'develop'lambda
action_fallback for OAuth Controller See merge request pleroma/pleroma!63
2018-02-08Merge branch 'fix/config-disable-chat' into 'develop'lambda
Add config option for enabling/disabling chat. See merge request pleroma/pleroma!58
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
Also remove the erlang packages, they're specified in the Debian guide.
2018-02-05Merge branch 'fix/no-image-upload-filetype' into 'develop'eal
Detect file type if none given. See merge request pleroma/pleroma!62
2018-02-04Detect file type if none given.eal
2018-02-03Merge branch 'move-backend-images' into 'develop'lambda
Move avi.png & banner.png from /priv/static/static to /priv/static/images See merge request pleroma/pleroma!60
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
Add remote following of local profiles. See merge request pleroma/pleroma!59
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
Provide instance thumbnail in /api/v1/instance See merge request pleroma/pleroma!55
2018-01-31Merge branch 'fix/split-custom-emoji' into 'develop'lambda
Split emoji to default and custom. See merge request pleroma/pleroma!56
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
Pr upstream http proxy See merge request pleroma/pleroma!43
2018-01-30Merge branch 'feature/caddyfile' into 'develop'lambda
Add a Caddyfile. See merge request pleroma/pleroma!50
2018-01-29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun
2018-01-29Fix incoming Pleroma CWs. Closes #96.Roger Braun
2018-01-29use nil instead of empty stringJeff Becker
2018-01-27Merge branch 'feature/longfox' into 'develop'lambda
add longfox emojis See merge request pleroma/pleroma!53
2018-01-27add longfox emojisHakaba Hitoyo
2018-01-26Merge branch 'feature/cross-origin' into 'develop'lambda
Access-Control-Allow-Origin See merge request pleroma/pleroma!52
2018-01-26Access-Control-Allow-OriginHakaba Hitoyo
2018-01-26Update frontend.Roger Braun
2018-01-26Fix config.Roger Braun
2018-01-26Update frontend.Roger Braun
2018-01-24Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxyJeff Becker
2018-01-20Stats: Make less crashy and improve query.Roger Braun
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-14 18:01:21 +0000