Francis Dinh
9e0dd21ed6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
7 years ago
Francis Dinh
0df1a4efc8
Fix comment grammar
7 years ago
Normandy
715c90e54f
Fix typo in MastoFE login page.
...
see https://git.pleroma.social/pleroma/mastofe/issues/13
7 years ago
lambda
d4a54a90c9
Merge branch 'gitignore' into 'develop'
...
Gitignore
See merge request pleroma/pleroma!131
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'
...
message rewrite facility
See merge request pleroma/pleroma!112
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'
...
Fix endpoint for favicon
See merge request pleroma/pleroma!84
7 years ago
lain
fc6f5bcad3
update frontend
7 years ago
lain
661fd3c93e
update frontend
7 years ago
Francis Dinh
8c0806539c
Embed announce activity data instead of linking to it
7 years ago
Francis Dinh
b1742eca42
Revert "Rename make_unannounce_data helper to make_undo_data"
...
This reverts commit c649ca8958
.
7 years ago
lain
0574df273c
Small cleanup.
7 years ago
lain
114ca9e069
Merge branch 'develop' into fix/note-count-not-updating
7 years ago
Francis Dinh
c649ca8958
Rename make_unannounce_data helper to make_undo_data
...
This makes it a bit more easier to adapt for unlikes as well in the
future.
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'
...
Resolve "Enable custom panel by default and have default content"
Closes #146
See merge request pleroma/pleroma!124
7 years ago
lambda
b7669c6efe
Merge branch 'readme-update' into 'develop'
...
Elaborate on setup steps and CLI commands.
See merge request pleroma/pleroma!126
7 years ago
lambda
b4b314be5d
Merge branch 'nginx-certbot-doc' into 'develop'
...
Add info about certbot with the webroot plugin to pleroma.nginx
See merge request pleroma/pleroma!125
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.
...
Seems to be faster in general, query planner chooses well.
7 years ago
Francis Dinh
f0798440de
Use correct activity for undo
7 years ago
Francis Dinh
4b9f2ab526
Fix federation of unreblog activity
7 years ago
csaurus
caf30646b1
Elaborate on setup steps and CLI commands.
...
* How to use MIX_ENV
* How to create a user
* Link to certbot's site with the webform which advises how to obtain
a certificate based on web server/OS.
7 years ago
csaurus
1c6a691570
Add info about certbot with the webroot plugin to pleroma.nginx
7 years ago
Francis Dinh
c5dc7e6e31
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
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
lain
0b4ff1bfe2
fix again
7 years ago
lambda
3f7b02e7c4
Merge branch 'feature/qvitter-notification-endpoint' into 'develop'
...
TwitterAPI: Add Qvitter notification endpoint.
Closes #142
See merge request pleroma/pleroma!123
7 years ago
Mark Felder
8dbb4c6c50
Remove hack for /about/more as we are doing this in Pleroma now
7 years ago
eal
fa37acfcc7
TwitterAPI: Add Qvitter notification endpoint.
7 years ago
lambda
678fed47ee
Merge branch 'patch-2' into 'develop'
...
Ignore setup_db.psql and specify a folder for custom emojis
See merge request pleroma/pleroma!121
7 years ago