Commit graph

10828 commits

Author SHA1 Message Date
Christian Winther
c258a15761 cleanup a bit 2024-01-15 14:42:54 +00:00
Christian Winther
84c9aeb514 fixing postgresql and some more utility help 2024-01-15 14:16:54 +00:00
Christian Winther
73b6db168a
Merge branch 'pixelfed:dev' into jippi-fork 2024-01-15 13:17:02 +01:00
daniel
187d1e1af9
Merge pull request #4862 from pixelfed/staging
Add Parental Controls feature
2024-01-11 07:08:38 -07:00
Daniel Supernault
85a612742d
Update changelog 2024-01-11 06:54:20 -07:00
Daniel Supernault
c91f1c595a
Update ParentalControlsController, prevent children from adding accounts 2024-01-11 06:52:12 -07:00
Daniel Supernault
db1b466792
Update instance config 2024-01-11 06:45:32 -07:00
Daniel Supernault
c7ed684a5c
Update ParentalControlsController 2024-01-11 06:31:19 -07:00
Daniel Supernault
71c148c61e
Update StoryController, add parental controls support 2024-01-11 05:46:02 -07:00
Daniel Supernault
fe30cd25d1
Update DirectMessageController, add parental controls support 2024-01-11 05:25:23 -07:00
Daniel Supernault
fd9b5ad443
Update api controllers, add parental control support 2024-01-11 04:50:11 -07:00
Daniel Supernault
9d365d07f9
Update ParentalControls, map updated saved permissions/roles 2024-01-11 04:41:38 -07:00
Daniel Supernault
2dcfc81495
Update ComposeController, add parental controls support 2024-01-11 04:40:25 -07:00
Daniel Supernault
1a16ec2078
Update BookmarkController, add parental control support 2024-01-11 03:22:35 -07:00
Daniel Supernault
42298a2e9c
Apply dangerZone middleware to parental controls routes 2024-01-11 02:40:52 -07:00
Daniel Supernault
58745a8808
Update settings sidebar 2024-01-11 02:37:13 -07:00
Daniel Supernault
5f6ed85770
Update settings sidebar 2024-01-11 02:34:43 -07:00
Daniel Supernault
319a20b473
Update ParentalControlsController, redirect to new custom error page on active session when attempting to use child invite link so as to not overwrite parent active session with child session 2024-01-11 02:12:54 -07:00
Daniel Supernault
ef57d471e5
Update migration 2024-01-11 01:50:51 -07:00
Daniel Supernault
c53894fe16
Add Parental Controls feature 2024-01-11 01:35:15 -07:00
mbliznikova
4e567e3411 Provide an informative error message when account size limit is reached 2024-01-09 04:49:01 +00:00
Christian Winther
6f0a6aeb3d fix hadolint path 2024-01-07 14:54:28 +00:00
nexryai
19e8037c85
Fix lang/vendor/backup/ja/notifications.php 2024-01-07 21:05:04 +09:00
daniel
0a556d1ac1
Merge pull request #4855 from pixelfed/staging
Update ApiV1Controller, update favourites max limit. Fixes #4854
2024-01-06 11:45:12 -07:00
Daniel Supernault
d25209f74a
Update ApiV1Controller, update favourites max limit. Fixes #4854 2024-01-06 11:43:56 -07:00
Christian Winther
2e3c7e862c iterating on proxy + letsencrypt setup 2024-01-06 18:01:48 +00:00
Christian Winther
284bb26d92 sync 2024-01-06 16:43:48 +00:00
Christian Winther
9445980e04 expose both http and https ports 2024-01-06 15:57:20 +00:00
Christian Winther
bd1cd9c4fc more docs 2024-01-06 15:39:30 +00:00
Christian Winther
e228a1622d refactor layout 2024-01-06 14:19:36 +00:00
Christian Winther
c9b11a4a29 remove testing key 2024-01-06 14:13:16 +00:00
Christian Winther
092f7f704c fix nginx? 2024-01-06 00:01:51 +00:00
Christian Winther
6edf266a14 quick take on applying migrations automatically 2024-01-05 23:54:17 +00:00
Christian Winther
a8c5585e19 use upstream Docker images over self-built 2024-01-05 23:41:33 +00:00
Christian Winther
a25b7910b2 first time setup and more refinements 2024-01-05 23:16:26 +00:00
Christian Winther
7db513b366 sync 2024-01-05 18:16:38 +00:00
Christian Winther
76e1199dc7 sync 2024-01-05 17:35:07 +00:00
Christian Winther
2e2ffc5519 comment build steps out to use remote image 2024-01-05 17:31:34 +00:00
Christian Winther
d876533991 remove tmp token 2024-01-05 17:30:30 +00:00
Christian Winther
c4404590f2 add first time setup logic 2024-01-05 17:29:45 +00:00
Christian Winther
c1fbccb07c bootstrapping worked 2024-01-05 16:52:00 +00:00
Christian Winther
052c11882c tweak 10-storage.sh 2024-01-05 16:33:08 +00:00
Christian Winther
215b49ea3d rename2 2024-01-05 16:27:11 +00:00
Christian Winther
10674ac523 iterate on apache example with docker-compose 2024-01-05 16:18:48 +00:00
Christian Winther
f2eb3df85f remove VOLUME and EXPOSE
see https://stackoverflow.com/a/52571354/1081818
2024-01-05 01:34:46 +00:00
Christian Winther
5cfd8e15a9 quotes 2024-01-05 00:16:36 +00:00
Christian Winther
99e2a045a6 more renaming for clarity 2024-01-05 00:11:20 +00:00
Christian Winther
d13895a3e0 add 15-storage-permissions.sh to the docs 2024-01-04 23:15:46 +00:00
Christian Winther
895b51fd9f more tweaks 2024-01-04 23:04:25 +00:00
Christian Winther
890827d60e Merge branch 'dev' of github.com:pixelfed/pixelfed into jippi-fork 2024-01-04 22:34:57 +00:00