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 d07b80da43
Merge pull request #1648 from pixelfed/staging 
Update SearchController
 2019-08-28 19:53:20 -06:00
Daniel Supernault 58a9ca664c
Update SearchController 2019-08-28 19:52:05 -06:00
daniel 270a042b0f
Merge pull request #1647 from pixelfed/staging 
Update InboxWorker
 2019-08-27 19:17:17 -06:00
Daniel Supernault 20baf7a7c9
Update InboxWorker 2019-08-27 19:14:56 -06:00
okpierre 754801e4fe
Merge pull request #6 from pixelfed/dev 
Sync August 24
 2019-08-24 18:32:44 -04:00
daniel 5eda09cbf6
Merge pull request #1640 from pixelfed/staging 
Staging
 2019-08-23 21:31:39 -06:00
Daniel Supernault f54409fdf3
Update AP Helpers 2019-08-23 21:28:37 -06:00
Daniel Supernault 23cd89da4c
Update AP Helpers 2019-08-23 20:18:58 -06:00
daniel edf3ba0603
Merge pull request #1639 from pixelfed/staging 
Staging
 2019-08-23 20:04:19 -06:00
Daniel Supernault 0f0b3c2d05
Update SettingsController 2019-08-23 13:03:43 -06:00
Daniel Supernault c176f8cc11
Update routes 2019-08-22 22:41:56 -06:00
Daniel Supernault 89ca18b14e
ComposeUI update 2019-08-22 22:33:04 -06:00
Daniel Supernault 06078c7a85
Update SearchResults 2019-08-22 21:49:20 -06:00
Daniel Supernault ac9bb59e19
Update Profile.vue component 2019-08-22 21:22:46 -06:00
Daniel Supernault d9db1cf8b1
Update FollowerController 2019-08-22 21:22:00 -06:00
Daniel Supernault c539e8f607
Update SearchResults.vue 2019-08-22 18:25:53 -06:00
daniel 0c56aa058f
Merge pull request #1636 from pixelfed/staging 
Update AP Helpers
 2019-08-21 22:34:39 -06:00
Daniel Supernault 4acafb9870
Update AP Helpers 2019-08-21 22:34:05 -06:00
daniel d13a13317f
Merge pull request #1635 from pixelfed/staging 
Staging
 2019-08-21 22:20:09 -06:00
daniel c1110a024f
Merge pull request #1634 from pixelfed/trwnh-patch-1 
bandaid fix #1633
 2019-08-21 22:18:29 -06:00
trwnh 274a22c1c3
bandaid fix #1633 
$activity is not being initialized correctly, so just use $res directly for now
 2019-08-21 23:14:39 -05:00
daniel 52bb40d5ff
Merge pull request #1631 from pixelfed/staging 
Update security view
 2019-08-21 13:40:52 -06:00
Daniel Supernault 9788c80ca9
Update security view 2019-08-21 13:39:34 -06:00
daniel 0fd4481ca6
Merge pull request #1630 from pixelfed/staging 
Staging
 2019-08-21 13:31:17 -06:00
Daniel Supernault 0586c022a9
Update security view 2019-08-21 13:30:01 -06:00
Daniel Supernault cd9db4fe0c
Update SettingsController 2019-08-21 13:28:44 -06:00
daniel 2a16e64659
Merge pull request #1626 from pixelfed/staging 
Fix queue bug
 2019-08-20 22:22:57 -06:00
Daniel Supernault 9524ea19f5
Update media:optimize command 2019-08-20 22:22:25 -06:00
Daniel Supernault bd05f63dec
Update StatusTransformer, add place 2019-08-19 19:16:48 -06:00
Daniel Supernault 460433ff20
Update ApiController 2019-08-19 19:09:56 -06:00
Daniel Supernault 32d7ab091d
Add AdminApiController 2019-08-19 19:07:25 -06:00
Daniel Supernault 2a42a1c02e
Update BaseApiController 2019-08-19 19:06:22 -06:00
Daniel Supernault 820233adb1
Update InternalApiController, add places 2019-08-19 19:04:40 -06:00
daniel 26c1f6362a
Merge pull request #1623 from pixelfed/staging 
Update FollowerController
 2019-08-18 20:46:28 -06:00
Daniel Supernault cb8d7e3b9a
Update FollowerController 2019-08-18 20:45:31 -06:00
daniel 5d838cd926
Merge pull request #1622 from pixelfed/staging 
Update EmailService
 2019-08-18 19:34:29 -06:00
Daniel Supernault e6f5940209
Update EmailService 2019-08-18 19:33:30 -06:00
daniel b211b493d9
Merge pull request #1620 from pixelfed/staging 
Update readme, fix docs link
 2019-08-18 18:50:51 -06:00
Daniel Supernault 8199a42c73
Update readme, fix docs link 2019-08-18 18:50:25 -06:00
daniel d2d051ea2a
Merge pull request #1617 from pixelfed/staging 
Bug fixes
 2019-08-17 23:41:07 -06:00
Daniel Supernault 9b82f75183
Update StatusTransformer, remove unused fields 2019-08-17 23:40:25 -06:00
Daniel Supernault 0d350ea03e
Update PublicApiController, fix HomeTimeline cache ttl 2019-08-17 23:39:54 -06:00
Daniel Supernault 91e58591be
Update ImportCities command, bump memory limit 2019-08-17 23:00:06 -06:00
Daniel Supernault dfd958994f
Add new npm deps 2019-08-17 22:59:31 -06:00
daniel 715549bf74
Merge pull request #1609 from KirankumarAmbati/patch-1 
Fix opencollective message
 2019-08-17 21:56:01 -06:00
daniel 5117a9c161
Merge pull request #1615 from pixelfed/staging 
Update Register view
 2019-08-17 01:49:34 -06:00
Daniel Supernault 49157894ad
Update navbar view 2019-08-17 01:48:47 -06:00
Daniel Supernault cd7ea97500
Update register view 2019-08-17 01:48:25 -06:00
Daniel Supernault 22d75629f7
Remove unused svg 2019-08-17 01:47:56 -06:00
Daniel Supernault 3d53661b18
Update Image util 2019-08-17 01:46:34 -06:00