floatingghost
195e46bcca
include local instance in bubble timeline ( #117 )
...
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/117
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-31 14:59:46 +02:00
0a4fece245
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-14 18:16:28 +02:00
Mark Felder
b281ad06de
Revert "Custom mix task to retry failed tests once in CI pipeline"
...
This reverts commit ed2976b237
2024-08-13 15:49:04 -04:00
Mark Felder
648e94b369
Fix the uploads migration mix task test which leaked a change to the configured Uploader
2024-08-13 15:28:31 -04:00
Mark Felder
52e9bec156
Remove WorkerHelper
2024-07-30 11:34:48 -04:00
6655b1ee38
Merge branch 'fork' into actions
2024-07-25 13:19:36 +02:00
aa2597e2f6
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-07-25 13:19:17 +02:00
fbefe343ff
GitHub Actions workflow
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-07-24 13:50:18 +02:00
Mark Felder
7e37882cf7
Fix order of args for favorite/2
2024-07-22 18:25:37 -04:00
5d1cb904ac
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-24 11:37:28 +02:00
Mark Felder
3aed111a42
Enable capture_log globally
2024-06-18 10:50:31 -04:00
d7468558b8
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-04 18:36:25 +02:00
Lain Soykaf
f663135724
DatabaseTest: Fix test.
2024-05-28 18:54:36 +04:00
Lain Soykaf
a041879eaa
Linting
2024-05-28 18:26:30 +04:00
faried nawaz
1bf3ae07b6
add options to mix pleroma.database prune_objects to delete more activities
2024-05-09 10:43:34 +05:00
0f33698747
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-12 23:08:40 +01:00
Mark Felder
04366492b2
ConfigDB export to file does not have a consistent order.
...
Just test a few values to prove it was written
2023-12-29 23:18:45 -05:00
Mark Felder
e35fa60d8a
Remove reference to the :federation_publisher_modules setting in our config test
2023-12-28 14:53:40 -05:00
017e35fbf1
Fix some more typos
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-28 00:17:04 +01:00
Mark Felder
2207fafa91
Fix more Logger warn -> warning
2023-12-20 16:24:19 -05:00
c78495900e
Merge remote-tracking branch 'origin/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-17 22:53:06 +01:00
Lain Soykaf
5996bef7cd
Fix most tests that call SearchIndexWorker.
2023-11-12 15:54:16 +04:00
bda8589f16
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-15 19:39:24 +01:00
tusooa
3b4b84b74c
Force spec for every operation to have a listed tag
2023-01-15 18:31:37 -05:00
lain
e853cfe7c3
Revert "Merge branch 'copyright-bump' into 'develop'"
...
This reverts merge request !3825
2023-01-02 20:38:50 +00:00
10886eeaa2
Bump copyright year
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-01 12:13:06 +01:00
b7879d58f3
Merge remote-tracking branch 'pleroma/develop' into HEAD
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-15 23:27:58 +01:00
Mark Felder
6b87b3f2ea
Remove Quack logging backend
2022-11-11 12:36:29 -05:00
Alex Gleason
f5e77a3eaa
soapbox-fe --> soapbox
2022-09-13 15:26:28 -05:00
Alex Gleason
5b8b21b9e9
Fix tests for async notifications
2022-09-05 14:25:23 -05:00
abe13622e6
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-17 16:08:26 +02:00
Ilja
8303af84ce
Rename the Exiftool module
...
No migrations or checks yet
2022-07-01 12:15:02 +02:00
Ilja
551721e41a
Rename the new module
2022-07-01 12:13:46 +02:00
Ilja
cd316d7269
Use EXIF data of image to prefill image description
...
During attachment upload Pleroma returns a "description" field. Pleroma-fe has an MR to use that to pre-fill the image description field, <https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1399 >
* This MR allows Pleroma to read the EXIF data during upload and return the description to the FE
* If a description is already present (e.g. because a previous module added it), it will use that
* Otherwise it will read from the EXIF data. First it will check -ImageDescription, if that's empty, it will check -iptc:Caption-Abstract
* If no description is found, it will simply return nil, just like before
* When people set up a new instance, they will be asked if they want to read metadata and this module will be activated if so
This was taken from an MR i did on Pleroma and isn't finished yet.
2022-07-01 12:13:46 +02:00
Alex Gleason
e13f64bd8e
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
2022-05-17 11:19:29 -05:00
Haelwenn
d7c53da77a
Merge branch 'from/upstream-develop/tusooa/translate-pages' into 'develop'
...
Translate backend-rendered pages
See merge request pleroma/pleroma!3634
2022-03-20 18:14:37 +00:00
Alex Gleason
b56b0fb4e9
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
2022-03-09 16:34:57 -06:00
Tusooa Zhu
8b0c2890f9
Fix digest test
2022-03-01 20:27:45 -05:00
Sean King
17aa3644be
Copyright bump for 2022
2022-02-25 23:11:42 -07:00
Alex Gleason
90680aad90
Merge tag 'v2.4.0' into pleroma-v2.4.0
2021-08-08 10:46:48 -05:00
Alex Gleason
c369f52b4a
Merge remote-tracking branch 'origin/develop' into instance-deletion
2021-07-17 15:00:53 -05:00
Alex Gleason
c136dc0987
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
2021-07-17 13:53:19 -05:00
Alex Gleason
54af527759
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
2021-06-23 13:22:32 -05:00
Alex Gleason
723fd67b26
Merge remote-tracking branch 'origin/develop' into frontend-enable
2021-06-14 21:26:43 -05:00
Alex Gleason
8527faecf5
Enable a frontend automatically with --primary arg
2021-06-14 17:55:21 -05:00
Alex Gleason
9a768429a3
Frontend: enable CLI task
2021-06-14 17:27:29 -05:00
Mark Felder
fe40f6f291
Switch from the deprecated "use Mix.config" to "import Config"
2021-05-20 14:02:58 -05:00
Alex Gleason
ba177d2a4b
Simplify mix pleroma.instance gen task
2021-05-16 16:46:21 -05:00
Alexander Strizhakov
03843a5386
migrating config to tmp folder
2021-03-23 14:29:02 +03:00
feld
2217b35bd4
Merge branch 'ecto-rollback-in-test-env' into 'develop'
...
Possibility to run rollback in test env
See merge request pleroma/pleroma!3212
2021-02-26 16:47:53 +00:00
