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

4378 Commits

Author SHA1 Message Date
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
okpierre 8bc346e407
Merge pull request #9 from pixelfed/dev 
Sync September 9
 2019-09-09 00:07:11 -04:00
Daniel Supernault cb95f6ab4f
Update components, change admin badge 2019-09-08 22:06:23 -06:00
daniel f7aeb8f433
Merge pull request #1683 from pixelfed/staging 
Fix AP Inbox
 2019-09-08 21:55:55 -06:00
Daniel Supernault ea37c0ca86
Update ap inbox 2019-09-08 21:55:06 -06:00
Daniel Supernault b20a2bc9ae
Update AP Helpers 2019-09-08 21:35:45 -06:00
Daniel Supernault cfbaca78b4
Add new migration 2019-09-08 21:35:23 -06:00
daniel 9a5300f03c
Merge pull request #1682 from pixelfed/staging 
Merge l10n updates
 2019-09-08 20:08:56 -06:00
daniel 82e10b05b8
Merge pull request #1679 from Quenty31/patch-1 
[i18n] Occitan update
 2019-09-08 20:08:08 -06:00
daniel 0266b7c93d
Merge pull request #1681 from okpierre/dev 
updated footer to sync from partial
 2019-09-08 20:07:30 -06:00
okpierre f714c4210b
Merge pull request #8 from okpierre/okpierre-footer-patch 
Update index.blade.php
 2019-09-08 20:31:55 -04:00
okpierre 83e58a5e76
Update index.blade.php 
reference: https://github.com/pixelfed/pixelfed/issues/1680
 2019-09-08 20:13:48 -04:00
okpierre 40a362c1c7
Merge pull request #7 from pixelfed/dev 
Sync September 8
 2019-09-08 19:34:48 -04:00
Quentí 8b0d087909
Update navmenu lang file 
To translate: Commits on Aug 30, 2019
 2019-09-08 14:46:12 +02:00
daniel 9dcc802b2c
Merge pull request #1673 from YoheiZuho/features/translate 
Fix & add Japanese translations
 2019-09-07 19:52:48 -06:00
YoheiZuho a5c46885c8 Fix & add Japanese translations 2019-09-07 18:07:40 +09:00
daniel 2785899317
Merge pull request #1670 from pixelfed/staging 
Update web routes
 2019-09-06 23:26:41 -06:00
Daniel Supernault 39f4b470b3
Update DiscoverController 2019-09-06 23:25:55 -06:00
Daniel Supernault 1351dc5ee8
Update web routes 2019-09-06 23:23:06 -06:00
daniel c53c82f34c
Merge pull request #1669 from pixelfed/staging 
Update Profile.vue component, fix cw + filter bug
 2019-09-06 22:14:08 -06:00
Daniel Supernault 47f0be8b96
Update compiled assets 2019-09-06 22:13:32 -06:00
Daniel Supernault a7441d6d8c
Update Profile.vue component, fix cw + filter bug 2019-09-06 22:13:14 -06:00
daniel 7af9dcd2ec
Merge pull request #1668 from pixelfed/staging 
Update AP Inbox, fix url bug
 2019-09-06 22:00:58 -06:00
Daniel Supernault 6e4a56236e
Update AP Inbox, fix url bug 2019-09-06 22:00:24 -06:00
daniel b99d23f0e0
Merge pull request #1667 from pixelfed/staging 
Update session config
 2019-09-06 21:44:28 -06:00