Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Video Convertor #1111

Open
wants to merge 93 commits into
base: 1.9.2
Choose a base branch
from
Open

Video Convertor #1111

wants to merge 93 commits into from

Commits on Mar 31, 2020

  1. Some Fix

    @muhanadali100
    muhanadali100 committed Mar 31, 2020
    Configuration menu
    Copy the full SHA
    c3605ed View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2020

  1. Fixed: 

    - Home button to close to logo when version is disabled
- User settings overlapped with nav bar
- nav bar pretty positioning

Added:
- Hide Dashboard button setting
- Hide My List setting
- Setting to limit the amount of profiles users can create
    @Gijs735
    Gijs735 committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    202476b View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2020

  1. - Header consistency and design (mobile) 

    - bugfix for admin pages previous commit
    @Gijs735
    Gijs735 committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    139a522 View commit details
    Browse the repository at this point in the history

  2. quickfix new releases h3

    @Gijs735
    Gijs735 committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    37aa313 View commit details
    Browse the repository at this point in the history

  3. use class instead of inline style

    @Gijs735
    Gijs735 committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    80baa3b View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2020

  1. Open subtitles integration

    Vitaliy Samofal committed Aug 12, 2020
    Configuration menu
    Copy the full SHA
    9a7e218 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2020

  1. Fixes for the PR review

    Vitaliy Samofal committed Aug 23, 2020
    Configuration menu
    Copy the full SHA
    789f451 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2020

  1. Random Episode Feature for TV Shows

    @ConflictingTheories
    ConflictingTheories committed Sep 26, 2020
    Configuration menu
    Copy the full SHA
    5876ccc View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2020

  1. Added Turkish translation

    @Alcadramin
    Alcadramin committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    90f5de8 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2020

  1. #985 Exclude various non video related dependencies from tika

    @daknin
    daknin committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    c07dc4e View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2021

  1. Add files via upload

    @emanuelkufrin
    emanuelkufrin committed Jan 10, 2021
    Configuration menu
    Copy the full SHA
    1c58284 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from emanuelkufrin/emanuelkufrin-croatian_trans… 

    …lation

Croatian Translation
    @emanuelkufrin
    emanuelkufrin committed Jan 10, 2021
    Configuration menu
    Copy the full SHA
    86da291 View commit details
    Browse the repository at this point in the history

  3. Add files via upload

    @emanuelkufrin
    emanuelkufrin committed Jan 10, 2021
    Configuration menu
    Copy the full SHA
    96d26d0 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2021

  1. Merge pull request #1035 from streamaserver/1.9.2 

    1.9.3
    @dularion
    dularion committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    210d96e View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2021

  1. Merge pull request #1032 from emanuelkufrin/master 

    Croatian translation
    @dularion
    dularion committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    2f0e204 View commit details
    Browse the repository at this point in the history

  2. add turkish translations

    dularion committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    9023b2b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1001 from Gijs735/master 

    Fixes and additions
    @dularion
    dularion committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    e9f0b8c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1024 from daknin/feature/StreamlineTika 

    #985 Exclude various non video related dependencies from tika
    @dularion
    dularion committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    4968043 View commit details
    Browse the repository at this point in the history

  5. fix merge conflicts for randomEpisode

    dularion committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    723b583 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'ConflictingTheories-channel-playlist' 

    * ConflictingTheories-channel-playlist:
  Random Episode Feature for TV Shows
    dularion committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    13ca54a View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/master' 

    * origin/master:
  #985 Exclude various non video related dependencies from tika
  use class instead of inline style
  quickfix new releases h3
  - Header consistency and design (mobile) - bugfix for admin pages previous commit
  Fixed: - Home button to close to logo when version is disabled - User settings overlapped with nav bar - nav bar pretty positioning

# Conflicts:
#	grails-app/assets/stylesheets/_main.scss
    dularion committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    0a923bf View commit details
    Browse the repository at this point in the history

  8. Merge pull request #954 from muhanadali100/patch-7 

    fix remove generic video
    @dularion
    dularion committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    10b0530 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'feature/opensubtitles' of https://github.com/vsamofal/s… 

    …treama

