Commit Graph

1347 Commits (bc215f568473bb3801b6eff238fee48f5de2bab8)
 

Author SHA1 Message Date
lain bc215f5684 Fix format.
6 years ago
lambda b7584edcea Merge branch 'patch-bio' into 'develop'
6 years ago
lain 4d55d7c95e Insert object after being rewritten.
6 years ago
lambda a7a40bb8f1 Merge branch 'fix/blocked-user-boosts' into 'develop'
6 years ago
Wim Vanderbauwhede 6908f29e0a Added a test (written by @andrewzah) for the MR
6 years ago
Wim Vanderbauwhede 634c0c52a1 Merge remote-tracking branch 'upstream/develop' into patch-bio
6 years ago
lambda 39c80a3667 Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'
6 years ago
lain 6eb274f278 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
6 years ago
lain 3bad2b827a Resurrect instance specific panel.
6 years ago
William Pitcock 90bbd94614 ActivityPub MRF SimplePolicy: fix media stripping
6 years ago
eal 845bd56c9c Merge branch 'patch-1' into 'develop'
6 years ago
lain a7eb148d61 Optionally deactivate public timelines.
6 years ago
lain 279b1d19f0 Align local bio limits to remote limit.
6 years ago
Normandy 715c90e54f Fix typo in MastoFE login page.
7 years ago
lambda d4a54a90c9 Merge branch 'gitignore' into 'develop'
7 years ago
lain c78e7d8b11 Fix formatting.
7 years ago
Rachel H 52b1bc782b Add common files to gitignore
7 years ago
lambda 7a52c4549c Merge branch 'feature/message-rewrite-facility' into 'develop'
7 years ago
lambda bbd549c018 Update .gitlab-ci.yml
7 years ago
Wim Vanderbauwhede 7517155544 Changed to support \r\n and \n
7 years ago
lain 3f9385096e Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into develop
7 years ago
Wim Vanderbauwhede 52ee91efce Patch to replace newlines with <br> tags in bio
7 years ago
Dashie afe892ddac
Correct syntax with mix format
7 years ago
Dashie 9972678a68
Add User.decrease_note_count and call it from ActivityPub.delete
7 years ago
lambda 62a2287bba Merge branch 'favicon_tag' into 'develop'
7 years ago
lain fc6f5bcad3 update frontend
7 years ago
lain 661fd3c93e update frontend
7 years ago
lain 0574df273c Small cleanup.
7 years ago
lain 114ca9e069 Merge branch 'develop' into fix/note-count-not-updating
7 years ago
lain 26af5bad33 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
lain 0c221943ef Formatter: Use proper escaping for links.
7 years ago
eal 22bfeac256 Update note count in ActivityPub.create.
7 years ago
lambda d0b1c498a0 Merge branch '146-enable-custom-panel-by-default-and-have-default-content' into 'develop'
7 years ago
lambda b7669c6efe Merge branch 'readme-update' into 'develop'
7 years ago
lambda b4b314be5d Merge branch 'nginx-certbot-doc' into 'develop'
7 years ago
lambda 04276f0f53 Update README.md
7 years ago
lain 9e6ae44729 Formatting fixes.
7 years ago
lain ce7618f6f6 add formatter
7 years ago
lain 21510f6990 .
7 years ago
lain 44a7789732 .
7 years ago
lain 34aab9f877 ..
7 years ago
lain b68c4bd271 Update CI.
7 years ago
lain ff5e957476 Make search use id index too.
7 years ago
csaurus caf30646b1 Elaborate on setup steps and CLI commands.
7 years ago
csaurus 1c6a691570 Add info about certbot with the webroot plugin to pleroma.nginx
7 years ago
Kawen 90ad55b8ff formatting
7 years ago
Kawen b0671be283 enable instance panel by default, added some content
7 years ago
lain a61e8ac154 Formatting.
7 years ago
lain 18c3ca7844 Add format checking to CI.
7 years ago
lain 193be32f45 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago