Commit graph

8335 commits

Author SHA1 Message Date
Ilja
c8964cc438 DOCS General update for the "Introduction to Pleroma" section
* Put url's between angle brackets. docs-develop doesn't list the url's as links, I assume these will fix that (but don't know if I can check)
* Added a third space before the "sub"bulletpoints. docs-develop doesn't show them as subpoints with only two spaces. I hope three will fix it (but don't know if I can check)
* Added a newline above the bulletpoints because otherwise they are broken on docs-develop
* Remove the 😄 thingies because neither of the docs (docs.pleroma.social and docs-develop.social) show them as emojis
* Add a link to fediverse.network
* Update to add new stuff and fix things that aren't correct (any more)
2020-01-28 12:57:06 +00:00
lain
95afcae194 Merge branch 'support/update_ecto' into 'develop'
updated ecto and fixed warning

See merge request pleroma/pleroma!2150
2020-01-28 12:49:22 +00:00
Alexander Strizhakov
aa3ba63513
like this 2020-01-28 15:41:45 +03:00
lain
4f004ab92e Merge branch 'fix/attachments-cleanup' into 'develop'
Fix/attachments cleanup

See merge request pleroma/pleroma!2148
2020-01-28 12:40:00 +00:00
lain
51283bf996 Formatter: Add a test for domain / username clashes 2020-01-28 13:38:21 +01:00
Alexander Strizhakov
91ea3ed82c
moving restarter application into pleroma repo 2020-01-28 15:19:05 +03:00
Maksim Pechnikov
02c3dd2e3d update ecto 2020-01-28 10:43:47 +03:00
Roman Chvanikov
eb4870e1cd Remove unused var 2020-01-28 03:54:54 +03:00
Roman Chvanikov
52e08ec9fd explicitly describe perform op in AttachmentsClenupWorker 2020-01-28 03:52:50 +03:00
Maksim Pechnikov
be926863a8 fix test 2020-01-27 21:20:33 +03:00
Maksim Pechnikov
bcffa662dc Merge branch 'develop' into feature/tag_feed 2020-01-27 21:13:13 +03:00
Alexander Strizhakov
7c6e5c541d
docs update 2020-01-27 19:48:20 +03:00
Haelwenn
b12f306473 Merge branch 'remove/suggestions-third-party-engine' into 'develop'
Remove user recommendation by third party engine

See merge request pleroma/pleroma!2141
2020-01-27 13:21:50 +00:00
dabd535e43 Remove user recommendation by third party engine 2020-01-27 13:21:50 +00:00
Haelwenn
0b582d415b Merge branch 'descriptions-fixes' into 'develop'
Little fixes for descriptions.exs

See merge request pleroma/pleroma!2147
2020-01-27 11:45:26 +00:00
Alexander Strizhakov
f72727a409
little fixes 2020-01-27 12:53:21 +03:00
Roman Chvanikov
86c4b76bf0 Fix typo 2020-01-27 04:01:50 +03:00
36838b516f Merge branch 'fix/runtime-config' into 'develop'
Fixes for runtime config

