b2ce8fcc77
Change pleroma reference in priv/static/READ_THIS_BEFORE_TOUCHING_FILES_HERE
ci/woodpecker/pr/lint Pipeline was successful
ci/woodpecker/pr/release Pipeline was successful
ci/woodpecker/pr/test Pipeline was successful
2022-07-12 16:20:53 -04:00
82fa766ed7
Remove precompiled javascript ( #55 )
...
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/push/release Pipeline was successful
Reviewed-on: #55
2022-07-08 13:03:18 +00:00
Pete
56203aae30
Add index hotspots
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/pr/lint Pipeline was successful
ci/woodpecker/pr/release Pipeline was successful
ci/woodpecker/pr/test Pipeline failed
ci/woodpecker/push/test Pipeline failed
2022-07-01 13:59:26 +01:00
1ecdb19de5
Refactor ES on top of search behaviour
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/push/test Pipeline failed
2022-06-30 16:28:31 +01:00
Tusooa Zhu
2df25e6666
Support fallbacking to other languages
2022-06-29 20:47:10 +01:00
Tusooa Zhu
7726148472
Send emails i18n'd using backend-stored user language
2022-06-29 20:45:19 +01:00
Tusooa Zhu
c301a95276
Make all emails translatable
2022-06-29 20:45:05 +01:00
Tusooa Zhu
63a0536d55
Make mail and mailer translatable
2022-06-29 20:45:05 +01:00
Tusooa Zhu
39cfecb188
Make static fe translatable
2022-06-29 20:45:05 +01:00
Tusooa Zhu
c6652fccae
Make mfa pages translatable
2022-06-29 20:45:03 +01:00
Tusooa Zhu
8f8d2abb12
Make oauth pages translatable
2022-06-29 20:44:48 +01:00
Tusooa Zhu
ec57e3480c
Make tag feed translatable
2022-06-29 20:44:16 +01:00
Tusooa Zhu
50913c4dc5
Make password reset pages translatable
2022-06-29 20:44:16 +01:00
Tusooa Zhu
7107fdc1b9
Extract translatable text
2022-06-29 20:44:16 +01:00
f919035664
update adminfe
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/tag/lint Pipeline was successful
ci/woodpecker/tag/test Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/tag/release Pipeline was successful
2022-06-14 19:04:22 +01:00
b98bd66a94
Revert "update adminfe"
...
This reverts commit 4532f75da3
.
2022-06-14 19:00:24 +01:00
4532f75da3
update adminfe
2022-06-14 18:51:33 +01:00
6ac2822c73
update fe
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/tag/lint Pipeline was successful
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/tag/test Pipeline was successful
ci/woodpecker/tag/release Pipeline failed
ci/woodpecker/push/test Pipeline failed
2022-06-14 17:29:41 +01:00
1f1c7363df
update pleroma-fe
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/tag/lint Pipeline was successful
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/tag/test Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/tag/release Pipeline was successful
2022-06-14 17:10:31 +01:00
c7328c438f
update pleromaFE
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/push/lint Pipeline failed
ci/woodpecker/push/test unknown status
2022-06-14 16:35:32 +01:00
60bfaed368
Allow reacting with emojis containing a number
ci/woodpecker/pr/lint Pipeline was successful
ci/woodpecker/pr/release Pipeline was successful
ci/woodpecker/pr/test Pipeline was successful
2022-06-14 11:47:09 +02:00
a43859c8f4
update pleroma-fe
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/push/test Pipeline failed
2022-06-12 14:00:52 +01:00
40242e185c
update pleroma-fe
2022-06-11 17:15:57 +01:00
f225db8596
update pleroma-fe
2022-06-08 15:16:32 +01:00
e3214cdfe3
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
2022-01-08 21:48:10 +00:00
d884087e7c
re-add mastofe_settings column
2022-01-08 21:47:52 +00:00
0f6bece60d
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
2022-01-08 21:45:12 +00:00
0d012ebea1
Revert "Merge branch 'remove/mastofe' into 'develop'"
...
This reverts commit 6b3842cf50
, reversing
changes made to 6b1282a829
.
2022-01-08 21:44:37 +00:00
12a171844b
Merge remote-tracking branch 'upstream/develop' into develop
2021-12-30 18:05:22 +00:00
Ivan Tashkinov
a7bdefc208
mix format
2021-12-29 11:44:33 +03:00
Ivan Tashkinov
0c7fb520bf
Added index on [:target_id, :relationship_type] to :user_relationships (speeds up Notification.exclude_blockers/_
).
2021-12-29 11:41:21 +03:00
Alex Gleason
fa35e24a5e
Apps: add user_id index
2021-12-27 18:05:35 -06:00
Alex Gleason
f5c3d45120
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
2021-12-27 18:01:25 -06:00
marcin mikołajczak
de006443f0
MastoAPI: Profile directory
2021-12-26 02:35:17 +00:00
Alex Gleason
73609211a4
Merge branch 'account-notes' into 'develop'
...
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
2021-12-25 01:41:12 +00:00
Alex Gleason
1ff9ffed83
Merge branch 'live-dashboard' into 'develop'
...
Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566
2021-12-19 17:35:14 +00:00
Alex Gleason
bd853199d9
Merge branch 'v2-suggestions' into 'develop'
...
V2 suggestions
See merge request pleroma/pleroma!3547
2021-12-19 17:31:17 +00:00
Alex Gleason
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
2021-12-15 19:05:36 -05:00
Alex Gleason
29d80b39f2
Add Phoenix LiveDashboard
...
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-12-15 19:05:27 -05:00
a85bf5929b
add hashtag indexing
2021-12-14 13:55:14 +00:00
6ca70833f5
add user import
2021-12-14 13:55:14 +00:00
0b5206015b
add mappings
2021-12-14 13:55:14 +00:00
sadposter
6f86baf491
update adminfe
2021-12-06 10:17:54 +00:00
sadposter
c85b278f1e
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-12-05 15:01:23 +00:00
182c563ed0
Force pinned_objects to be empty, not null
2021-11-29 18:08:09 +00:00
Alex Gleason
da06e1a17f
v2 Suggestions: add index on is_suggested column
2021-11-26 15:32:01 -06:00
Alex Gleason
b17360cd7c
v2 Suggestions: rudimentary API response
2021-11-26 14:34:10 -06:00
marcin mikołajczak
8e040e098b
Lint
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-11-21 18:17:06 +01:00
marcin mikołajczak
40414bf177
MastoAPI: Add user notes on accounts
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-11-21 16:56:26 +01:00
sadposter
eb1c7d75f4
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-10-16 14:08:04 +01:00
Ryo Ueno
5f2aefee1b
Translated using Weblate (Japanese)
...
Currently translated at 21.6% (23 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/ja/
2021-10-06 06:12:17 +00:00
Ryo Ueno
84a7eb5597
Added translation using Weblate (Japanese)
2021-10-06 06:12:17 +00:00
Hồ Nhất Duy
a84aa10f70
Translated using Weblate (Vietnamese)
...
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/vi/
2021-10-06 06:12:17 +00:00
Hồ Nhất Duy
3647c8e45b
Added translation using Weblate (Vietnamese)
2021-10-06 06:12:17 +00:00
@liimee
a3909f30b6
Translated using Weblate (Indonesian)
...
Currently translated at 64.1% (68 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06 06:12:17 +00:00
@liimee
f0d0d4f6e4
Translated using Weblate (Indonesian)
...
Currently translated at 61.3% (65 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06 06:12:17 +00:00
@liimee
f2806adeed
Translated using Weblate (Indonesian)
...
Currently translated at 59.4% (63 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06 06:12:17 +00:00
@liimee
4a15fd8a0a
Translated using Weblate (Indonesian)
...
Currently translated at 55.6% (59 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06 06:12:17 +00:00
@liimee
bea8a204a9
Translated using Weblate (Indonesian)
...
Currently translated at 50.9% (54 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06 06:12:17 +00:00
@liimee
e00fe5b616
Translated using Weblate (Indonesian)
...
Currently translated at 4.7% (5 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06 06:12:17 +00:00
@liimee
477d839444
Added translation using Weblate (Indonesian)
2021-10-06 06:12:17 +00:00
marcin mikołajczak
8467065aba
Translated using Weblate (Polish)
...
Currently translated at 100.0% (104 of 104 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2021-10-06 06:12:17 +00:00
Haelwenn (lanodan) Monnier
a17910a6c6
CI: Bump lint stage to elixir-1.12
...
Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`
2021-10-06 08:11:05 +02:00
sadposter
bd9c9136f9
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-09-13 16:14:58 +01:00
Haelwenn
6b3842cf50
Merge branch 'remove/mastofe' into 'develop'
...
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
2021-09-07 16:41:53 +00:00
sadposter
b202cf15d6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-08-30 22:04:42 +01:00
Sean King
6519732045
GET /api/v1/apps endpoint
2021-08-25 21:01:04 -06:00
marcin mikołajczak
edd2a38e53
Translated using Weblate (Polish)
...
Currently translated at 98.0% (102 of 104 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2021-08-13 15:42:21 +00:00
marcin mikołajczak
7a9113deb1
Translated using Weblate (Polish)
...
Currently translated at 75.0% (78 of 104 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2021-08-13 15:42:21 +00:00
Haelwenn
901204df22
Merge branch 'poll-notification' into 'develop'
...
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
2021-08-09 10:02:37 +00:00
Haelwenn
6384d78035
Merge branch 'simple_policy_reasons_for_instance_specific_policies' into 'develop'
...
Simple policy reasons for instance specific policies
See merge request pleroma/pleroma!3314
2021-08-09 09:37:59 +00:00
Haelwenn (lanodan) Monnier
0910777d41
Update PleromaFE Bundle (2.4.0)
...
based on 51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9
2021-08-08 15:21:21 +02:00
Ilja
1f52246a02
Add database migrations
...
* SimplePolicy
* quarentine
* transparency_exclusions
2021-08-06 07:59:53 +02:00
Haelwenn (lanodan) Monnier
5f8a9b671f
Update AdminFE bundle
2021-08-01 08:26:39 +02:00
Alex Gleason
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
2021-07-18 11:49:22 -05:00
Alex Gleason
0114754db2
MastodonAPI: Support poll notification
2021-07-17 22:19:38 -05:00
Sean King
5d279a22b1
Merge develop branch upstream
2021-07-10 11:04:16 -06:00
sadposter
e56c319e8f
merge
2021-06-27 22:31:37 +01:00
84f42b92f0
Merge branch 'develop' into 'fix/prune-hashtags'
...
# Conflicts:
# CHANGELOG.md
2021-06-07 20:06:36 +00:00
Sean King
dc4814f0cd
Fix merge conflicts with upstream
2021-06-04 14:42:44 -06:00
Roman Chvanikov
e0bb655773
Add RenameInstanceChat migration
2021-06-01 11:49:47 -05:00
Snow
2fde1f2549
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 5.6% (6 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hant/
2021-05-30 17:43:00 +00:00
Snow
b3209c31bc
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 0.9% (1 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hant/
2021-05-30 17:43:00 +00:00
Snow
0107ec63a2
Added translation using Weblate (Chinese (Traditional))
2021-05-30 17:43:00 +00:00
sadposter
50a644a221
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-05-12 16:13:30 +01:00
faried nawaz
22b2451edd
migration: add on_delete: :delete_all to hashtags object_id fk
2021-05-08 02:00:34 +05:00
Alex Gleason
52fc59f125
Merge remote-tracking branch 'upstream/develop' into earmark
2021-04-30 13:17:03 -05:00
Sean King
2de41770d0
Remove Twemoji stuff from MastoFE
2021-04-16 18:02:08 -06:00
Sean King
0f8da39b72
Remove priv/static/sounds folder
2021-04-16 15:56:00 -06:00
rinpatch
79376b4afb
Merge branch 'feature/521-pinned-post-federation' into 'develop'
...
Pinned posts federation
Closes #521
See merge request pleroma/pleroma!3312
2021-04-16 09:53:47 +00:00
Sean King
f3b403fa98
Remove MastoFE stuff from docs and default panel
2021-04-15 23:37:18 -06:00
Sean King
ca79aab0bf
Remove MastoFE settings from users table
2021-04-15 23:33:24 -06:00
Sean King
4f55d5123b
Remove MastoFE-related backend code and frontend pieces
2021-04-15 22:56:21 -06:00
4ecf6ceea6
Enforce user.notification_settings is NOT NULL
2021-04-01 10:06:24 -05:00
Alexander Strizhakov
3ec1dbd922
Let pins federate
...
- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins
2021-03-25 13:03:40 +03:00
sadposter
5f62b55a6f
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-03-23 23:01:07 +00:00
rinpatch
8194622a72
Merge branch 'feature/object-hashtags-rework' into 'develop'
...
Hashtags extraction from objects. Background migration infrastructure.
Closes #1840 and #2455
See merge request pleroma/pleroma!3213
2021-03-15 09:35:46 +00:00
Ben Is
2408363e2a
Translated using Weblate (Italian)
...
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/
2021-03-13 09:40:56 +00:00
Ivan Tashkinov
92526e0230
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-07 11:34:39 +03:00
sadposter
292ddf730c
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-03-03 13:51:07 +00:00
5b8cceba09
Fix migration in cases where database name has a hyphen
2021-03-02 18:17:32 -06:00
Ivan Tashkinov
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-02 08:26:30 +03:00
lain
5058de328e
Update frontend
2021-03-01 20:04:53 +01:00
lain
e6a14e1cd1
Merge branch 'feat/client_app_details' into 'develop'
...
Support application field
See merge request pleroma/pleroma!3311
2021-02-28 16:17:34 +00:00
0faf8dbef8
Simplify migration
2021-02-28 09:22:44 -06:00
Ivan Tashkinov
8f88a90ca3
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
2021-02-23 13:58:35 +03:00
Ivan Tashkinov
6531eddf36
[ #3213 ] hashtags
: altered name
type to text
. hashtags_objects
: removed unused index. HashtagsTableMigrator: records_per_second calculation fix. ActivityPub: hashtags-related options normalization.
2021-02-22 23:26:07 +03:00
sadposter
5f33699169
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-02-20 15:27:56 +00:00
83301fe61a
Add field to user schema for controlling disclosure of client details
2021-02-18 16:43:41 -06:00
Shpuld Shpuldson
956bbc1ec7
replace avi.png
2021-02-15 15:44:27 +02:00
Ivan Tashkinov
5992382cf8
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
2021-02-11 19:31:57 +03:00
Ivan Tashkinov
d1c6dd97aa
[ #3213 ] Partially addressed code review points.
...
migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).
2021-02-07 22:24:12 +03:00
rinpatch
6e68058b63
Merge branch 'feat/allow_alt_text_search_config' into 'develop'
...
allow user defined text search config in database
See merge request pleroma/pleroma!3275
2021-02-06 09:42:20 +00:00
hyperion
8d4e0342e1
Update priv/repo/migrations/20190501125843_add_fts_index_to_objects.exs, priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs files
2021-02-06 09:42:17 +00:00
Ivan Tashkinov
4e14945670
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
2021-02-03 09:31:38 +03:00
6a2d3fb9a3
Merge branch 'fix/2473-purge-expired-activities-duplicates' into 'develop'
...
fix and delete purge activities duplicates
Closes #2473
See merge request pleroma/pleroma!3285
2021-02-02 17:22:23 +00:00
69c560cfba
Merge branch 'active-user-count' into 'develop'
...
Monthly Active Users
Closes #2332
See merge request pleroma/pleroma!3283
2021-02-02 17:07:57 +00:00
Lain Soykaf
93e3b89350
Update frontend
2021-02-01 10:12:05 +01:00
Ivan Tashkinov
108e90b18e
[ #3213 ] Explicitly defined PKs in hashtags_objects and data_migration_failed_ids. Added "pleroma.database rollback" task to revert a single migration.
2021-01-31 22:03:59 +03:00
Alexander Strizhakov
6c987c7670
fix and delete purge activities duplicates
2021-01-28 16:57:41 +03:00
Egor Kislitsyn
793fc77b16
Add active user count
2021-01-27 18:20:06 +04:00
Ivan Tashkinov
694d98be55
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-01-25 21:24:07 +03:00
c3dd06b540
Update PleromaFE: pleroma-fe@eb2975b64d849af6bdc327dabac34b8e6d952eae
2021-01-25 09:50:26 -06:00
9e3fcb4b29
Update AdminFE: admin-fe@8a390584676b27b611d3363eca2a1194d94ed71f
2021-01-25 09:45:58 -06:00
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
2021-01-25 09:45:06 -06:00
sadposter
3aa25b008d
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-01-23 22:38:07 +00:00
Ivan Tashkinov
2634a16b4c
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
2021-01-21 20:20:35 +03:00
2926713fe5
Merge branch 'deprecate-public_endpoint' into 'develop'
...
Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251
2021-01-20 22:48:48 +00:00
2905df841b
Merge branch 'update/oban' into 'develop'
...
Update Oban to 2.3.4
See merge request pleroma/pleroma!3256
2021-01-20 20:32:23 +00:00
Alexander Strizhakov
87c468f009
use correct versions for oban migrations
2021-01-20 20:07:24 +03:00
João Rodrigues
8d1554f08b
Translated using Weblate (Portuguese (Portugal))
...
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pt_PT/
2021-01-18 21:19:25 +00:00
João Rodrigues
ca114df523
Added translation using Weblate (Portuguese (Portugal))
2021-01-18 21:19:25 +00:00
28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
2021-01-18 14:58:21 -06:00
d49387e9d2
Update AdminFE: admin-fe@27db721e3969d9d017a70b9e16dc262d4f31202f
2021-01-18 13:44:59 -06:00
44a86951a3
Merge branch 'develop' into refactor/approval_pending_user_field
2021-01-18 12:05:05 -06:00
8a230667cc
Update AdminFE: pleroma/admin-fe@d4c7989f05
2021-01-18 11:25:13 -06:00
Alexander Strizhakov
0e48c80d7f
start oban app in migrations and mix tasks
2021-01-17 09:58:41 +03:00
Alexander Strizhakov
02dbf1c51d
use explicitly oban migration version
2021-01-17 09:58:07 +03:00
d2382ab5f4
Update Oban to 2.3.4
2021-01-15 15:01:48 -06:00
Mark Felder
2c0fe2ea9e
Remove toggle_confirmation; require explicit state change
...
Also cosmetic changes to make the code clearer
2021-01-15 13:11:51 -06:00
Mark Felder
d36182c088
Change user.confirmation_pending field to user.is_confirmed
2021-01-15 12:44:41 -06:00
Mark Felder
a59e32f1dd
Add copyright header
2021-01-15 11:24:46 -06:00
Mark Felder
860b5c7804
Change user.deactivated field to user.is_active
2021-01-15 11:24:46 -06:00
f7e59c28ed
Change user.approval_pending field to user.is_approved
2021-01-15 10:42:02 -06:00
12c8ce481c
Bump Copyright year
2021-01-14 13:58:52 -06:00
fb47e83adc
Add ConfigDB migration
2021-01-14 13:53:55 -06:00
Ivan Tashkinov
f5f267fa76
[ #3213 ] Refactoring of HashtagsTableMigrator.
2021-01-14 22:41:27 +03:00
Ivan Tashkinov
e350898828
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-01-13 22:11:16 +03:00
Ivan Tashkinov
3e4d84729a
[ #3213 ] Prototype of data migrations functionality / HashtagsTableMigrator.
2021-01-13 22:07:38 +03:00
f0ab60189e
truncated_namespace should default to nil
2021-01-13 11:54:00 -06:00
Haelwenn (lanodan) Monnier
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
2021-01-13 07:49:50 +01:00
8b28dce82a
Deprecate Pleroma.Uploaders.S3, :public_endpoint
2021-01-12 16:31:35 -06:00
Ilja
6284e8f4b2
Add development section
...
* I cretaed a folder 'development'
* I split up the file dev.md into three parts and moved it to this folder
* index.md
* authentication_authorization.md
* mrf.md
* I also moved ap_extensions.md
* I created a new file setting_up_pleroma_dev.md
2021-01-10 08:25:36 +00:00
Alex Gleason
e73c7fa7e5
Merge remote-tracking branch 'upstream/develop' into confirm-users
2021-01-08 07:48:19 -06:00
Ivan Tashkinov
0d521022fe
[ #3213 ] Removed PK from hashtags_objects table. Improved hashtags_transfer mix task (logging of failed ids).
2021-01-07 12:20:29 +03:00
8864ac65c6
Add dinosaur gif from https://gifs.cc
...
"Our animations are free to be used to enhance your website."
2021-01-05 13:25:14 -06:00
Alex Gleason
7b44605cb8
Migration to confirm previously-logged-in users
2020-12-31 14:04:51 -06:00
sadposter
6cd0586ef9
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-12-29 13:16:14 +00:00
Haelwenn
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
2020-12-28 12:02:16 +00:00
Haelwenn
b122b6ffa3
Merge branch 'features/hashtag-column' into 'develop'
...
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
2020-12-28 10:14:58 +00:00
Ivan Tashkinov
4134abef63
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2020-12-26 22:23:05 +03:00
Ivan Tashkinov
e369b1306b
Added Hashtag entity and objects-hashtags association with auto-sync with data.tag
on Object update.
2020-12-22 22:04:33 +03:00
Haelwenn (lanodan) Monnier
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
2020-12-22 05:15:34 +01:00
d5746e8447
Do not include pool_size in the template. It encourages unwanted fiddling :)
2020-12-21 15:19:24 -06:00
Ivan Tashkinov
62bf4a1292
[ #2353 ] Virtually never-expiring OAuth tokens (new and already issued ones).
2020-12-17 20:49:00 +03:00
lain
8b8c317c0f
Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop'
...
Fix mastoapi ws posts dropping
Closes #2336
See merge request pleroma/pleroma!3198
2020-12-16 11:35:45 +00:00
lain
6bb4f4e172
Merge branch 'support/2255_posix_errors' into 'develop'
...
[#2255 ] added error messages for posix error code
See merge request pleroma/pleroma!3138
2020-12-15 15:16:03 +00:00
shironeko
2d29fd7c8f
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 87.7% (93 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/
2020-12-15 11:33:10 +00:00
Alexander Strizhakov
cebe3c7def
Fix for dropping posts/notifs in WS when mix task is executed
...
- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
2020-12-14 11:02:32 -06:00
Alex Gleason
f8c93246d6
Refactor Earmark code, fix tests
2020-12-11 17:22:42 -06:00
Alex Gleason
b2548cfcda
Sanitizer: allow <hr> tags
2020-12-11 17:22:37 -06:00
ZEN
2db42ac978
Translated using Weblate (Ukrainian)
...
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/uk/
2020-12-11 00:56:57 +00:00
ZEN
98deed65b3
Added translation using Weblate (Ukrainian)
2020-12-10 16:09:45 +00:00
Ivan Tashkinov
f1b07a2b2b
OAuth form user remembering feature. Local MastoFE login / logout fixes.
2020-11-28 21:51:06 +03:00
Haelwenn (lanodan) Monnier
3cfc20083e
scrubbers/default: Add ruby element and it's childs
...
This allows to format Japanese furigana (aka ruby) notation.
Present in XHTML 1.1, HTML 5 and later. Absent in XHTML 1.0, HTML 4 and earlier.
See https://www.w3.org/TR/ruby/
2020-11-25 00:40:21 +01:00
Guy Sheffer
d5f5d01495
Translated using Weblate (Hebrew)
...
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/he/
2020-11-21 18:12:07 +00:00
cd1b4155d5
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
...
Moving some background jobs into simple tasks
Closes #1790
See merge request pleroma/pleroma!3129
2020-11-19 20:32:32 +00:00
Maksim
3c00af82dc
Apply 1 suggestion(s) to 1 file(s)
2020-11-18 05:19:37 +00:00
Maksim
137b7f9e28
Apply 1 suggestion(s) to 1 file(s)
2020-11-18 05:19:30 +00:00
Maksim
e91e2399ee
Apply 1 suggestion(s) to 1 file(s)
2020-11-18 05:19:22 +00:00
Maksim
ce11f0bc33
Apply 1 suggestion(s) to 1 file(s)
2020-11-18 05:19:09 +00:00
Mark Felder
ad7fc35252
Update AdminFE build to pleroma/admin-fe@5b38aea279
2020-11-17 17:01:34 -06:00
rinpatch
6c3273892f
Merge branch 'sync-stable/2.2.0' into 'develop'
...
Import stable commits into develop after releasing 2.2.0
Closes #2275 , #1516 , #2257 , #2242 , #1668 , and #2236
See merge request pleroma/pleroma!3151
2020-11-17 12:40:42 +00:00
rinpatch
77c239f309
Import stable commits into develop after releasing 2.2.0
...
Updates the frontend bundle and syncs the changelog.
2020-11-17 15:14:25 +03:00
Guy Sheffer
26b74f4c58
Added translation using Weblate (Hebrew)
2020-11-17 11:15:01 +00:00
sadposter
7947236575
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-11-15 19:40:23 +00:00
lain
0d149502fe
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
...
fixes 2034 Make notifs view work for reports
Closes #2034
See merge request pleroma/pleroma!2912
2020-11-13 13:35:47 +00:00
Ilja
70e4b86250
Make notifs view work for reports
...
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
2020-11-13 13:35:46 +00:00
Maksim Pechnikov
1830b6aae5
added error messages for posix error code
2020-11-13 15:21:59 +03:00
Alexander Strizhakov
10528344c7
remove PurgeExpiredActivity from Oban db config
2020-11-13 09:07:08 +03:00
rinpatch
b4c6b262d6
pleroma-fe bundle: update to 8e87e3d88bef3691b625c0a25407aa08bdf983ad
2020-11-11 23:28:15 +03:00
lain
25bd64b03a
Bundled FE: Remove title tag
2020-11-11 17:17:41 +01:00
Alexander Strizhakov
8d218ebaf5
Moving some background jobs into simple tasks
...
- fetching activity data
- attachment prefetching
- using limiter to prevent overload
2020-11-11 13:39:49 +03:00
lain
ba3f3a5a56
Merge branch 'chores/pleroma-favicon-logo' into 'develop'
...
favicon: Use images/pleroma_logo_vector_bg_32.png from pleroma.social
Closes #2270
See merge request pleroma/pleroma!3115
2020-11-03 13:12:39 +00:00
Haelwenn (lanodan) Monnier
179936609f
favicon: Update to pleroma logo, provided by @shpuld
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2270
2020-11-03 09:52:17 +01:00
sadposter
ddf36b096e
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-11-01 12:22:28 +00:00
sadposter
2ed87fecfa
fix CSS
2020-11-01 12:22:18 +00:00
Egor Kislitsyn
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-30 19:34:02 +04:00
Haelwenn
131f3219e6
Merge branch 'issue/2069' into 'develop'
...
[#2069 ] unread_conversation_count
See merge request pleroma/pleroma!2939
2020-10-29 23:39:15 +00:00
Mark Felder
9e54ef086b
Merge branch 'develop' into feature/account-export
2020-10-27 12:51:31 -05:00