A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
Merge branch 'main' of https://github.com/aminnausin/mediaServer into dev
aminnausin92e4149bd951
diff --cc README.mdindex ea7ba530,55a2b1d6..66bba8dbmode 100755,100644..100755--- a/README.md+++ b/README.md@@@ -1,4 -1,10 +1,14 @@@++<<<<<<< HEAD+<h1 align="center" style="display: block;">MediaServer</h1>++=======+ <div id="user-content-toc">+ <ul align="center" style="list-style: none;">+ <summary>+ <h1 align="center" style="display: block; border: !none;">MediaServer</h1>+ </summary>+ </ul>+ </div>++>>>>>>> 5f2ba995b76aef98b98f6c49ae434f83896aabe4<!-- <p align="center"> --><!-- <br><a href="http://www.amitmerchant.com/electron-markdownify"><img src="https://raw.githubusercontent.com/amitmerchant1990/electron-markdownify/master/app/img/markdownify.png" alt="Markdownify" width="200"></a>@@@ -7,7 -13,7 +17,11 @@@<!-- <br> --><!-- </p> -->++<<<<<<< HEAD+#### <p align="center">A minimalist self-hosted Media Server built with <a href="https://laravel.com/" target="_blank">Laravel</a>. </p>++=======+ #### <p align="center">A minimalist self-hosted Media Server built with <a href="https://laravel.com/" target="_blank">Laravel</a>.</p>++>>>>>>> 5f2ba995b76aef98b98f6c49ae434f83896aabe4<p align="center"><img src="https://img.shields.io/badge/vue-v3.4.29-white" alt="Vue">@@@ -22,6 -28,10 +36,13 @@@<a href="#similar-projects">Similar Projects</a></p>++<<<<<<< HEAD++=======+ > [!IMPORTANT]+ > Active branch: <a href="https://github.com/aminnausin/mediaServer/tree/folder-video-and-playback-data">folder-video-and-playback-data</a>++++>>>>>>> 5f2ba995b76aef98b98f6c49ae434f83896aabe4<!--  -->## Overview@@@ -163,29 -173,9 +184,35 @@@ Below are screenshots of the current we<!-- ||| --><!--|  |  | -->++<<<<<<< HEAD+### Video Player+++### Music Player+++### Analytics+++### Library Management+++### User Management+++### Task Dashboard+++### Android++|  |  |+| :--------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------: |+| Dark Mode on Android | Light Mode on Android |++=======+ |  |  |+ | :--------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------: |+ | Dark Mode on Desktop | Light Mode on Android |++>>>>>>> 5f2ba995b76aef98b98f6c49ae434f83896aabe4## Activity