Commit Graph

4471 Commits

Author SHA1 Message Date
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
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
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
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
Egor 9a39d1d846 Replace Pleroma.Jobs with `pleroma_job_queue` 2019-03-29 12:46:05 +00:00
lambda 749d53e2b2 Merge branch 'sayonara-gitlab-wiki' into 'develop'
Move out of Gitlab Wiki

See merge request pleroma/pleroma!990
2019-03-29 10:24:52 +00:00
lambda 52bec238c3 Merge branch 'feature/deploy-docs' into 'develop'
Add automatic documentation build and deploy for master and develop branches

Closes #478

See merge request pleroma/pleroma!965
2019-03-29 09:57:15 +00:00
kaniini ef3c23d40e Merge branch 'bugfix/migration-less_replies_count' into 'develop'
Revert awfully long migration from 568e34858

See merge request pleroma/pleroma!991
2019-03-29 07:32:24 +00:00
Haelwenn (lanodan) Monnier b2f3a40e53
Revert awfully long migration from 568e34858 2019-03-29 01:57:02 +01:00
rinpatch 634e09e1a8 Remove duplicated header from i2p.md 2019-03-28 20:29:46 +03:00
rinpatch 9bd80e6044 did it really take me 4 commits to fix this? 2019-03-28 20:27:01 +03:00
rinpatch d16e2a2e04 Remove duplicated header from admin_api.md 2019-03-28 20:16:59 +03:00
rinpatch e4601b2c1d remove admin tasks as they have their page in mix tasks category already 2019-03-28 20:16:14 +03:00
rinpatch d0026761b7 cringe 2019-03-28 20:13:22 +03:00
rinpatch dfae0050af Move out of Gitlab Wiki
I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just
* Gets everything from gitlab wiki
* Removes some specific gitlab hacks
* Formats all documentation file names to be in snake case so they look the same way as our code does
2019-03-28 19:46:30 +03:00
lambda a71831d1c2 Merge branch 'admin-api-user-show' into 'develop'
Admin API user show

Closes #766

See merge request pleroma/pleroma!987
2019-03-28 12:19:44 +00:00
eugenijm 10c81fc902 Add user show endpoint for Pleroma admin API 2019-03-27 21:44:15 +03:00
lambda 926bf114b7 Merge branch 'feature/more-user-filters' into 'develop'
Add more user filters + move search to its own module

See merge request pleroma/pleroma!982
2019-03-27 11:33:13 +00:00
lambda a5f141d9d5 Merge branch 'fix-reblog-tests' into 'develop'
Fix muting reblogs tests

See merge request pleroma/pleroma!984
2019-03-27 11:30:07 +00:00
rinpatch 776bb5137f Fix muting reblogs tests 2019-03-27 13:43:43 +03:00