chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity
8,084 Commits 5 Branches 33 Tags 122 MiB
Commit Graph

8084 Commits

Author SHA1 Message Date
Shlee 6218c40af7
Update .env.example 2022-05-20 11:57:58 +09:30
Daniel Supernault d48e6c5d67 Merge branch 'staging' into dev 2022-05-18 03:15:24 -06:00
Daniel Supernault 03326459f8 Merge branch 'dev' into staging 2022-05-18 03:14:48 -06:00
Daniel Supernault 1c441f5549
Update compiled assets 2022-05-18 03:11:39 -06:00
Daniel Supernault 4b31573300
Update changelog 2022-05-18 03:01:26 -06:00
Daniel Supernault 10a676f4b5
Update compiled assets 2022-05-18 03:01:15 -06:00
Daniel Supernault d48642132b
Add custom content warnings/spoiler text 2022-05-18 02:58:49 -06:00
daniel 50dc231b86
Merge pull request #3479 from shleeable/patch-17 
Diagnostics view
 2022-05-18 00:05:12 -06:00
Shlee 36f4ab7897
Update home.blade.php 2022-05-18 15:32:35 +09:30
Shlee 7925b7023e
Update home.blade.php 2022-05-18 15:30:37 +09:30
Shlee 077ce341f3
Update home.blade.php 2022-05-18 15:28:46 +09:30
daniel 7d26f4ef2e
Merge pull request #3453 from shleeable/staging-unwanted-semicolons 
unwanted semicolons
 2022-05-17 23:43:23 -06:00
Daniel Supernault 657c66c1f1
Update AP Helpers, fix getSensitive and getScope missing parameters 2022-05-17 23:25:15 -06:00
daniel 2e0ee6a5ce
Merge pull request #3492 from pixelfed/staging 
Update compiled assets
 2022-05-17 22:10:36 -06:00
Daniel Supernault 4e99e40752
Update compiled assets 2022-05-17 22:10:11 -06:00
daniel 948b131aaf
Merge pull request #3491 from pixelfed/staging 
Update compiled assets
 2022-05-17 22:00:48 -06:00
Daniel Supernault 8c4ad083ec
Update compiled assets 2022-05-17 22:00:13 -06:00
Shlee cbc3a2285f
Update home.blade.php 2022-05-17 12:29:53 +09:30
daniel ae595c5611
Merge pull request #3476 from pixelfed/staging 
Revert default redis driver back to predis for now
 2022-05-16 03:09:02 -06:00
Daniel Supernault cb2e0fee3a
Revert default redis driver back to predis for now 2022-05-16 03:08:27 -06:00
daniel 1f79fd5699
Merge pull request #3475 from pixelfed/staging 
Fix typos in ap transformers
 2022-05-16 02:27:12 -06:00
Daniel Supernault f58dec3d73
Fix typos in ap transformers 2022-05-16 02:26:46 -06:00
daniel 9a8dea28b5
Merge pull request #3474 from pixelfed/staging 
Staging
 2022-05-16 02:18:10 -06:00
Daniel Supernault 1124474443
Update changelog 2022-05-16 02:16:59 -06:00
Daniel Supernault 3f322e29d7
Update adminReportController, fix mail verification request 500 bug by changing filter precedence to catch deleted users that may still be cached in AccountService 2022-05-16 02:16:23 -06:00
Daniel Supernault 0a7a061a83
Update StatusTransformer 2022-05-15 23:50:55 -06:00
daniel 54f4cac9c2
Merge pull request #3473 from pixelfed/staging 
Staging
 2022-05-15 23:35:21 -06:00
Daniel Supernault 306b6232b6
Update compiled assets 2022-05-15 23:31:32 -06:00
Daniel Supernault 97761615b7
Update compiled assets 2022-05-15 23:11:33 -06:00
Daniel Supernault ce5644e525
Update changelog 2022-05-15 23:11:00 -06:00
Daniel Supernault 5ff4730ff1
Update home timeline, redirect to /i/web unless force_old_ui is present 2022-05-15 23:09:45 -06:00
Daniel Supernault 429a6d6527
Remove duplicate let variable 2022-05-15 22:20:09 -06:00
Daniel Supernault be1fc66839
Update changelog 2022-05-15 22:12:33 -06:00
daniel 1238fb5d4d
Merge pull request #3468 from shleeable/patch-12 
Move from predis to phpredis as default for database. Matching cache
 2022-05-15 22:08:58 -06:00
daniel 623a193436
Merge pull request #3466 from shleeable/patch-10 
Horizon prefix - randomising prefix breaks horizon on cache rebuild
 2022-05-15 21:55:51 -06:00
daniel 2205307671
Merge pull request #3464 from pixelfed/ld 
Fix JSON-LD contexts
 2022-05-15 21:54:40 -06:00
daniel 73b82855ed
Merge branch 'staging' into ld 2022-05-15 21:52:59 -06:00
daniel d36e0bcd6d
Merge pull request #3463 from shleeable/patch-11 
Update avatar.blade.php - Fixed form tag
 2022-05-15 21:51:19 -06:00
daniel 158e4b18ed
Merge pull request #3462 from shleeable/patch-9 
img tags don't have targets
 2022-05-15 21:50:34 -06:00
daniel 283ea5f38f
Merge pull request #3461 from shleeable/patch-8 
typo?
 2022-05-15 21:46:17 -06:00
daniel 7b164ef300
Merge branch 'staging' into patch-8 2022-05-15 21:46:10 -06:00
daniel 8b594acfb2
Merge pull request #3460 from shleeable/staging-6 
Update Inbox.php - add missing break on case
 2022-05-15 21:41:33 -06:00
daniel 2602338f47
Merge pull request #3459 from shleeable/patch-7 
Update PostMenu.vue - missing let
 2022-05-15 21:40:57 -06:00
daniel be372fd0b6
Merge pull request #3458 from shleeable/staging-5 
dupe string - removed english
 2022-05-15 21:40:23 -06:00
daniel 1ae76cb71a
Merge pull request #3457 from shleeable/staging-4 
removed dupes
 2022-05-15 21:39:43 -06:00
daniel b3c22afb0d
Merge pull request #3456 from shleeable/staging-3 
mismatched tags
 2022-05-15 21:38:52 -06:00
daniel 732521e954
Merge pull request #3455 from shleeable/staging-2 
Update AdminController.php
 2022-05-15 21:37:48 -06:00
daniel a7f8c297b1
Merge pull request #3449 from shleeable/patch-6 
safefixes - Remove unwanted else from loop
 2022-05-15 21:36:46 -06:00
daniel ef4260c506
Merge pull request #3450 from shleeable/patch-4 
Updated Trustedproxy with safer default + Added diagnostic detail to TRUST_PROXIES
 2022-05-15 21:36:07 -06:00
daniel 027b0a7115
Merge branch 'staging' into patch-4 2022-05-15 21:35:45 -06:00