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

5090 Commits

Author SHA1 Message Date
daniel 7776cca9e9
Merge pull request #2071 from pixelfed/staging 
Update ApiV1Controller
 2020-02-27 23:33:20 -07:00
Daniel Supernault eeca1fbc54
Update ApiV1Controller 2020-02-27 23:31:18 -07:00
daniel 7297917de8
Merge pull request #2070 from pixelfed/staging 
Update ApiV1Controller
 2020-02-27 22:14:29 -07:00
Daniel Supernault 7bb9fb1f01
Update ApiV1Controller 2020-02-27 22:11:42 -07:00
daniel 182cf8ead6
Merge pull request #2069 from pixelfed/staging 
Staging
 2020-02-27 14:14:01 -07:00
Daniel Supernault ea15943484
Update confirm email blade view 2020-02-27 14:13:31 -07:00
daniel cc2f1e2ff9
Merge pull request #2060 from YoheiZuho/features/ja_translate 
Update Japanese translate
 2020-02-23 23:02:04 -07:00
YoheiZuho c159fc289f update japanese translate 2020-02-24 14:59:08 +09:00
YoheiZuho e133bc09d7 update japanese translate 2020-02-24 14:52:32 +09:00
YoheiZuho c08d0baf2f update japanese translate 2020-02-24 14:48:54 +09:00
daniel 49daa39bb1
Merge pull request #2051 from pixelfed/staging 
Staging
 2020-02-22 21:11:22 -07:00
Daniel Supernault 139328cf02
Update changelog 2020-02-22 21:08:40 -07:00
Daniel Supernault c9057e87ba
Update ContactController, fixes #2042 2020-02-22 21:07:59 -07:00
daniel 2bf9f74fcd
Merge pull request #2050 from shleeable/patch-3 
Dupe bot value in InstanceApiController.php
 2020-02-22 21:05:24 -07:00
daniel 891600752e
Merge pull request #2048 from shleeable/patch-2 
typo in installer.php
 2020-02-22 21:04:14 -07:00
daniel 04a36049e8
Merge pull request #2047 from shleeable/zttp 
zttp typo
 2020-02-22 21:03:06 -07:00
daniel a6d99c3c6f
Merge pull request #2045 from shleeable/patch-1 
Update FollowerService.php
 2020-02-22 21:01:35 -07:00
Shlee 0fabac50e3
Update InstanceApiController.php 2020-02-22 21:47:49 +08:00
Shlee 4d685d9052
typo 2020-02-22 19:42:39 +08:00
Ashley Hull 9c84df49ff typo 2020-02-22 19:33:35 +08:00
Shlee cae0a52e89
Update FollowerService.php 2020-02-22 19:11:46 +08:00
daniel 80f76eaf14
Merge pull request #2044 from pixelfed/staging 
Staging
 2020-02-22 01:41:51 -07:00
Daniel Supernault b00ab32413
Update compiled assets 2020-02-22 01:38:51 -07:00
Daniel Supernault 985759ff1d
Update profile modals 2020-02-22 01:38:17 -07:00
daniel b008e0a47b
Merge pull request #2043 from pixelfed/staging 
Add modlog notifications
 2020-02-21 21:08:55 -07:00
Daniel Supernault e2c5186315
Update compiled assets 2020-02-21 21:00:59 -07:00
Daniel Supernault ffc8af6882
Update npm deps 2020-02-21 21:00:36 -07:00
Daniel Supernault 51642fc40d
Add modlog notifications 2020-02-21 21:00:00 -07:00
daniel 79c17381d1
Merge pull request #2041 from pixelfed/staging 
Staging
 2020-02-21 18:35:05 -07:00
daniel 6689a6fe3c
Merge pull request #2036 from techknowlogick/patch-2 
Support minio for S3 uploads
 2020-02-21 18:32:47 -07:00
daniel 7c9e28f167
Merge pull request #2028 from shleeable/patch-5 
Update carousel.scss - Dupe #iosDevice img reference
 2020-02-21 18:21:09 -07:00
daniel b9d33f6b91
Merge pull request #2026 from shleeable/patch-3 
Updated Spanish lang
 2020-02-21 18:16:44 -07:00
daniel cd34438405
Merge pull request #2025 from shleeable/patch-2 
Update pixelfed.php - concatenate fix
 2020-02-21 18:13:07 -07:00
daniel 33687f0bca
Merge pull request #2024 from shleeable/patch-1 
Update custom.scss - dupe left reference
 2020-02-21 18:12:19 -07:00
daniel 585a5ca8f8
Merge pull request #2007 from shleeable/cleanup 
Code Review - dead code
 2020-02-21 18:06:31 -07:00
daniel 13bb89f2f7
Merge pull request #2040 from pixelfed/staging 
Update ProfileController, revert pgsql change
 2020-02-20 22:53:35 -07:00
Daniel Supernault db46f7ddbb
Update ProfileController, revert pgsql change 2020-02-20 22:52:58 -07:00
daniel cdb8784d81
Merge pull request #2033 from pixelfed/staging 
Improved Admin Dashboard Security
 2020-02-20 22:52:11 -07:00
Daniel Supernault 1536e0f006
Update admin user modlogs view 2020-02-20 13:50:54 -07:00
Daniel Supernault 77778d3e41
Update admin modlogs 2020-02-20 00:41:19 -07:00
Daniel Supernault e07bd934ac
Update AdminUserController, fix modlog bug 2020-02-20 00:01:18 -07:00
Daniel Supernault c5e8e7907a
Update AdminUserController, add modlog support 2020-02-19 23:23:52 -07:00
Daniel Supernault ab2c2ef4b6
Update changelog 2020-02-19 22:59:37 -07:00
Daniel Supernault eac176f9ce
Update web routes 2020-02-19 22:58:49 -07:00
Daniel Supernault fae0475083
Update admin user delete view 2020-02-19 22:58:30 -07:00
Daniel Supernault 9be19ad880
Update AdminUserController, add account deletion handler 2020-02-19 22:55:10 -07:00
Daniel Supernault 826978ce08
Update BaseApiController, invalidate session after account deletion 2020-02-19 22:53:04 -07:00
Daniel Supernault 3c62fa79c5
Update web routes 2020-02-19 21:18:39 -07:00
Daniel Supernault a7adfb9457
Update AdminUserController modtools 2020-02-19 21:15:49 -07:00
Daniel Supernault a4cf21eaad
Update AdminUserController, add moderation method 2020-02-19 20:45:11 -07:00