Merge pull request #1828 from pixelfed/staging

Staging

app/Transformer/Api/StatusTransformer.php

@@ -23,6 +23,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
             'in_reply_to_account_id'    => $status->in_reply_to_profile_id,
             'reblog'                    => null,
             'content'                   => $status->rendered ?? $status->caption,
+            'content_text'              => $status->caption,
             'created_at'                => $status->created_at->format('c'),
             'emojis'                    => [],
             'reblogs_count'             => $status->reblogs_count ?? 0,
@@ -62,7 +63,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
     public function includeMediaAttachments(Status $status)
     {
         return Cache::remember('status:transformer:media:attachments:'.$status->id, now()->addDays(14), function() use($status) {
-            if(in_array($status->type, ['photo', 'video', 'photo:album', 'loop', 'photo:video:album'])) {
+            if(in_array($status->type, ['photo', 'video', 'video:album', 'photo:album', 'loop', 'photo:video:album'])) {
                 $media = $status->media()->orderBy('order')->get();
                 return $this->collection($media, new MediaTransformer());
             }

resources/lang/en/site.php

@@ -15,5 +15,6 @@ return [
     'contact'           => 'Contact',
     'contact-us'        => 'Contact Us',
     'places'            => 'Places',
+    'profiles'          => 'Profiles',
 
 ];

resources/views/settings/accessibility.blade.php

@@ -53,7 +53,7 @@
     <div class="form-group row mt-5 pt-5">
       <div class="col-12 text-right">
         <hr>
-        <button type="submit" class="btn btn-primary font-weight-bold">Submit</button>
+        <button type="submit" class="btn btn-primary font-weight-bold py-0 px-5">Submit</button>
       </div>
     </div>
   </form>

resources/views/settings/email.blade.php

@@ -28,7 +28,7 @@
     <hr>
     <div class="form-group row">
       <div class="col-12 text-right">
-        <button type="submit" class="btn btn-primary font-weight-bold float-right">Submit</button>
+        <button type="submit" class="btn btn-primary font-weight-bold py-0 px-5">Submit</button>
       </div>
     </div>
   </form>

resources/views/settings/home.blade.php

@@ -95,7 +95,7 @@
     <hr>
     <div class="form-group row">
       <div class="col-12 text-right">
-        <button type="submit" class="btn btn-primary font-weight-bold float-right">Submit</button>
+        <button type="submit" class="btn btn-primary font-weight-bold py-0 px-5">Submit</button>
       </div>
     </div>
   </form>

resources/views/settings/password.blade.php

@@ -29,8 +29,8 @@
     </div>
     <hr>
     <div class="form-group row">
-      <div class="col-sm-9">
-        <button type="submit" class="btn btn-primary">Submit</button>
+      <div class="col-12 text-right">
+        <button type="submit" class="btn btn-primary font-weight-bold py-0 px-5">Submit</button>
       </div>
     </div>
   </form>