bc215f5684
Fix format.
2018-04-29 11:28:26 +02:00
b7584edcea
Merge branch 'patch-bio' into 'develop'
...
replace newlines in profiles with <br>
See merge request pleroma/pleroma!136
2018-04-29 09:26:47 +00:00
4d55d7c95e
Insert object after being rewritten.
2018-04-28 16:10:24 +02:00
a7a40bb8f1
Merge branch 'fix/blocked-user-boosts' into 'develop'
...
ActivityPub.ex: do not return boosted statuses from blocked users.
See merge request pleroma/pleroma!111
2018-04-28 13:49:12 +00:00
6908f29e0a
Added a test (written by @andrewzah) for the MR
2018-04-28 12:01:43 +01:00
634c0c52a1
Merge remote-tracking branch 'upstream/develop' into patch-bio
2018-04-28 11:59:01 +01:00
39c80a3667
Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'
...
ActivityPub MRF SimplePolicy: fix media stripping
See merge request pleroma/pleroma!133
2018-04-27 05:49:12 +00:00
6eb274f278
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-04-26 07:07:04 +02:00
3bad2b827a
Resurrect instance specific panel.
2018-04-26 07:06:32 +02:00
90bbd94614
ActivityPub MRF SimplePolicy: fix media stripping
2018-04-25 16:28:53 -05:00
845bd56c9c
Merge branch 'patch-1' into 'develop'
...
Fix typo in MastoFE login page.
See merge request pleroma/pleroma!132
2018-04-25 14:35:44 +00:00
a7eb148d61
Optionally deactivate public timelines.
2018-04-25 16:11:07 +02:00
279b1d19f0
Align local bio limits to remote limit.
2018-04-25 15:41:59 +02:00
715c90e54f
Fix typo in MastoFE login page.
...
see https://git.pleroma.social/pleroma/mastofe/issues/13
2018-04-24 21:58:45 +00:00
d4a54a90c9
Merge branch 'gitignore' into 'develop'
...
Gitignore
See merge request pleroma/pleroma!131
2018-04-24 19:26:01 +00:00
c78e7d8b11
Fix formatting.
2018-04-24 21:25:31 +02:00
52b1bc782b
Add common files to gitignore
2018-04-24 12:18:23 -07:00
7a52c4549c
Merge branch 'feature/message-rewrite-facility' into 'develop'
...
message rewrite facility
See merge request pleroma/pleroma!112
2018-04-24 17:21:28 +00:00
bbd549c018
Update .gitlab-ci.yml
2018-04-24 12:28:59 +00:00
7517155544
Changed to support \r\n and \n
2018-04-24 13:28:55 +01:00
3f9385096e
Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into develop
2018-04-24 14:25:17 +02:00
52ee91efce
Patch to replace newlines with <br> tags in bio
2018-04-24 13:20:17 +01:00
afe892ddac
Correct syntax with mix format
2018-04-24 14:12:23 +02:00
9972678a68
Add User.decrease_note_count and call it from ActivityPub.delete
2018-04-24 11:34:18 +02:00
62a2287bba
Merge branch 'favicon_tag' into 'develop'
...
Fix endpoint for favicon
See merge request pleroma/pleroma!84
2018-04-24 05:54:28 +00:00
fc6f5bcad3
update frontend
2018-04-23 19:23:45 +02:00
661fd3c93e
update frontend
2018-04-23 19:09:24 +02:00
0574df273c
Small cleanup.
2018-04-22 10:01:10 +02:00
114ca9e069
Merge branch 'develop' into fix/note-count-not-updating
2018-04-22 09:56:24 +02:00
26af5bad33
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-04-21 18:28:24 +02:00
0c221943ef
Formatter: Use proper escaping for links.
2018-04-21 18:27:31 +02:00
22bfeac256
Update note count in ActivityPub.create.
2018-04-21 12:58:04 +03:00
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
2018-04-21 08:05:36 +00:00
b7669c6efe
Merge branch 'readme-update' into 'develop'
...
Elaborate on setup steps and CLI commands.
See merge request pleroma/pleroma!126
2018-04-21 08:05:04 +00:00
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
2018-04-21 07:59:49 +00:00
04276f0f53
Update README.md
2018-04-21 07:57:33 +00:00
9e6ae44729
Formatting fixes.
2018-04-21 09:43:53 +02:00
ce7618f6f6
add formatter
2018-04-21 09:34:23 +02:00
21510f6990
.
2018-04-21 09:30:15 +02:00
44a7789732
.
2018-04-21 09:28:44 +02:00
34aab9f877
..
2018-04-21 09:27:35 +02:00
b68c4bd271
Update CI.
2018-04-21 09:24:51 +02:00
ff5e957476
Make search use id index too.
...
Seems to be faster in general, query planner chooses well.
2018-04-21 09:22:31 +02:00
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.
2018-04-20 18:46:09 -04:00
1c6a691570
Add info about certbot with the webroot plugin to pleroma.nginx
2018-04-20 18:43:49 -04:00
90ad55b8ff
formatting
2018-04-20 19:21:48 +02:00
b0671be283
enable instance panel by default, added some content
2018-04-20 19:04:57 +02:00
a61e8ac154
Formatting.
2018-04-20 13:10:57 +02:00
18c3ca7844
Add format checking to CI.
2018-04-20 13:09:41 +02:00
193be32f45
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-04-19 21:44:29 +02:00
lain
lambda
Wim Vanderbauwhede
William Pitcock
eal
Normandy
Rachel H
Dashie
csaurus
Kawen