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

4400 Commits

Author SHA1 Message Date
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
Daniel Supernault 76a2d38275
Update session config 2019-09-06 21:43:50 -06:00
daniel 4a728741c6
Merge pull request #1666 from pixelfed/staging 
Update StatusController, append .json to status urls for AP object
 2019-09-06 21:34:25 -06:00
Daniel Supernault 10b3a25474
Update StatusController 2019-09-06 21:21:28 -06:00
Daniel Supernault 6ab601e73d
Update session config 2019-09-06 21:16:00 -06:00
daniel c333fe18ee
Merge pull request #1665 from pixelfed/staging 
Bump version to v0.10.2
 2019-09-06 20:35:34 -06:00
Daniel Supernault 576a55a2af
Bump version to v0.10.2 2019-09-06 20:35:09 -06:00
daniel f428aeecd8
Merge pull request #1664 from pixelfed/staging 
Update Inbox, fix typo
 2019-09-06 20:34:49 -06:00
Daniel Supernault 2e345687d9
Update Inbox, fix typo 2019-09-06 20:34:00 -06:00
daniel 09d06407eb
Merge pull request #1663 from pixelfed/staging 
Bump version to 0.10.1
 2019-09-06 20:29:34 -06:00
Daniel Supernault 48f5161b3c
Bump version to 0.10.1 2019-09-06 20:29:06 -06:00
daniel ee22faeb8b
Merge pull request #1650 from pixelfed/staging 
v0.10.1
 2019-09-06 20:22:37 -06:00
Daniel Supernault a464f66f90
Update compiled assets 2019-09-06 20:18:27 -06:00
Daniel Supernault cb6076ba11
Update privacy settings 2019-09-06 20:00:56 -06:00
Daniel Supernault 780346263d
Update Profile.vue component 2019-09-06 19:54:35 -06:00
Daniel Supernault 86b41dbb32
Update User model 2019-09-05 23:12:23 -06:00
Daniel Supernault b13392f683
Update InternalApiController 2019-09-05 23:11:55 -06:00
Daniel Supernault aff20f62cd
Update BaseApiController 2019-09-05 23:09:17 -06:00
Daniel Supernault 97ff17f71f
Update config 2019-09-05 22:06:23 -06:00
Daniel Supernault 704f6a1f18
Add new component 2019-09-05 21:51:52 -06:00
Daniel Supernault e6c92532a2
Update PostComponent 2019-09-05 21:51:11 -06:00
Daniel Supernault a2cc2755e1
Update Timeline.vue 2019-09-05 21:50:58 -06:00
Daniel Supernault f1901cc6ca
Update Timeline.vue 2019-09-05 21:32:40 -06:00
Daniel Supernault fad680eba1
Update ComposeModal.vue 2019-09-05 21:32:04 -06:00
Daniel Supernault 64950748cf
Update RegisterController 2019-09-05 21:29:12 -06:00
Daniel Supernault 01239cb9be
Update AP Inbox 2019-09-05 20:40:40 -06:00
Daniel Supernault a30575e8d3
Fix typo in AP transformers 2019-09-05 19:58:38 -06:00
Daniel Supernault 130ef34a41
Update Timeline.vue component, fix infinite pagination bug 2019-09-05 19:13:53 -06:00
Daniel Supernault 353f14acfa
Update DiscoverComponent.vue 2019-09-05 18:39:19 -06:00