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

Merge new master with old commit #30

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open

Merge new master with old commit #30

wants to merge 29 commits into from

Commits on Dec 19, 2022

  1. end of split WebSocket to external file

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    ff01b1e View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2022

  1. finish global sitestats router/file

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 20, 2022
    Configuration menu
    Copy the full SHA
    a02f323 View commit details
    Browse the repository at this point in the history

  2. pull player into routes/player

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 20, 2022
    Configuration menu
    Copy the full SHA
    34b94fb View commit details
    Browse the repository at this point in the history

  3. pull /files function into /lib/files

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 20, 2022
    Configuration menu
    Copy the full SHA
    e94446b View commit details
    Browse the repository at this point in the history

  4. move transcribing file to lib/transcribing

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 20, 2022
    Configuration menu
    Copy the full SHA
    904aecd View commit details
    Browse the repository at this point in the history

  5. create transcribe.js route

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 20, 2022
    Configuration menu
    Copy the full SHA
    fd4def4 View commit details
    Browse the repository at this point in the history

  6. quick bugfix

    @mayeaux
    mayeaux committed Dec 20, 2022
    Configuration menu
    Copy the full SHA
    9e6489b View commit details
    Browse the repository at this point in the history

  7. fix files viewer page

    @mayeaux
    mayeaux committed Dec 20, 2022
    Configuration menu
    Copy the full SHA
    1307994 View commit details
    Browse the repository at this point in the history

  8. add eslint

    @mayeaux
    mayeaux committed Dec 20, 2022
    Configuration menu
    Copy the full SHA
    dfebd22 View commit details
    Browse the repository at this point in the history

  9. move multer to transcribing.js

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 20, 2022
    Configuration menu
    Copy the full SHA
    48bf49a View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2022

  1. merge master to commit fix

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    196c826 View commit details
    Browse the repository at this point in the history

  2. fixing merge master to commit

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    adf7fc9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/mayeaux/generate-subtitles

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    afbdb45 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into HEAD

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    d83c7f5 View commit details
    Browse the repository at this point in the history

  5. merger new master to old commit

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    10b0cd3 View commit details
    Browse the repository at this point in the history

  6. fix player router get

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    3a89ffe View commit details
    Browse the repository at this point in the history

  7. last merge master

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    6292779 View commit details
    Browse the repository at this point in the history

  8. eslint fixes

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    0a25b50 View commit details
    Browse the repository at this point in the history

  9. more cleanup

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    ee8ba4c View commit details
    Browse the repository at this point in the history

  10. fix transcribe-wrapped

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    ef94ee0 View commit details
    Browse the repository at this point in the history

  11. add languagesToTranslateTo constants exports

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    9f5bdc4 View commit details
    Browse the repository at this point in the history

  12. delete unnecessary logs

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    50d9dd5 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2022

  1. transcribe-wrapped fix

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 24, 2022
    Configuration menu
    Copy the full SHA
    184f2d5 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2022

  1. transcribe-wrapped cleanup

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 25, 2022
    Configuration menu
    Copy the full SHA
    8a31e75 View commit details
    Browse the repository at this point in the history

  2. refactor transcribe-wrapped.js

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 25, 2022
    Configuration menu
    Copy the full SHA
    e2225cc View commit details
    Browse the repository at this point in the history

  3. finish transcribe-wrapped

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 25, 2022
    Configuration menu
    Copy the full SHA
    8a05fda View commit details
    Browse the repository at this point in the history

  4. eslint fix

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 25, 2022
    Configuration menu
    Copy the full SHA
    2c46ed9 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2022

  1. Merge branch 'master' of https://github.com/mayeaux/generate-subtitles

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 26, 2022
    Configuration menu
    Copy the full SHA
    1bcb9d5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into merge-new-master-with-old-commit

    @ahmedsaad3117
    ahmedsaad3117 committed Dec 26, 2022
    Configuration menu
    Copy the full SHA
    1b1886f View commit details
    Browse the repository at this point in the history