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

1156 Commits

Author SHA1 Message Date
daniel 54e69817a2
Merge pull request #423 from pixelfed/frontend-ui-refactor 
Fix discover bug
 2018-08-30 23:08:20 -06:00
Daniel Supernault ff860c9b85
Fix discover bug 2018-08-30 23:06:13 -06:00
daniel 6af9389479
Merge pull request #422 from pixelfed/frontend-ui-refactor 
Frontend ui refactor
 2018-08-30 22:59:27 -06:00
Daniel Supernault 5a5f1bf637
Update DiscoverController 2018-08-30 22:58:57 -06:00
daniel d0b4c4f765
Merge pull request #422 from pixelfed/frontend-ui-refactor 
Frontend ui refactor
 2018-08-30 22:32:54 -06:00
Daniel Supernault d4691b007b
Bump version 2018-08-30 22:32:07 -06:00
Daniel Supernault d8d73298a9
Update SettingsController 2018-08-30 22:29:38 -06:00
Daniel Supernault 0508900b46
Update web routes 2018-08-30 22:28:09 -06:00
Daniel Supernault 90bd599e81
Update status template 2018-08-30 22:27:46 -06:00
Daniel Supernault c9e75b1e63
Add user muted privacy settings 2018-08-30 22:26:23 -06:00
Daniel Supernault cdc6a71c14
Add user blocked privacy settings 2018-08-30 22:25:55 -06:00
Daniel Supernault db8de248b1
Update privacy settings 2018-08-30 22:25:08 -06:00
Daniel Supernault b110bc5568
Update user settings sidebar 2018-08-30 22:19:31 -06:00
Daniel Supernault 0af5547dbb
Update DiscoverController 2018-08-30 22:18:43 -06:00
Daniel Supernault 2810b952dd
Update SiteController, add mutes and blocks to personal timeline 2018-08-30 21:47:25 -06:00
Daniel Supernault 4db7b72747
Update UserFilter model 2018-08-30 21:43:43 -06:00
daniel dda3a33354
Merge pull request #421 from pixelfed/frontend-ui-refactor 
Update privacy settings view
 2018-08-30 19:39:08 -06:00
Daniel Supernault de1ebae425
Update privacy settings view 2018-08-28 19:58:44 -06:00
ButterflyOfFire 290a1f5b13
Add files via upload 2018-08-28 20:41:26 +01:00
ButterflyOfFire 8e688e5196
Preparing ar folder 2018-08-28 19:37:33 +00:00
daniel c084064f15
Merge pull request #418 from pixelfed/frontend-ui-refactor 
Update ProfileController
 2018-08-28 12:55:57 -06:00
Daniel Supernault 3362bbc9ba
Update ProfileController 2018-08-28 12:54:37 -06:00
daniel 3b4705b4e0
Merge pull request #417 from pixelfed/frontend-ui-refactor 
Frontend ui refactor
 2018-08-27 22:06:36 -06:00
Daniel Supernault 505d734e68
Update CI config 2018-08-27 21:59:28 -06:00
Daniel Supernault e8616c290f
Update CI config 2018-08-27 21:55:47 -06:00
Daniel Supernault 6bcbd061f0
Update CI config 2018-08-27 21:50:45 -06:00
Daniel Supernault 5dd02c78b1
Update CI config 2018-08-27 21:45:31 -06:00
Daniel Supernault 0515efec1b
Update CI config 2018-08-27 21:40:30 -06:00
Daniel Supernault 1d26ddc11c
Add Circle CI config 2018-08-27 21:33:39 -06:00
daniel ef91291d4d
Merge pull request #416 from pixelfed/analysis-z4KpJn 
Apply fixes from StyleCI
 2018-08-27 21:17:24 -06:00
daniel b8abbdd90f Apply fixes from StyleCI 2018-08-28 03:07:36 +00:00
Daniel Supernault 75de27f482
Update localizations 2018-08-27 21:06:32 -06:00
Daniel Supernault 3c5dc24bec
Update config 2018-08-27 21:01:08 -06:00
daniel db16a391cc
Merge pull request #413 from pixelfed/frontend-ui-refactor 
Frontend ui refactor
 2018-08-27 11:26:14 -06:00
Daniel Supernault b7c7757cff
Update RegisterController 2018-08-27 11:24:28 -06:00
daniel 3565f73a5e
Merge pull request #412 from Simounet/fix/settings-validate 
Fix missing comma into SettingsController.php
 2018-08-27 11:20:34 -06:00
Simounet b1e639eb1c Fix missing comma into SettingsController.php 2018-08-27 13:28:46 +02:00
daniel d229ef4144
Merge pull request #411 from pixelfed/frontend-ui-refactor 
Update Status model
 2018-08-26 21:32:22 -06:00
Daniel Supernault c4c5a6907d
Update Status model 2018-08-26 21:31:56 -06:00
daniel f1e2ad2d34
Merge pull request #410 from pixelfed/frontend-ui-refactor 
Frontend ui refactor
 2018-08-26 21:27:15 -06:00
Daniel Supernault 83de8b98e6
Update StatusController 2018-08-26 21:25:02 -06:00
Daniel Supernault 35e7cd574a
Update web routes 2018-08-26 21:23:46 -06:00
Daniel Supernault 8cc64437d2
Add status edit view 2018-08-26 21:19:37 -06:00
Daniel Supernault b33730de25
Add basic video view 2018-08-26 21:06:47 -06:00
Daniel Supernault 6c72c9fdb6
Add status sidebar view 2018-08-26 21:05:54 -06:00
Daniel Supernault 56e3f4f3e5
Add new photo view 2018-08-26 21:05:35 -06:00
Daniel Supernault 618518d71a
Add new album view 2018-08-26 21:04:59 -06:00
Daniel Supernault 37845e5f04
Add new migration for media table 2018-08-26 19:32:12 -06:00
Daniel Supernault 1c619701b3
Fix migration 2018-08-26 18:50:20 -06:00
daniel 37fc5c1620
Merge pull request #321 from lamby/expose-rss-syndication-feeds-on-profile-page-via-link-href-tags-318 
Expose RSS syndication feeds on profile page via <link href="..." > tags
 2018-08-26 15:05:01 -06:00