* 'feature/opensubtitles' of https://github.com/vsamofal/streama:
  Fixes for the PR review
  Open subtitles integration
    dularion committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    e49954f View commit details
    Browse the repository at this point in the history

  10. add nullsafety for subtitle.isDefault

    dularion committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    08289e6 View commit details
    Browse the repository at this point in the history

  11. version "1.10.0"

    dularion committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    0ef6a36 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2021

  1. attempt to fix build issue

    dularion committed Feb 7, 2021
    Configuration menu
    Copy the full SHA
    afb2015 View commit details
    Browse the repository at this point in the history

  2. fix build issues

    dularion committed Feb 7, 2021
    Configuration menu
    Copy the full SHA
    1dcc0d3 View commit details
    Browse the repository at this point in the history

  3. add dashboard counts

    dularion committed Feb 7, 2021
    Configuration menu
    Copy the full SHA
    4ddd9f2 View commit details
    Browse the repository at this point in the history

  4. add translation placeholder for DASHBOARD.TITLE_COUNTER_OF

    dularion committed Feb 7, 2021
    Configuration menu
    Copy the full SHA
    79541f1 View commit details
    Browse the repository at this point in the history

  5. v1.10.1

    dularion committed Feb 7, 2021
    Configuration menu
    Copy the full SHA
    031508d View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2021

  1. fix genericMovie deleting

    dularion committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    24a9833 View commit details
    Browse the repository at this point in the history

  2. fix watchlist rendering for empty videos

    dularion committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    2a1e3f6 View commit details
    Browse the repository at this point in the history

  3. version "1.10.2"

    dularion committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    24a5e01 View commit details
    Browse the repository at this point in the history

  4. consolidate usages of poster_path

    dularion committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    7fa291e View commit details
    Browse the repository at this point in the history

  5. fix permission issue for marking videos as completed

    dularion committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    fd256f6 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2021

  1. add GENRE Administration

    dularion committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    9c97665 View commit details
    Browse the repository at this point in the history

  2. fix broken images in several places

    dularion committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    83a9cf4 View commit details
    Browse the repository at this point in the history

  3. fix genericVideo edit-link

    dularion committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    3512481 View commit details
    Browse the repository at this point in the history

  4. hoist admin video

    dularion committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    2dfde79 View commit details
    Browse the repository at this point in the history

  5. fix highlighting of genericVideos & movies with custom images

    dularion committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    28142de View commit details
    Browse the repository at this point in the history

  6. version "1.10.3"

    dularion committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    845d2a3 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2021

  1. Recursively add files in Bulk-Create

    @Nargren
    Nargren committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    ec8c852 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2021

  1. Adjust Up Next timer on videos as function of duration

    @Nargren
    Nargren committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    6f9a268 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2021

  1. Allow normal user to mark video unwatched

    @Nargren
    Nargren committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    4f8f7a2 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2021

  1. change default value of amountOfMediaEntries in the current.gson … 

    …to 10
    @Likh-Alex
    Likh-Alex committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    536cd44 View commit details
    Browse the repository at this point in the history

  2. refactor results.each{} in TheMovieDbController to assign proper … 

    …`hit.backdrop_path` and `hit.poster_path` url
    @Likh-Alex
    Likh-Alex committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    29a4602 View commit details
    Browse the repository at this point in the history

  3. add counter in dash.tpl.htm for continue watching section 

    add `loadMore()` button to `continue watching` section in `dash.tpl.htm`
    @Likh-Alex
    Likh-Alex committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    decb21a View commit details
    Browse the repository at this point in the history

  4. add vm.continueWatching - in dash-ctrl.js in initMedia method. 

    refactor `dash-ctrl.js` - removed redundant code.
    @Likh-Alex
    Likh-Alex committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    3d5d93d View commit details
    Browse the repository at this point in the history

  5. refactor listContinueWatching in api-service.js to receive params.

    @Likh-Alex
    Likh-Alex committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    673ff5b View commit details
    Browse the repository at this point in the history

  6. refactor listContinueWatching() in DashController.

    @Likh-Alex
    Likh-Alex committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    e7fe797 View commit details
    Browse the repository at this point in the history

  7. refactor listContinueWatching.gson to have total of `ViewingStatu… 

    …s` and `viewingStatusList`.
    @Likh-Alex
    Likh-Alex committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    bc1b600 View commit details
    Browse the repository at this point in the history

  8. refactor listContinueWatching() in VideoService.groovy to return … 

    …`Map` instead of `List<ViewingStatus>`.
    @Likh-Alex
    Likh-Alex committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    ba6c556 View commit details
    Browse the repository at this point in the history

  9. refactor sort parameter in apiService.dash.listContinueWatching o… 

    …f `dash-ctrl.js` to `lastUpdated`.
    @Likh-Alex
    Likh-Alex committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    26abf7f View commit details
    Browse the repository at this point in the history

  10. remove redundant method applyFilter in dash-ctrl.js

    @Likh-Alex
    Likh-Alex committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    c83ca07 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2021

  1. JShint changes

    @Likh-Alex
    Likh-Alex committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    da52465 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2021

  1. JsHint changes

    @Likh-Alex
    Likh-Alex committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    fa818fc View commit details
    Browse the repository at this point in the history

  2. add closeAndOpenNext button in thShow file modal #1044

    @Likh-Alex
    Likh-Alex committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    b8f3910 View commit details
    Browse the repository at this point in the history

  3. reduce unnecessary API Calls & fix two-way data binding for new featu… 

    …re loadNextEpisodeModal
    @Likh-Alex
    dularion authored and Likh-Alex committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    b262d8a View commit details
    Browse the repository at this point in the history

  4. add openNextEpisode to modal-manage-files in tvShows management section

    @Likh-Alex
    Likh-Alex committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    0761346 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2021

  1. Merge pull request #1064 from streamaserver/dev/AL/add-files-to-multi… 

    …ple-episodes-in-tvshow-fixed

