Commit graph

10909 commits

Author SHA1 Message Date
Brad Koehn
bd822cd5dc
Merge branch 'frontend-ui-refactor' into fix-startup-script 2018-11-25 15:14:56 -06:00
daniel
df5e2d94f2
Merge pull request #575 from BenLubar-PR/dockerfile-fpm
Fix Dockerfile.fpm by replacing it with a modified copy of Dockerfile.apache
2018-11-25 13:57:33 -07:00
daniel
d8718da695
Merge pull request #561 from BoFFire/patch-3
fix typo.
2018-11-25 13:54:53 -07:00
daniel
89078f399b
Merge pull request #557 from dereckson/docker-webp
Fix WebP support in Apache Docker image
2018-11-25 13:54:02 -07:00
daniel
1832973a39
Merge pull request #552 from TeDomum/dev
Drop privileges when starting artisan or horizon
2018-11-25 13:51:46 -07:00
daniel
720879cb47
Merge pull request #550 from bremensaki/patch-1
Expose S3 endpoint setting via config file
2018-11-25 13:48:42 -07:00
daniel
03bdc9840b
Merge pull request #593 from pixelfed/frontend-ui-refactor
Update InternalApiController
2018-11-24 23:48:26 -07:00
Daniel Supernault
406bbe0047
Update InternalApiController 2018-11-24 23:47:56 -07:00
daniel
b69601a6f2
Merge pull request #592 from pixelfed/frontend-ui-refactor
Frontend ui refactor
2018-11-24 23:44:53 -07:00
Daniel Supernault
fa6c3dd3f6
Update InternalApiController 2018-11-24 23:44:02 -07:00
Daniel Supernault
20fa6fd8e7
Update AccountController 2018-11-24 23:43:06 -07:00
Daniel Supernault
c40b4f5cfd
Update AccountController 2018-11-24 23:35:21 -07:00
daniel
ff535072a8
Merge pull request #591 from pixelfed/frontend-ui-refactor
Frontend ui refactor
2018-11-24 23:16:18 -07:00
Daniel Supernault
fa99ab79c3
Update Status model, cache view type and thumbnail methods 2018-11-24 23:15:32 -07:00
Daniel Supernault
cdb30c8e27
Fixes #583 2018-11-24 22:52:46 -07:00
daniel
8e21c8f54a
Merge pull request #590 from pixelfed/frontend-ui-refactor
Fixes #581 #584 #566
2018-11-24 22:37:05 -07:00
Daniel Supernault
b1ca105cb4
Fixes #581 #584 #566 2018-11-24 22:36:17 -07:00
daniel
a2d4630599
Merge pull request #589 from pixelfed/frontend-ui-refactor
Update MediaTransformer
2018-11-24 21:38:54 -07:00
Daniel Supernault
e3e2f902c1
Update MediaTransformer 2018-11-24 21:38:19 -07:00
daniel
2129155ac0
Merge pull request #588 from pixelfed/frontend-ui-refactor
Frontend ui refactor
2018-11-24 14:04:09 -07:00
Daniel Supernault
bfde0fdea6
Fix thumbnail regression 2018-11-24 14:03:15 -07:00
Daniel Supernault
943ae02f0e
Update AP helpers 2018-11-23 19:32:05 -07:00
daniel
19a2d8040e
Merge pull request #587 from pixelfed/frontend-ui-refactor
Frontend ui refactor
2018-11-22 13:27:34 -07:00
Daniel Supernault
19de0874c5
Fixes #585 2018-11-22 13:26:52 -07:00
Daniel Supernault
a14532e715
Fixes #578 2018-11-22 13:25:31 -07:00
Daniel Supernault
580bfd0bbe
Fixes #577 2018-11-22 13:21:36 -07:00
Daniel Supernault
10cfb02a9e
Update AccountController. Fixes #582 2018-11-22 12:30:20 -07:00
Daniel Supernault
5b6a589c43
Update home settings, add bio counter. Fixes #59 2018-11-21 20:02:41 -07:00
daniel
67251287c5
Merge pull request #576 from pixelfed/frontend-ui-refactor
Frontend ui refactor
2018-11-20 21:06:36 -07:00
Daniel Supernault
685df5f690
Update Lexer/Extractor 2018-11-20 21:05:10 -07:00
Ben Lubar
88a0b60ae4
Fix Dockerfile.fpm by replacing it with a modified copy of Dockerfile.apache. 2018-11-20 10:51:24 -06:00
Daniel Supernault
952f3aa0b2
Update about with suggestion from Jacky Alciné https://playvicious.social/@jalcine/101102143342141176 2018-11-19 23:53:00 -07:00
daniel
3c5cf78eb8
Merge pull request #571 from pixelfed/frontend-ui-refactor
Update ProfileController
2018-11-19 23:46:32 -07:00
Daniel Supernault
c80d4928ce
Update ProfileController 2018-11-19 23:44:02 -07:00
daniel
9333f88553
Merge pull request #570 from pixelfed/frontend-ui-refactor
Frontend ui refactor
2018-11-19 21:08:00 -07:00
Daniel Supernault
9aec7ad8ea
Update routes 2018-11-19 21:07:19 -07:00
Daniel Supernault
cd89925c45
Update InternalApiController 2018-11-19 21:06:55 -07:00
Daniel Supernault
66f4f05419
Update nav 2018-11-19 21:03:21 -07:00
daniel
71f7fcdd28
Merge pull request #569 from pixelfed/frontend-ui-refactor
Frontend ui refactor
2018-11-19 19:50:15 -07:00
Daniel Supernault
2172a7264c
Bump version 2018-11-19 19:49:12 -07:00
Daniel Supernault
d23dbce4bb
Update compiled assets 2018-11-19 19:48:10 -07:00
Daniel Supernault
8da292bf91
Update routes 2018-11-19 19:47:34 -07:00
Daniel Supernault
1a3c929256
Update PostComponent.vue 2018-11-19 19:45:27 -07:00
Daniel Supernault
dfc71913f1
Update master layout 2018-11-19 19:44:27 -07:00
Daniel Supernault
f153a66701
Update InternalApiController 2018-11-19 19:43:31 -07:00
Daniel Supernault
e7c4f084bc
Update TimelineController 2018-11-19 19:00:21 -07:00
Daniel Supernault
c41e6a761d
Update SiteController 2018-11-19 18:50:28 -07:00
Daniel Supernault
64ff569634
Fixes #568 2018-11-19 18:05:50 -07:00
ButterflyOfFire
3962706c30
fix typo. 2018-11-19 17:16:35 +01:00
daniel
7bb0c76620
Merge pull request #559 from pixelfed/frontend-ui-refactor
Update app config
2018-11-18 22:53:10 -07:00