Commit Graph

6654 Commits

Author SHA1 Message Date
rinpatch
f8aa917eef Merge branch 'bugfix/mastoapi/2.8.0-fake_identityproof' into 'develop'
router: Add fake identity proof endpoint

See merge request pleroma/pleroma!1006
2019-04-02 05:31:41 +00:00
Sachin Joshi
6386c1c9c1 fetch url for OStatus to know if it is a/c or status 2019-04-02 10:26:09 +05:45
Haelwenn (lanodan) Monnier
f56eef8d8c
router: Add fake identity proof endpoint 2019-04-02 01:53:38 +02:00
lambda
fd7dd8f9a2 Merge branch 'fix/default-mail-adapter' into 'develop'
Add default mail adapter settings to config

See merge request pleroma/pleroma!994
2019-04-01 21:47:40 +00:00
lambda
fc2bef5ac3 Merge branch 'documentation-improvements' into 'develop'
Small documentation improvements

See merge request pleroma/pleroma!1001
2019-04-01 21:20:11 +00:00
Sergey Suprunenko
b6f9f7b8aa
Handle dates in the Unix timestamp format (Fixes #763) 2019-04-01 22:45:24 +02:00
Sachin Joshi
1d01e8e656 [OStatus] adds status to pleroma instance if the url given is a status 2019-04-01 22:26:58 +05:45
Haelwenn (lanodan) Monnier
66e7d4966d
COPYING: Wording
[ci skip]
2019-04-01 18:34:53 +02:00
rinpatch
5373077501 update mastodon api link in README to point to a non-outdated docs 2019-04-01 19:27:40 +03:00
rinpatch
d976cc5df7 Merge branch 'update-readme' into 'develop'
Fix dead links in README.md and add note about new docs site

See merge request pleroma/pleroma!1000
2019-04-01 16:25:02 +00:00
rinpatch
e2b94d8f33 Make only important note bold rather than the whole paragraph because it looks better that way 2019-04-01 19:24:50 +03:00
rinpatch
a309b49c2d Remove outdated howto change config and port and move it to config.md instead 2019-04-01 19:19:06 +03:00
Karen Konou
41f02e87a1 Link to docs page instead of to clients.md 2019-04-01 18:13:42 +02:00
Haelwenn (lanodan) Monnier
715a31c1ed
COPYING: wrap to 79, city.jpg Unsplash, wording
[ci skip]
2019-04-01 18:13:13 +02:00
Karen Konou
3c9abf5dee Fix dead links and add note about new docs site 2019-04-01 18:02:58 +02:00
Ivan Tashkinov
6910fb371b Fixed local MastoFE authentication / force_login option. 2019-04-01 17:25:25 +03:00
rinpatch
949cfde065 restart makes no sense here as we instructed to stop the service before 2019-04-01 16:26:46 +03:00
rinpatch
bff8cde0cf Instruct to stop the service only after git pulling and getting deps to minimize downtimes 2019-04-01 16:23:32 +03:00
rinpatch
7c69c6f624 change bold text to be proper geadings in introduction.md 2019-04-01 16:22:12 +03:00
rinpatch
b46e6f0949 Fix backup/restore page to have proper headings 2019-04-01 16:10:47 +03:00
Ivan Tashkinov
cbe09d94d1 Added force_login authentication option (previously applied by default). 2019-04-01 14:46:50 +03:00
Alex S
49733f6176 add docs folder to gitignore
ref #770
2019-04-01 18:28:19 +07:00
Alex S
17d3d05a71 code style
little fix
2019-04-01 17:54:30 +07:00
Alex S
3601f03147 Adding tag to emoji ets table
changes in apis
2019-04-01 17:17:57 +07:00
rinpatch
fe5145eeaa Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex 2019-04-01 12:25:53 +03:00
rinpatch
975482f091 insert object defaults for fake activities and make credo happy 2019-04-01 12:16:51 +03:00
rinpatch
d866b59eea oof 2019-04-01 11:58:08 +03:00
rinpatch
45ba10bf47 Fix the issue with HTML scrubber 2019-04-01 11:55:59 +03:00
Ivan Tashkinov
804173fc92 [#923] Minor code readability fix. 2019-04-01 09:45:44 +03:00
Ivan Tashkinov
eadafc88b8 [#923] Deps config adjustment (no override for httpoison), code analysis issues fixes. 2019-04-01 09:28:56 +03:00
Ivan Tashkinov
baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-01 08:49:32 +03:00
Haelwenn (lanodan) Monnier
0bab2661ae
COPYING: Add copyright notice for the finmojis
[ci skip]
2019-04-01 02:15:14 +02:00
Mark Felder
d5a1e08bf1 Add default mail adapter settings to config 2019-03-31 17:46:17 -05:00
Haelwenn (lanodan) Monnier
8ae4837abd
COPYING: Add copyright notice for the whole repository
[ci skip]
2019-04-01 00:32:00 +02:00
Haelwenn (lanodan) Monnier
362603c723
LICENSE → AGPL-3
[ci skip]
2019-04-01 00:31:21 +02:00
Haelwenn (lanodan) Monnier
32e843f033
CC-BY-SA-4.0: Add a copy of the CC-BY-SA-4.0 license
[ci skip]
2019-04-01 00:30:21 +02:00
lain
629ad1766c BBS: Some fixes. 2019-03-31 21:53:17 +02:00
lain
e3bf6655ba Add replying. 2019-03-31 21:24:29 +02:00
lain
10fdc080a0 BBS: Tests and formatting. 2019-03-31 20:35:10 +02:00
Horsemans
10a9682596 ssl_trusted_certificate should point to chain.pem if we're demonstrating LetsEncrypt: https://community.letsencrypt.org/t/howto-ocsp-stapling-for-nginx/13611/5 2019-03-31 16:58:28 +00:00
lain
3fc4ea45df BBS: Add documentation. 2019-03-31 18:14:51 +02:00
lain
17ab9fa45b BBS: Some more functionality. 2019-03-31 18:01:16 +02:00
lain
c810fb81a4 Basic SSH daemon. 2019-03-31 14:55:09 +02:00
rinpatch
cd387f8693 Add a fake option to lazy_put_actvity_defaults 2019-03-30 13:57:54 +03:00
rinpatch
42b779527c document fake option 2019-03-29 22:15:20 +03:00
rinpatch
1bb4d5d65b Implement fake status submit 2019-03-29 21:59:04 +03:00
lambda
dc39d8d3fb Merge branch 'fix/job-queue-doc' into 'develop'
Improve PleromaJobQeue config documentation

See merge request pleroma/pleroma!993
2019-03-29 13:43:07 +00:00
rinpatch
afbc905a1c qs 2019-03-29 16:38:18 +03:00
rinpatch
11584488d1 Improve PleromaJobQeue config documentation 2019-03-29 16:11:22 +03:00
lambda
a5edc4da62 Merge branch 'pleroma_job_queue' into 'develop'
Replace Pleroma.Jobs with `pleroma_job_queue`

See merge request pleroma/pleroma!992
2019-03-29 12:46:05 +00:00