See merge request pleroma/pleroma!2143
2020-01-26 17:35:21 +00:00
f4335ccd7a Merge branch 'issue/1280' into 'develop'
[#1280] updated error messages for authentication process

Closes #1280

See merge request pleroma/pleroma!2111
2020-01-26 17:33:12 +00:00
Mark Felder
d770cffce0 Merge branch 'develop' into issue/1280 2020-01-26 11:23:05 -06:00
d9e2bd8f40 Merge branch 'fix/descriptions' into 'develop'
Fixes for descriptions.exs

Closes admin-fe#68

See merge request pleroma/pleroma!2145
2020-01-26 17:21:49 +00:00
Alexander Strizhakov
5943d78c74
description typos, Oban verbose type fix, new keys 2020-01-25 19:45:51 +03:00
Alexander Strizhakov
ac97d01fb6
right test 2020-01-25 19:21:21 +03:00
Alexander Strizhakov
e93cc561cd
restarting pleroma from outside application 2020-01-25 18:42:04 +03:00
Alexander Strizhakov
de4102b247
can be changed in runtime 2020-01-25 10:39:10 +03:00
Alexander Strizhakov
6252e82f85
respect settings from database in mix tasks 2020-01-25 10:33:27 +03:00
Maksim Pechnikov
99c0a11c58 added atom feed 2020-01-24 22:12:23 +03:00
Maksim Pechnikov
055edd3d72 Merge branch 'develop' into feature/tag_feed 2020-01-24 21:46:57 +03:00
28f822877f Merge branch 'chore/changelog-for-dynamic-config' into 'develop'
Document dynamic_configuration breaking change

See merge request pleroma/pleroma!2142
2020-01-24 14:11:06 +00:00
Mark Felder
a43b73bba9 Document dynamic_configuration breaking change 2020-01-24 08:04:25 -06:00
0a5e792454 Merge branch 'fix/better-descriptions-for-email-fields' into 'develop'
Better descriptions for email fields for admin-fe

Closes admin-fe#67

See merge request pleroma/pleroma!2138
2020-01-24 13:54:44 +00:00
rinpatch
8533b63d1f Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
Fix for non existing atom

Closes #1532

See merge request pleroma/pleroma!2139
2020-01-24 11:33:02 +00:00
rinpatch
0fceeb44b3 Merge branch 'emoji-reaction-sanity-check' into 'develop'
Emoji reactions: Add sanity checks for the cache

See merge request pleroma/pleroma!2132
2020-01-24 11:32:25 +00:00
rinpatch
72edc3e30f Merge branch 'fix/removing-mdii-uploader-from-descriptions' into 'develop'
Removing deleted MDII uploader from suggestions

Closes admin-fe#64

See merge request pleroma/pleroma!2137
2020-01-24 11:31:34 +00:00
rinpatch
ecff8e92ff Merge branch 'emoji-reaction-api-change-2' into 'develop'
Emoji reaction api change 2

See merge request pleroma/pleroma!2140
2020-01-24 11:31:24 +00:00
lain
9a994878f1 Emoji reactions: Update docs and changelog 2020-01-24 10:53:01 +01:00
lain
347f3ed2c6 Emoji reactions: Change api format once more 2020-01-24 10:52:24 +01:00
Alexander Strizhakov
6a0f0ac4a2
fix for non existing atom 2020-01-24 12:22:26 +03:00
Alexander Strizhakov
e9d8a84790
better descriptions for email fields for admin-fe 2020-01-24 11:19:12 +03:00
Alexander Strizhakov
b0ae69d996
removing deleted MDII uploader from suggestions 2020-01-24 11:05:03 +03:00
Maksim Pechnikov
293281fcbd Merge branch 'develop' into feature/tag_feed 2020-01-24 08:58:07 +03:00
a182d400d7 Merge branch 'fix_for_migrate_to_db_test' into 'develop'
Fix for migrate to db test

See merge request pleroma/pleroma!2133
2020-01-24 00:25:38 +00:00
362295358a Merge branch 'truncate_config_table_on_migrate_to_db' into 'develop'
Truncate config table on migrate to db task and fix for parsing Swoosh adapters

Closes #1529

See merge request pleroma/pleroma!2136
2020-01-23 17:18:11 +00:00
Alexander Strizhakov
6cd2e851d9
parsing Swoosh modules 2020-01-23 18:21:29 +03:00
Alexander Strizhakov
e8e57e398f
restart config id after truncate 2020-01-23 17:48:45 +03:00
Alexander Strizhakov
4344c5d5b9
truncate config table on migrate to db task 2020-01-23 17:23:02 +03:00
Alexander Strizhakov
2bad25cf14
fix for migrate to db test 2020-01-23 15:13:27 +03:00
sadposter
4646d3c9d6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-01-23 11:55:07 +00:00
lain
34fc0ca053 Emoji reactions: Add sanity checks for the cache 2020-01-23 12:34:34 +01:00
Maksim Pechnikov
2cfe1b9385 Merge branch 'develop' into feature/tag_feed 2020-01-23 11:42:10 +03:00