Tusooa Zhu
|
793922f1d8
|
Use proper lang attributes in htmls
|
2022-06-29 20:44:16 +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
|
ed1d9e91bc
|
Make remote follow pages translatable
|
2022-06-29 20:44:15 +01: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 |
|
Sean King
|
5d279a22b1
|
Merge develop branch upstream
|
2021-07-10 11:04:16 -06:00 |
|
Alex Gleason
|
1399b82f7b
|
Create WrapperAuthenticator and simplify Authenticator behaviour
Speeds up recompilation by reducing compile-time cycles
|
2021-06-07 18:18:39 -05:00 |
|
Sean King
|
2e310b3ec8
|
Fix more build errors
|
2021-06-04 15:06:55 -06:00 |
|
Alex Gleason
|
f2134e605b
|
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
|
2021-05-31 16:49:46 -05:00 |
|
Alex Gleason
|
51a9f97e87
|
Deprecate Pleroma.Web.base_url/0
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
|
2021-05-31 16:48:03 -05:00 |
|
Alex Gleason
|
ad7d4ff8bc
|
Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers
|
2021-05-19 12:49:00 -05:00 |
|
Alex Gleason
|
07fed0fda2
|
Switch to aliasing Router.Helpers instead of importing
|
2021-05-18 17:45:30 -05: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 |
|
rinpatch
|
ed8ef80b5e
|
RSS: Make sure post URL is the first <link> element
Otherwise some RSS readers (tested in Miniflux) might pick the context
URL as the external link.
Related to #2425.
|
2021-02-08 22:44:15 +03: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 |
|
Ivan Tashkinov
|
60b4654038
|
Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56.
|
2021-01-28 19:49:43 +03: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 (lanodan) Monnier
|
18b536c176
|
Pleroma.Object/1: take %Object{} as argument instead
|
2020-12-28 11:05:24 +01:00 |
|
Haelwenn (lanodan) Monnier
|
87b13c5430
|
Create Object.hashtags/1 wrapper
|
2020-12-22 05:15:34 +01: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 |
|
Ivan Tashkinov
|
ee221277b0
|
Encapsulation of tags / hashtags fetching from objects.
|
2020-12-21 22:54:26 +03: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 |
|
Ivan Tashkinov
|
f1b07a2b2b
|
OAuth form user remembering feature. Local MastoFE login / logout fixes.
|
2020-11-28 21:51:06 +03:00 |
|
Alexander Strizhakov
|
0c68b9ac13
|
escaping summary and other fields in xml templates
|
2020-11-10 10:46:57 +03:00 |
|
Egor Kislitsyn
|
3985c1b450
|
Fix warnings
|
2020-10-15 16:54:59 +04:00 |
|
Ivan Tashkinov
|
cad69669fc
|
[#2130] Fixed OAuth OOB authentication for users with enabled MFA.
|
2020-09-09 22:44:38 +03:00 |
|
Karol Kosek
|
577b11167c
|
templates/layout/app.html.eex: fix link color
|
2020-08-05 00:01:30 +02:00 |
|
Mark Felder
|
62438530e2
|
TOTP length is configurable, so we can't hardcode this here.
|
2020-07-17 08:19:49 -05:00 |
|
Mark Felder
|
3be64556db
|
Improve TOTP token and recovery input fields in OAuth login
|
2020-07-16 13:11:03 -05:00 |
|
Egor Kislitsyn
|
6b84c62d4a
|
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
|
2020-06-01 17:38:57 +04:00 |
|
Maksim
|
3d0c567fbc
|
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
|
2020-05-07 08:14:54 +00:00 |
|
Haelwenn (lanodan) Monnier
|
c6ddfa8f95
|
static-fe.css: Restore and move to /priv/static/static-fe
|
2020-05-02 08:28:42 +02:00 |
|
Karol Kosek
|
452072ec95
|
static_fe: Add microformats2 classes
|
2020-04-22 16:02:40 +02:00 |
|
rinpatch
|
28bcde5d98
|
Merge branch 'fix/1691-feed-render' into 'develop'
Fix for use of `published` field from different entities
Closes #1691
See merge request pleroma/pleroma!2395
|
2020-04-16 18:38:58 +00:00 |
|
Alexander Strizhakov
|
4d330d9df1
|
fix for use of published from different entities
|
2020-04-16 18:05:36 +03:00 |
|
Haelwenn (lanodan) Monnier
|
9172d719cc
|
profile emojis in User.emoji instead of source_data
|
2020-04-10 06:20:02 +02:00 |
|
Haelwenn (lanodan) Monnier
|
185520d1b4
|
Provide known-good user.uri, remove User.profile_url/1
|
2020-03-31 23:55:29 +02:00 |
|
Egor Kislitsyn
|
cb8236cda6
|
Add embeddable posts
|
2020-03-20 21:46:26 +04:00 |
|
Alexander Strizhakov
|
91870c8995
|
adding rss for user feed
|
2020-03-16 12:45:31 +03:00 |
|
Egor Kislitsyn
|
50d9fcbe29
|
Hotlink logo instead of attachment
|
2020-02-11 23:33:05 +04:00 |
|
Egor Kislitsyn
|
6875ccb6bf
|
Merge branch 'develop' into feature/new-registrations-digest
|
2020-02-11 13:54:55 +04:00 |
|
Maksim Pechnikov
|
99c0a11c58
|
added atom feed
|
2020-01-24 22:12:23 +03:00 |
|
minibikini
|
7c0ac54437
|
Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex
|
2020-01-22 17:18:55 +00:00 |
|
Egor Kislitsyn
|
df0b8f1d08
|
Add new users digest email
|
2020-01-22 20:31:42 +04:00 |
|
Maksim Pechnikov
|
c9f45edeac
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-14 21:29:14 +03:00 |
|
Maksim Pechnikov
|
5b84156013
|
moved remote follow in separate controller
|
2019-12-21 21:27:42 +03:00 |
|
Maksim Pechnikov
|
b53573a837
|
add tag feeds
|
2019-12-18 09:19:37 +03:00 |
|
Maksim Pechnikov
|
22fc271e23
|
init tag feed
|
2019-12-06 09:33:40 +03:00 |
|
kaniini
|
2cc043591c
|
Merge branch 'feature/static-fe' into 'develop'
Static frontend
See merge request pleroma/pleroma!1917
|
2019-11-11 19:10:44 +00:00 |
|
Maksim Pechnikov
|
9d0b989521
|
add subject to atom feed
|
2019-11-10 11:10:20 +03:00 |
|