Dev/al/add files to multiple episodes in tvshow fixed pr
    @dularion
    dularion committed Mar 29, 2021
    Configuration menu
    Copy the full SHA
    d91e986 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2021

  1. add isActive flag to ViewingStatus & set during save 

    Also making sure in the case of TvShows to only ever have 1 active viewingStatus per show
    dularion committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    d660165 View commit details
    Browse the repository at this point in the history

  2. only show isActive=true for dash/listContinueWatching 

    instead of using reduceContinueWatchingEps only show viewingStatuses on the dashboard with isActive = true
    dularion committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    40007b9 View commit details
    Browse the repository at this point in the history

  3. change return to respond in a gson-response for dashController (refac… 

    …tor)
    dularion committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    eefe526 View commit details
    Browse the repository at this point in the history

  4. remove deprecated method reduceContinueWatchingEps 

    in favor for same handling during viewingStatus/save
    dularion committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    8922f8b View commit details
    Browse the repository at this point in the history

  5. add migration for active ViewingStatuses - migrateContinueWatchingAct… 

    …iveFlag
    dularion committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    fe3f07a View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1062 from streamaserver/dev/AL/add-loadmore-conti… 

    …nue-watching-feature

Dev/al/add loadmore continue watching feature
    @dularion
    dularion committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    d1ec14d View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1058 from Nargren/mark-unwatched 

    Allow normal user to mark video unwatched
    @dularion
    dularion committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    a6e6d04 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1056 from Nargren/recursive-add-files 

    Recursively add files in Bulk-Create
    @dularion
    dularion committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    065428f View commit details
    Browse the repository at this point in the history

  9. Merge pull request #1057 from Nargren/next-up-short-videos 

    Adjust Up Next timer on videos as function of duration
    @dularion
    dularion committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    fcac845 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2021

  1. Create SECURITY.md 

    Hey there,

As there isn't a `SECURITY.md` with an email on your repository, I am unsure how to contact you regarding a potential security issue.

