Commit Graph

1195 Commits (ae6e3cb98166a89c8cad0f3ec614cdfab6a9dd52)
 

Author SHA1 Message Date
lain 38b61fddfe HttpSignature Plug: Skip if already valid.
7 years ago
lain 0aa56a853b UserTest: Move insert_or_update test.
7 years ago
lain b331cb449a Merge branch 'develop' into feature/activitypub
7 years ago
lain 1bc34de4df Add missing support file.
7 years ago
lain 26ccb768d3 Make test output easier to read.
7 years ago
lain 33a5d0a238 Fix some test warnings.
7 years ago
lain 91928b06ab Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into develop
7 years ago
lain 3c80d9b277 Fix spec.
7 years ago
lain e946f300ae update frontend
7 years ago
lain dfc23e717f update frontend
7 years ago
lain 8cf97ee8e1 ActivityPub: Basic note federation with Mastodon.
7 years ago
lain ce31f3a922 Twitter Representers: Handle Mastodon attachments.
7 years ago
Roger Braun ae1ec858f4 Basic AP user building.
7 years ago
Roger Braun c1d26751e6 Mocks: Add mastodon user json example.
7 years ago
lambda 1d52afe83e Merge branch 'feature/instance-specific-panel' into 'develop'
7 years ago
Hakaba Hitoyo 9cf293c84b Merge remote-tracking branch 'hakabahitoyo/feature/instance-specific-panel' into feature/instance-specific-panel
7 years ago
Roger Braun 52200998c9 Merge branch 'develop' into feature/activitypub
7 years ago
Roger Braun 0e2ca77eec update frontend
7 years ago
hakabahitoyo a61f21ff4f print <link rel="next"> element in atom.feed
7 years ago
Hakaba Hitoyo 7124f12a94 introduce max_id parameter in feed.atom (debug)
7 years ago
Roger Braun 08f458e6df UtilController: Fix statusnet config api compatibility.
7 years ago
Hakaba Hitoyo 9c61f60558 introduce max_id parameter in feed.atom
7 years ago
lambda af854f7e01 Merge branch 'develop' into 'develop'
7 years ago
lambda f0cde24f71 Merge branch 'fix/config-disable-chat' into 'develop'
7 years ago
Calv Collins 73249fa5ff Changed fallback controller to handle all cases from OAuthController
7 years ago
Calv Collins 314f4775c5 Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop
7 years ago
Calv Collins bdb5dd2194 Create action_fallback for username/password incorrect input
7 years ago
Roger Braun 2f291576e4 Fix compile errors on 1.4.5
7 years ago
Roger Braun 103eca482c update frontend
7 years ago
eal b1edfba3b9 Update required Elixir version in README
7 years ago
eal 8df0aee889 Merge branch 'fix/no-image-upload-filetype' into 'develop'
7 years ago
eal 286f6698ee Detect file type if none given.
7 years ago
Hakaba Hitoyo a2fac9b0e8 adjust panel.html
7 years ago
Hakaba Hitoyo bffc78f2a8 add backend default for instance specific panel
7 years ago
lambda 61c16193de Merge branch 'move-backend-images' into 'develop'
7 years ago
Hakaba Hitoyo c8a2931549 add backend endpoint /images
7 years ago
Hakaba Hitoyo ea6d1b2b17 move avi.png & banner.png from /priv/static/static to /priv/static/images
7 years ago
eal f0745148a3 Add config option for enabling/disabling chat.
7 years ago
Roger Braun 9a9766d648 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
Roger Braun 2203fa2fdb Update frontend.
7 years ago
lambda 3163311098 Merge branch 'feature/remote-follow' into 'develop'
7 years ago
eal 29be70c008 Add remote following of local profiles.
7 years ago
eal ab83e0de6d TwitterAPI: Add is_local to user view.
7 years ago
eal 15cb3f2b01 Revert renaming emoji.txt
7 years ago
eal 0f194dc56b Merge branch 'feature/instance-thumbnail-api' into 'develop'
7 years ago
lambda 3fa6f3ae42 Merge branch 'fix/split-custom-emoji' into 'develop'
7 years ago
eal ab8b9ababa Split emoji to default and custom.
7 years ago
Hakaba Hitoyo 03c15a54f5 provide instance thumbnail at /api/v1/instance (debug)
7 years ago
Hakaba Hitoyo e47f60c053 provide instance thumbnail at /api/v1/instance (debug)
7 years ago
Hakaba Hitoyo 10753178ea provide instance thumbnail at /api/v1/instance (debug)
7 years ago