Merge pull request #10 from pixelfed/dev

Sync September 9

.env.example

@@ -54,10 +54,9 @@ ACTIVITYPUB_SHAREDINBOX=false
 # Set these "true" to enable federation.
 # You might need to also run:
 #   php artisan cache:clear
-#   php artisan optimize:clear
-#   php artisan optimize
+#   php artisan config:cache
 
-PF_COSTAR_ENABLED=true
+PF_COSTAR_ENABLED=false
 CS_BLOCKED_DOMAINS='gab.com,gab.ai,develop.gab.com'
 CS_CW_DOMAINS='switter.at'
 CS_UNLISTED_DOMAINS='example.org,example.net,example.com'

CHANGELOG.md

@@ -1,9 +1,102 @@
 # Release Notes
 
-## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.9.4...dev)
+## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.10.3...dev)
+
+### Added
+-
+
+### Fixed
+- 
+
+### Changed
+- Updated EmailService, added new domains [#1690](https://github.com/pixelfed/pixelfed/pull/1690)
+    
+    
+## [v0.10.3 (2019-09-08)](https://github.com/pixelfed/pixelfed/compare/v0.10.2...v0.10.3)
+
+### Added
+- Append ```.json``` to local status urls to view ActivityPub object [#1666](https://github.com/pixelfed/pixelfed/pull/1666)
+
+### Fixed
+- Reverted ```strict``` Same-Site Cookies to ```null``` to fix 2FA/session expiry [#1667](https://github.com/pixelfed/pixelfed/pull/1667) 
+- Fixed AP errors by storing ActivityPub object id and url [#1668](https://github.com/pixelfed/pixelfed/pull/1668) [#1683](https://github.com/pixelfed/pixelfed/pull/1683) 
+- Fixed content warnings that had filter applied [#1669](https://github.com/pixelfed/pixelfed/pull/1669) 
+
+### Changed
+- Japanese Translations [#1673](https://github.com/pixelfed/pixelfed/pull/1673)
+- Occitan Translations [#1679](https://github.com/pixelfed/pixelfed/pull/1679)
+- Use footer partial on landing page [#1681](https://github.com/pixelfed/pixelfed/pull/1681)
+- Change admin badge so it doesn't look like a verified badge [#1684](https://github.com/pixelfed/pixelfed/pull/1684)
+
+### Deprecated
+- Personalized Discover has been deprecated due to low use [#1670](https://github.com/pixelfed/pixelfed/pull/1670)
+    
+
+## [v0.10.2 (2019-09-06)](https://github.com/pixelfed/pixelfed/compare/v0.10.1...v0.10.2)
+
+### Fixed
+
+- Typo in Inbox prevented proper federation support
+
+
+## [v0.10.1 (2019-09-06)](https://github.com/pixelfed/pixelfed/compare/v0.10.0...v0.10.1)
+
+### Added
+- Remote follows! Search for an actor URI, send AP Follow, plus handle incoming AP Accept Follow
+- Compose UI v4: a rework of the v3 flow to allow basic cropping and better support future post types
+- Profile badges show if a user is following you or is an admin
+- Show confirmation message when muting or blocking a user from a post
+- Allow "read more" to be disabled on posts
+- Loops! Discover short videos
+- Preliminary support for profile PropertyValue metadata
+- Preliminary support for Direct Messages
+- Places! Run the artisan task `import:cities` 
+- Emails are now validated and banned email domains are disallowed at signup. Artisan task `email:bancheck` will validate existing users.
+- .env vars `REDIS_SCHEME` and `REDIS_PATH` allow for using Redis over a Unix socket instead of TCP
+- .env var `IMAGE_DRIVER` allows using imagick instead of gd
+
+### Fixed
+- Show delete button while composing video posts
+- Show pending follow requests on private profiles
+- Allow muted users to comment on your posts
+- Bugs with carousel cursor and tooltips
+- Collections can now be deleted from collection page
+- Compose modal now indicates album media limits
+- Unlisted and private posts are now delivered
+- Don't show Register link in navbar when registrations are closed
+
+### Changed
+- Use vue-masonry for Moment UI layout
+- User post limit changed from 20/hr to 50/hr
+- Better mobile profile layout
+- Dark mode is now a bit bluer
+- Sample nginx.conf in contrib/ now uses HTTPS instead of HTTP. Docs updated to reference this file
+- Updated register form
+- Allow users to edit email after registrations
+    
+
+## [v0.10.0 (2019-07-17)](https://github.com/pixelfed/pixelfed/compare/v0.9.6...v0.10.0)
+
+### Added
+- Collections! Add posts to Collections, similar to categories.
+- Profile donate links: add links to Patreon, Liberapay, and OpenCollective on your profile
+
+### Fixed
+- Show correct mode when viewing followers / following
+
+### Changed
+- Profile model now uses snowflake id
+
+### Removed
+- OStatus legacy code has been removed
+
+## [v0.9.6 (2019-07-10)](https://github.com/pixelfed/pixelfed/compare/v0.9.5...v0.9.6)
+
+### Fixed
+- Hashtag post count off-by-one [#1485](https://github.com/pixelfed/pixelfed/pull/1485)
     
 
-## [v0.9.X (TBD)](https://github.com/pixelfed/pixelfed/compare/v0.9.4...dev)
+## [v0.9.5 (2019-07-10)](https://github.com/pixelfed/pixelfed/compare/v0.9.4...v0.9.5)
 
 ### Added
 - Add StatusService [#1387](https://github.com/pixelfed/pixelfed/pull/1387), [425ec91](https://github.com/pixelfed/pixelfed/commit/425ec91)

README.md

@@ -12,7 +12,7 @@
 A free and ethical photo sharing platform, powered by ActivityPub federation.
 
 <p align="center">
-<img src="https://pixelfed.nyc3.cdn.digitaloceanspaces.com/media/Screen%20Shot%202019-02-05%20at%206.34.59%20PM.png">
+<img src="https://pixelfed.nyc3.cdn.digitaloceanspaces.com/media/Screen%20Shot%202019-09-08%20at%2010.40.54%20PM.png">
 </p>
 
 ## Official Documentation

config/pixelfed.php

@@ -23,7 +23,7 @@ return [
     | This value is the version of your Pixelfed instance.
     |
     */
-    'version' => '0.10.2',
+    'version' => '0.10.3',
 
     /*
     |--------------------------------------------------------------------------

public/mix-manifest.json

@@ -18,10 +18,10 @@
     "/js/hashtag.js": "/js/hashtag.js?id=1e5990f89b6bfe7e037b",
     "/js/loops.js": "/js/loops.js?id=9c31302552d789d5f35b",
     "/js/mode-dot.js": "/js/mode-dot.js?id=993d7fee684361edddbc",
-    "/js/profile.js": "/js/profile.js?id=c0d5f349300590fefc8a",
+    "/js/profile.js": "/js/profile.js?id=1f24f1dbdfbf2c6477c4",
     "/js/quill.js": "/js/quill.js?id=1ab4119a62cc484034d9",
     "/js/search.js": "/js/search.js?id=f312959df65e86a307a3",
-    "/js/status.js": "/js/status.js?id=0857ea680bd2eb9c0b05",
+    "/js/status.js": "/js/status.js?id=618fd650c3267f7adf3d",
     "/js/theme-monokai.js": "/js/theme-monokai.js?id=700e5dc735365e184e41",
-    "/js/timeline.js": "/js/timeline.js?id=d8650e1b8a63fd491ccd"
+    "/js/timeline.js": "/js/timeline.js?id=9ae2bfc12ab58a87923b"
 }

resources/assets/js/components/PostComponent.vue

@@ -21,8 +21,8 @@
             <div class="username">
               <span class="username-link font-weight-bold text-dark cursor-pointer" @click="redirect(statusProfileUrl)">{{ statusUsername }}</span>
               <span v-if="status.account.is_admin" class="fa-stack" title="Admin Account" data-toggle="tooltip" style="height:1em; line-height:1em; max-width:19px;">
-                <i class="fas fa-certificate text-primary fa-stack-1x"></i>
-                <i class="fas fa-check text-white fa-sm fa-stack-1x" style="font-size:7px;"></i>
+                <i class="fas fa-certificate text-danger fa-stack-1x"></i>
+                <i class="fas fa-crown text-white fa-sm fa-stack-1x" style="font-size:7px;"></i>
               </span>
               <p v-if="loaded && status.place != null" class="small mb-0 cursor-pointer text-truncate" style="color:#718096" @click="redirect('/discover/places/' + status.place.id + '/' + status.place.slug)">{{status.place.name}}, {{status.place.country}}</p>
             </div>
@@ -86,8 +86,8 @@
                 <div class="username">
                   <span class="username-link font-weight-bold text-dark cursor-pointer" @click="redirect(statusProfileUrl)">{{ statusUsername }}</span>
                   <span v-if="status.account.is_admin" class="fa-stack" title="Admin Account" data-toggle="tooltip" style="height:1em; line-height:1em; max-width:19px;">
-                    <i class="fas fa-certificate text-primary fa-stack-1x"></i>
-                    <i class="fas fa-check text-white fa-sm fa-stack-1x" style="font-size:7px;"></i>
+                    <i class="fas fa-certificate text-danger fa-stack-1x"></i>
+                    <i class="fas fa-crown text-white fa-sm fa-stack-1x" style="font-size:7px;"></i>
                   </span>
                   <p v-if="loaded && status.place != null" class="small mb-0 cursor-pointer text-truncate" style="color:#718096" @click="redirect('/discover/places/' + status.place.id + '/' + status.place.slug)">{{status.place.name}}, {{status.place.country}}</p>
                 </div>

resources/assets/js/components/Profile.vue

@@ -87,8 +87,8 @@
 								<div class="d-none d-md-flex username-bar pb-3 align-items-center">
 									<span class="font-weight-ultralight h3 mb-0">{{profile.username}}</span>
 									<span class="pl-1 pb-2 fa-stack" v-if="profile.is_admin" title="Admin Account" data-toggle="tooltip">
-										<i class="fas fa-certificate fa-lg text-primary fa-stack-1x"></i>
-										<i class="fas fa-check text-white fa-sm fa-stack-1x" style="font-size:9px;"></i>
+										<i class="fas fa-certificate fa-lg text-danger fa-stack-1x"></i>
+										<i class="fas fa-crown text-white fa-sm fa-stack-1x" style="font-size:9px;"></i>
 									</span>
 									<span v-if="profile.id != user.id && user.hasOwnProperty('id')">
 										<span class="pl-4" v-if="relationship.following == true">

resources/assets/js/components/Timeline.vue

@@ -76,8 +76,8 @@
 									{{status.account.username}}
 								</a>
 								<span v-if="status.account.is_admin" class="fa-stack" title="Admin Account" data-toggle="tooltip" style="height:1em; line-height:1em; max-width:19px;">
-									<i class="fas fa-certificate text-primary fa-stack-1x"></i>
-									<i class="fas fa-check text-white fa-sm fa-stack-1x" style="font-size:7px;"></i>
+									<i class="fas fa-certificate text-danger fa-stack-1x"></i>
+									<i class="fas fa-crown text-white fa-sm fa-stack-1x" style="font-size:7px;"></i>
 								</span>
 								<span v-if="scope != 'home' && status.account.id != profile.id && status.account.relationship">
 									<span class="px-1">•</span>