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'
...
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
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
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
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
nenolod@dereferenced.org
f08f9d4498
ActivityPub MRF: fix nsfw tagging of objects with attachments by looking at the right object (the child in this case)
7 years ago
lain
7b96a756fb
fix again
7 years ago
lain
77fc40d5d7
Fix generate config
7 years ago
Dominik V. Salonen
8696c25efd
Ignore setup_db.psql and ignore a folder for custom emojis
...
Wiki page should also be updated to recommend that admins put their custom emojis in /priv/static/emoji/custom/. This both makes for less hassle when doing a pull. And also prevents more mess in the /priv/static/emoji/ folder.
7 years ago
eal
e30a056476
Revert "Ask for proxy URL if proxy enabled."
...
The most common case is running it on the same server.
7 years ago
lambda
e4da81d662
Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'
...
CommonAPI post: kill \r with fire
See merge request pleroma/pleroma!120
7 years ago
William Pitcock
ee6f15529d
CommonAPI post: kill \r with fire
7 years ago
eal
b586ead6b8
rm_user: also ensure that cache is running.
7 years ago
lambda
8b5ea91f68
Merge branch 'fix/rm-user-task' into 'develop'
...
Fix rm_user task.
See merge request pleroma/pleroma!119
7 years ago
eal
4e3fc530db
Fix rm_user task.
7 years ago
lambda
a80cdd5906
Merge branch 'fix/login-with-username-or-email' into 'develop'
...
MastoAPI and OAuth: allow login with either email or username.
See merge request pleroma/pleroma!118
7 years ago
eal
947431e9aa
MastoAPI and OAuth: allow login with either email or username.
7 years ago
lain
e153b364a7
update frontend
7 years ago
William Pitcock
d24ddd9fb9
ActivityPub MRF: implement the SimplePolicy policy
7 years ago
William Pitcock
4a178b3d65
ActivityPub: implement MRF core hook and baseline noop policy object
7 years ago
eal
48380aeccc
ActivityPub.ex: do not return boosted statuses from blocked users.
7 years ago
lambda
fef8daa454
Update README.md
7 years ago
lambda
3b68eaa0ce
Merge branch 'mix_task_rm_user' into 'develop'
...
Add rm_user mix task
See merge request pleroma/pleroma!109
7 years ago
Phenethylamine
13a64b82e3
Switch to User.delete for rm_user task
7 years ago
Phenethylamine
4478b9115c
Add rm_user mix task
7 years ago
lambda
3d636cf533
Merge branch 'develop' into 'develop'
...
Fix issue #124
Closes #124
See merge request pleroma/pleroma!108
7 years ago
lain
5612716c25
update frontend
7 years ago
lain
a8dddd9279
update frontend
7 years ago
Gian Sass
2de2e29df2
Oops
7 years ago