Commit graph

4845 commits

Author SHA1 Message Date
Daniel Supernault
c2826fd3fd
Update CollectionController, increase collection limit from 18 to 50 2019-12-07 19:43:46 -07:00
daniel
0f08fb6ff1
Merge pull request #1883 from Strubbl/docker-remove-imagck
docker.apache: remove imagick
2019-12-07 18:47:08 -07:00
Sven Fischer
553ba55e8c docker.apache: remove imagick
cause gd is sufficient. It's either imagick or gd required.
2019-12-07 11:45:38 +01:00
daniel
bda47ce397
Merge pull request #1881 from pixelfed/staging
Staging
2019-12-06 23:24:53 -07:00
Daniel Supernault
2238f18eed
Update nav 2019-12-06 23:22:10 -07:00
daniel
a1cd57e206
Merge pull request #1880 from Strubbl/docker.apache-update-php-to-7.4-composer-to-1.9.1-fix-gd
docker.apache: update php to 7.4, composer to 1.9.1, fix gd configure…
2019-12-06 12:24:54 -07:00
Sven Fischer
ef63e1325f docker.apache: update php to 7.4, composer to 1.9.1, fix gd configure flags
w.r.t gd see also https://github.com/docker-library/php/issues/912
2019-12-06 18:27:29 +01:00
daniel
82f2e5ec2e
Merge pull request #1878 from pixelfed/staging
Staging
2019-12-05 21:12:39 -07:00
Daniel Supernault
473d1755b8
Update nav 2019-12-05 21:10:28 -07:00
Daniel Supernault
e30c59c7bc
Update compiled assets 2019-12-05 21:00:58 -07:00
Daniel Supernault
c956adf786
Update Timeline.vue 2019-12-05 20:59:24 -07:00
Daniel Supernault
0c8fcff519
Update NotificationCard 2019-12-05 20:57:25 -07:00
Daniel Supernault
d3a37a0030
Update app.js 2019-12-05 20:57:00 -07:00
daniel
44859fa364
Merge pull request #1877 from pixelfed/staging
Staging
2019-12-05 19:47:15 -07:00
Daniel Supernault
39acd99b73
Update compiled assets 2019-12-05 19:28:55 -07:00
Daniel Supernault
46d4aba89c
Update Profile.vue 2019-12-05 19:27:32 -07:00
daniel
cfcd002f5b
Merge pull request #1876 from pixelfed/staging
Staging
2019-12-05 19:20:36 -07:00
Daniel Supernault
74061b85ce
Update compiled assets 2019-12-05 19:19:53 -07:00
Daniel Supernault
477d866b6b
Update Profile.vue, add Profile Embed to menu 2019-12-05 19:17:55 -07:00
Daniel Supernault
eccc84cbdc
Update app.js, add profile embed util 2019-12-05 19:15:08 -07:00
daniel
cbfa31a3e0
Merge pull request #1875 from pixelfed/staging
Update blade views
2019-12-05 00:25:13 -07:00
Daniel Supernault
955c53ca44
Update blade views 2019-12-05 00:24:42 -07:00
daniel
7ef593deb7
Merge pull request #1874 from pixelfed/staging
Update home timeline view
2019-12-05 00:19:49 -07:00
Daniel Supernault
62b35e25c4
Update home timeline view 2019-12-05 00:19:13 -07:00
daniel
3ce00ebe38
Merge pull request #1873 from pixelfed/staging
Update local timeline view
2019-12-05 00:16:27 -07:00
Daniel Supernault
3451110d5c
Update local timeline view 2019-12-05 00:15:25 -07:00
daniel
f7c87554fd
Merge pull request #1872 from pixelfed/staging
Update assets
2019-12-04 23:35:05 -07:00
Daniel Supernault
82038791ec
Update compiled assets 2019-12-04 23:33:58 -07:00
Daniel Supernault
406265565e
Update npm deps 2019-12-04 23:26:57 -07:00
daniel
7fa4d4a669
Merge pull request #1871 from pixelfed/staging
Add Profile Embeds
2019-12-04 21:28:13 -07:00
Daniel Supernault
b2005bd4b0
Update changelog 2019-12-04 21:21:43 -07:00
Daniel Supernault
fb7a3cf0e4
Add Profile Embeds 2019-12-04 21:21:08 -07:00
Daniel Supernault
b793f9c4bb
Update SiteController 2019-12-04 20:55:42 -07:00
Daniel Supernault
8e9b544f50
Update SiteController, return 404 for users attempting to view their own Follow Intent 2019-12-04 20:30:04 -07:00
Daniel Supernault
19cb81cf26
Update web routes 2019-12-04 20:26:11 -07:00
Daniel Supernault
d9ff794932
Update SiteController 2019-12-04 20:24:27 -07:00
Daniel Supernault
ad8fc77e6c
Update FollowerController 2019-12-04 20:24:08 -07:00
Daniel Supernault
e9c67e337d
Add follow intent view 2019-12-04 20:22:37 -07:00
Daniel Supernault
293b806afc
Update DiscoverController 2019-12-04 19:54:26 -07:00
Daniel Supernault
96a6c063f2
Update FollowerService 2019-12-04 19:47:00 -07:00
daniel
e6bb9dba96
Merge pull request #1867 from pixelfed/staging
Fixes #1856
2019-12-02 19:16:18 -07:00
Daniel Supernault
10a182c1cd
Fixes #1856 2019-12-02 19:15:52 -07:00
daniel
516014b61d
Merge pull request #1866 from pixelfed/staging
Update composer deps
2019-12-02 17:55:57 -07:00
Daniel Supernault
141550fce7
Update composer deps 2019-12-02 17:54:56 -07:00
daniel
723bc0c538
Merge pull request #1865 from pixelfed/staging
Staging
2019-12-02 17:35:07 -07:00
daniel
4aa5454067
Merge pull request #1864 from pixelfed/dependabot/composer/symfony/cache-4.3.9
Bump symfony/cache from 4.3.5 to 4.3.9
2019-12-02 17:34:34 -07:00
daniel
af7aa677b5
Merge pull request #1863 from techknowlogick/composer-update
PHP 7.4 compat fix
2019-12-02 17:33:27 -07:00
dependabot[bot]
11ab5443f5
Bump symfony/cache from 4.3.5 to 4.3.9
Bumps [symfony/cache](https://github.com/symfony/cache) from 4.3.5 to 4.3.9.
- [Release notes](https://github.com/symfony/cache/releases)
- [Changelog](https://github.com/symfony/cache/blob/master/CHANGELOG.md)
- [Commits](https://github.com/symfony/cache/compare/v4.3.5...v4.3.9)

Signed-off-by: dependabot[bot] <support@github.com>
2019-12-02 23:28:56 +00:00
Matti R
964d1fb07f
PHP 7.4 compat fix - composer update intervention/image ezyang/htmlpurifier 2019-12-02 17:35:47 -05:00
daniel
b10295a17b
Merge pull request #1853 from pixelfed/staging
Fixes #1852
2019-11-30 18:36:45 -07:00