moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,078 Commits 2 Branches 0 Tags 208 MiB
Commit Graph

8078 Commits

Author SHA1 Message Date
Alexander Strizhakov 5943d78c74
description typos, Oban verbose type fix, new keys 2020-01-25 19:45:51 +03:00
feld 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
feld 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
feld 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
feld 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
lain 34fc0ca053 Emoji reactions: Add sanity checks for the cache 2020-01-23 12:34:34 +01:00
Haelwenn dddebee047 Merge branch 'emoji-notifications' into 'develop' 
Emoji notifications

See merge request pleroma/pleroma!2130
 2020-01-23 02:12:03 +00:00
Haelwenn 73e6bbbe89 Merge branch 'develop' into 'develop' 
Updated OpenBSD installation guide for version OpenBSD 6.6

See merge request pleroma/pleroma!2131
 2020-01-23 02:05:22 +00:00
Farhan Khan 89eeadc2a8
Updated OpenBSD installation guide for version OpenBSD 6.6 
* initdb command now requires explicit -U and -D flags
* acme-client now requires version v02 API endpoint
* Added step to add admin user, per other installation guides
* Corrected setup_db.psql path
 2020-01-22 17:33:10 -05:00
lain 002146d297 Update changelog 2020-01-22 20:12:45 +01:00
lain 85f45c7689 Document new EmojiReaction notifications 2020-01-22 20:11:18 +01:00
lain 615b72238e Notifications: Add emoji reaction notifications 2020-01-22 20:06:12 +01:00
rinpatch 6e6f1ead31 Merge branch 'no-error-404' into 'develop' 
Log at debug level for object deletion, not error.

See merge request pleroma/pleroma!2066
 2020-01-22 17:55:49 +00:00
feld be27777156 Merge branch 'admin-be' into 'develop' 
Config api for admin-fe

Closes #1406

See merge request pleroma/pleroma!1976
 2020-01-22 17:13:17 +00:00
Alexander Strizhakov f3e074e949
little fixes 2020-01-22 18:22:54 +03:00
Alexander Strizhakov a9c6f119ac
docs update 2020-01-22 18:08:53 +03:00
rinpatch 15db18af69 Merge branch 'mastofe/bundle-2020-01-22' into 'develop' 
Update MastoFE bundle to 2020-01-22

See merge request pleroma/pleroma!2127
 2020-01-22 15:06:26 +00:00
Haelwenn (lanodan) Monnier bd3f3756fb
Update MastoFE bundle to 2020-01-22 2020-01-22 16:00:23 +01:00
rinpatch 34aa0c542b Merge branch 'emoji-reaction-extensions-2' into 'develop' 
Emoji Reactions: In the API, sort them by first emoji insertion date

See merge request pleroma/pleroma!2126
 2020-01-22 14:11:01 +00:00
lain 043cd5aa54 Emoji reactions: Document changes 2020-01-22 13:58:02 +01:00
lain dd3fc50ea4 Emoji reactions: Change cache and reply format 2020-01-22 13:57:42 +01:00
Alexander Strizhakov d5f8a88a37
support for updating env after settings deletion 2020-01-22 15:14:11 +03:00
Alexander Strizhakov 32a643a159
Merge branch 'develop' into admin-be 2020-01-22 11:22:31 +03:00
Alexander Strizhakov 7ee2f86d76 Revert "Update AdminFE build" 
This reverts commit 6395ad942c
 2020-01-22 08:21:35 +00:00
feld 71bffbf0b7 Merge branch 'fix/attachments-cleanup' into 'develop' 
Delete attachments in queue with infinite timeout and ensure object.data.url is an array

See merge request pleroma/pleroma!2103
 2020-01-21 22:44:04 +00:00
feld 66c6f8f6ec Merge branch 'update/adminfe-20200121-part2' into 'develop' 
AdminFE update, again

See merge request pleroma/pleroma!2125
 2020-01-21 21:15:32 +00:00
Mark Felder 2860bee604 Last AdminFE update was accidentally built from master, not develop 2020-01-21 15:09:16 -06:00
feld 6f26937647 Merge branch 'update/adminfe-20200121' into 'develop' 
Update AdminFE build

See merge request pleroma/pleroma!2124
 2020-01-21 19:49:02 +00:00
Mark Felder bc2ebdcfd6 Update AdminFE build 2020-01-21 13:41:22 -06:00
Roman Chvanikov 92c8825515 Merge branch 'fix/attachments-cleanup' of git.pleroma.social:pleroma/pleroma into fix/attachments-cleanup 2020-01-21 19:48:27 +03:00
Roman Chvanikov 795a5fe441 Add delete_attachments queue to config 2020-01-21 19:48:14 +03:00
Roman Chvanikov 22e94bb2c7 Merge branch 'develop' into fix/attachments-cleanup 2020-01-21 19:45:13 +03:00
Alexander Strizhakov f01ab6cd29
some refactor and tests 2020-01-21 18:42:00 +03:00
rinpatch 04c9ca5d68 Merge branch 'emoji-reaction-extensions' into 'develop' 
StatusView: Add `emoji_reactions`

See merge request pleroma/pleroma!2120
 2020-01-21 13:13:17 +00:00
lain fa47a71990 Merge branch 'issue/1484' into 'develop' 
[#1484] excludes posts of blocked users from search results

Closes #1484

See merge request pleroma/pleroma!2122
 2020-01-21 13:07:07 +00:00
Alexander Strizhakov 503d966e9f
Merge branch 'develop' into admin-be 2020-01-21 10:32:27 +03:00