fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-30 20:27:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
8130 commits 27 branches 108 tags 316 MiB
Commit graph

8130 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Maksim Pechnikov 2cfe1b9385 Merge branch 'develop' into feature/tag_feed 2020-01-23 11:42:10 +03: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
Maksim Pechnikov 5ea8596448 Merge branch 'develop' into feature/tag_feed 2020-01-21 20:56:49 +03: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
Alexander Strizhakov dcae5914d1
fix for db key 2020-01-21 10:14:48 +03:00
Maksim Pechnikov 41e2332007 Merge branch 'develop' into feature/tag_feed 2020-01-21 09:23:35 +03:00
Maksim Pechnikov 6e88a7e591 exclude blocked user posts from search results 2020-01-21 07:40:13 +03:00
Mark Felder 390bf9b097 Merge branch 'develop' into fix/attachments-cleanup 2020-01-20 12:55:51 -06:00
lain 7d8b709d29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions 2020-01-20 18:10:55 +01:00
lain ab36459464 Merge branch '1521-admin-report-test-fix' into 'develop' 
[#1521] AdminApiControllerTest fix: fixed create report test (OAuth)

Closes #1521

See merge request pleroma/pleroma!2121
 2020-01-20 17:10:23 +00:00
Ivan Tashkinov ca3b4de2c9 [#1521] AdminApiControllerTest: fixed create report test (OAuth). 2020-01-20 20:04:25 +03:00
rinpatch 00d08c9231 Merge branch 'favoritng-responses' into 'develop' 
Mastodon API: Align favoriting / repeating behavior with Mastodon

See merge request pleroma/pleroma!2119
 2020-01-20 16:31:43 +00:00