Commit Graph

4502 Commits

Author SHA1 Message Date
okpierre ea9c164a72
Merge branch 'staging' into patch-1 2019-09-14 00:18:59 -04:00
Daniel Supernault ec24dec2df
Update ApiController 2019-09-13 21:48:16 -06:00
Daniel Supernault 505b9ee732
Update AuthServiceProvider 2019-09-13 20:17:00 -06:00
Daniel Supernault e359b6b98a
Update AuthServiceProvider 2019-09-13 19:55:24 -06:00
Daniel Supernault 64e4c002e9
Update ApiController 2019-09-13 19:54:38 -06:00
Daniel Supernault 7392c9d0bc
Update api routes 2019-09-13 19:53:58 -06:00
Daniel Supernault 85835f5a67
Add Api v1 controller 2019-09-13 19:10:22 -06:00
Trevor Farlow 49ed4ac00a Default word-break styling on post comments 2019-09-13 10:39:17 -06:00
daniel 66d4b9a0bf
Merge pull request #1703 from pixelfed/staging
Update DiscoverController, limit Loops to local only posts
2019-09-12 23:55:19 -06:00
Daniel Supernault 95f96aa7eb
Update changelog 2019-09-12 23:55:08 -06:00
Daniel Supernault c19fe3cde8
Update DiscoverController, limit Loops to local only posts 2019-09-12 23:53:35 -06:00
daniel 198ec1457f
Merge pull request #1702 from pixelfed/staging
Update ComposeModal and Profile components
2019-09-12 22:42:39 -06:00
Daniel Supernault 007f27bf58
Update changelog 2019-09-12 22:42:22 -06:00
Daniel Supernault 560f06eae3
Update compiled assets 2019-09-12 22:39:15 -06:00
Daniel Supernault f736070b91
Update Profile.vue component 2019-09-12 22:38:29 -06:00
Daniel Supernault 9195ba45b9
Update ComposeModal v4 2019-09-12 22:36:12 -06:00
daniel e1f985a13e
Merge pull request #1700 from pixelfed/staging
Cache ProfileController
2019-09-11 00:25:55 -06:00
Daniel Supernault c1eb19f835
Update changelog 2019-09-11 00:23:42 -06:00
Daniel Supernault a74b3ea798
Update ProfileController 2019-09-11 00:22:03 -06:00
Daniel Supernault 01352e04ea
Update Privacy Settings 2019-09-11 00:15:27 -06:00
daniel ac83d9e61f
Merge pull request #1699 from pixelfed/staging
Update FollowController, fix private account bug
2019-09-10 23:36:18 -06:00
Daniel Supernault 23bb12413b
Update changelog 2019-09-10 23:36:02 -06:00
Daniel Supernault 39394327f0
Update FollowController, fix private account bug 2019-09-10 23:33:51 -06:00
okpierre ec51ae832e
Update CHANGELOG.md
Added additional links to pull requests
2019-09-11 01:00:24 -04:00
Daniel Supernault a66835fbfd
Update changelog 2019-09-10 22:41:53 -06:00
daniel 63a9138455
Merge pull request #1697 from pixelfed/staging
Remove deprecated profile following/followers
2019-09-10 22:39:26 -06:00
Daniel Supernault 5e1295f18b
Remove deprecated profile following/followers 2019-09-10 22:38:15 -06:00
daniel 99cc7bdab7
Merge pull request #1695 from pixelfed/staging
Update changelog
2019-09-10 22:21:02 -06:00
Daniel Supernault 3be6964ea9
Update changelog 2019-09-10 22:20:26 -06:00
daniel 19a78a46f9
Merge pull request #1694 from pixelfed/staging
Update StatusHashtagService, fix count bug
2019-09-10 22:10:32 -06:00
Daniel Supernault 59aae7907d
Update changelog 2019-09-10 22:10:08 -06:00
Daniel Supernault fe736f2b44
Update StatusHashtagService, fix count bug 2019-09-10 22:03:45 -06:00
Daniel Supernault 22d9449936
Update changelog 2019-09-10 17:18:28 -06:00
daniel f570a4465e
Merge pull request #1692 from okpierre/dev
change quill to minimum requirement v1.3.7
2019-09-10 16:53:28 -06:00
okpierre a3c90af3c2
Merge pull request #11 from okpierre/okpierre-quill-update
Update package.json
2019-09-09 22:30:36 -04:00
okpierre b66432f8d0
Update package.json
change from 
"quill": "^1.3.6",

to 
"quill": "^1.3.7",
2019-09-09 22:30:18 -04:00
okpierre d538a4e18a
Merge pull request #10 from pixelfed/dev
Sync September 9
2019-09-09 19:32:09 -04:00
daniel 7dc27a52ca
Merge pull request #1690 from pixelfed/staging
Update EmailService, add new spam domains
2019-09-09 15:38:09 -06:00
Daniel Supernault dedf8c8af6
Update changelog 2019-09-09 15:37:59 -06:00
Daniel Supernault 56a1690241
Update EmailService, add new spam domains 2019-09-09 15:36:08 -06:00
daniel 18aac23add
Merge pull request #1687 from pixelfed/staging
Update changelog
2019-09-08 23:23:18 -06:00
Daniel Supernault 08f31a7e48
Update changelog 2019-09-08 23:22:02 -06:00
daniel 0d2ca2b09c
Merge pull request #1686 from pixelfed/staging
Update changelog
2019-09-08 23:17:41 -06:00
Daniel Supernault 1e809e4827
Update changelog 2019-09-08 23:17:09 -06:00
daniel fee8e7fa05
Merge pull request #1685 from pixelfed/staging
Bump version to v0.10.3
2019-09-08 22:46:10 -06:00
Daniel Supernault 929ace22a9
Bump version to v0.10.3 2019-09-08 22:45:35 -06:00
Daniel Supernault 06c34560e5
Update .env.example 2019-09-08 22:45:17 -06:00
Daniel Supernault 60f8eb9e94
Update readme 2019-09-08 22:44:06 -06:00
daniel ab765705a5
Merge pull request #1684 from pixelfed/staging
Update components, change admin badge
2019-09-08 22:12:02 -06:00
Daniel Supernault cbf241b761
Update compiled assets 2019-09-08 22:10:32 -06:00