Would you kindly add an e-mail or other contact method to this SECURITY.md? GitHub [recommends](https://docs.github.com/en/code-security/getting-started/adding-a-security-policy-to-your-repository) this as the best way to ensure security issues are responsibly disclosed, and it would massively help security researchers get in touch next time.

Thank you!
    @sartoshi-foot-dao
    sartoshi-foot-dao committed Jul 28, 2021
    Configuration menu
    Copy the full SHA
    936b0f2 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2021

  1. Update DE_de.js 

    The Status Values translated to German
    @JoshHehnle
    JoshHehnle committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    f499d48 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2021

  1. Fixing error adding tv shows to watchlist 

    TV shows have a `null` video, so when explicitly trying to get properties from it there will be an error accessing that property.
    @darkarp
    darkarp committed Oct 30, 2021
    Configuration menu
    Copy the full SHA
    0dc9f38 View commit details
    Browse the repository at this point in the history

  2. Fix shows not showing in watchlist 

    TV shows have a `null` video property so they wouldn't appear. It was changed so that it checks if it has a `tvShow` or a `video`
    @darkarp
    darkarp committed Oct 30, 2021
    Configuration menu
    Copy the full SHA
    0e4b3e8 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2021

  1. Catalan translation added

    @agustinpallares94
    agustinpallares94 committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    3809538 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2021

  1. Fix Log4Shell

    @dularion
    dularion committed Dec 23, 2021
    Configuration menu
    Copy the full SHA
    273fc33 View commit details
    Browse the repository at this point in the history

  2. Fix Log4Shell 2.17.0

    @dularion
    dularion committed Dec 23, 2021
    Configuration menu
    Copy the full SHA
    3a68d7f View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2022

  1. 1.10.4

    Antonia Engfors committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    28f50fa View commit details
    Browse the repository at this point in the history

  2. update log4j to 2.17.1

    Antonia Engfors committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    ad0f18c View commit details
    Browse the repository at this point in the history

Commits on May 25, 2022

  1. Add Slovak translation.

    @jose1711
    jose1711 committed May 25, 2022
    Configuration menu
    Copy the full SHA
    6ae1431 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2022

  1. fix: add supported platform for Apple M1 Silicon

    @bufgix
    bufgix committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    4ca423d View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2022

  1. update default sorting on dashboard to be sort: 'first_air_date', ord… 

    …er: 'DESC'
    Antonia Engfors committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    28049b9 View commit details
    Browse the repository at this point in the history

  2. version "1.10.5"

    Antonia Engfors committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    aac87c1 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2023

  1. Merge pull request #1113 from jose1711/sk_translation 

    Add Slovak translation.
    @dularion
    dularion committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    d36327e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1094 from agustinpallares94/master 

    Catalan translation added
    @dularion
    dularion committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    7ce141a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1083 from JoshHehnle/patch-1 

    Update DE_de.js
    @dularion
    dularion committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    94981b7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1082 from zidingz/patch-1 

    Create SECURITY.md
    @dularion
    dularion committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    e086e1c View commit details
    Browse the repository at this point in the history

  5. Update SECURITY.md

    @dularion
    dularion committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    8fb8151 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1116 from bufgix/m1-docker-mysql-server 

    [Docker] Mysql build error for Apple M1
    @dularion
    dularion committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    2f1ac98 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1092 from darkarp/master 

    Fixing error adding tv shows to watchlist
    @dularion
    dularion committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    1fb9cf9 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2023

  1. Updated gradle from 3.0 to 3.1 to fix compatibility with IntelliJ

    @MarcoLvr
    MarcoLvr committed May 26, 2023
    Configuration menu
    Copy the full SHA
    72e3a75 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2023

  1. allow adding of genre to custom movies & tvShows #1054

    dularion authored and Antonia Engfors committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    a2e486f View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. Merge branch 'streamaserver:master' into master

    @MarcoLvr
    MarcoLvr committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    cd0e2e7 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. Merge pull request #1137 from MarcoLvr/master 

    Updated gradle from 3.0 to 3.1
    @dularion
    dularion committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    5b490a7 View commit details
    Browse the repository at this point in the history