Merge pull request #4 from CachetHQ/2.4

Update from upstream repo CachetHQ/Cachet
sideffect0 · Nov 7, 2018 · 06cf1e4 · 06cf1e4
2 parents 29ff9f8 + 47000c9
commit 06cf1e4
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 86 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ branches:
 
 before_install:
   - cp .env.example .env
-  - phpenv config-rm xdebug.ini
+  - phpenv config-rm xdebug.ini || true
 
 install:
   - travis_retry composer install --no-interaction --no-suggest

diff --git a/resources/assets/js/password-strength.js b/resources/assets/js/password-strength.js
diff --git a/resources/views/dashboard/team/add.blade.php b/resources/views/dashboard/team/add.blade.php
@@ -26,8 +26,7 @@
                     </div>
                     <div class="form-group">
                         <label>{{ trans('forms.user.password') }}</label>
-                        <input type="password" class="form-control password-strength" name="password" value="" placeholder="{{ trans('forms.user.password') }}">
-                        <div class="strengthify-wrapper"></div>
+                        <input type="password" class="form-control" name="password" value="" placeholder="{{ trans('forms.user.password') }}">
                     </div>
                     @if($currentUser->isAdmin)
                     <div class="form-group">

diff --git a/resources/views/dashboard/user/index.blade.php b/resources/views/dashboard/user/index.blade.php
@@ -31,8 +31,7 @@
                             </div>
                             <div class="form-group">
                                 <label>{{ trans('forms.user.password') }}</label>
-                                <input type="password" class="form-control password-strength" name="password" value="" placeholder="{{ trans('forms.user.password') }}">
-                                <div class="strengthify-wrapper"></div>
+                                <input type="password" class="form-control" name="password" value="" placeholder="{{ trans('forms.user.password') }}">
                             </div>
                             <hr>
                             <div class="form-group">

diff --git a/webpack.mix.js b/webpack.mix.js
@@ -46,7 +46,6 @@ mix
         'node_modules/sweetalert2/dist/sweetalert2.min.js',
         'node_modules/livestamp/livestamp.js',
         'node_modules/jquery-serializeobject/jquery.serializeObject.js',
-        'resources/assets/js/password-strength.js',
         'resources/assets/js/cachet.js',
     ], 'public/dist/js/all.js')