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

feat: ability to manage softwares #856

Merged
merged 48 commits into from
Jun 8, 2021
Merged

feat: ability to manage softwares #856

merged 48 commits into from
Jun 8, 2021

Commits on May 8, 2021

  1. feat: ability to manage softwares

    @djaiss
    djaiss committed May 8, 2021
    Configuration menu
    Copy the full SHA
    d8bbfe9 View commit details
    Browse the repository at this point in the history

  2. wip

    @djaiss
    djaiss committed May 8, 2021
    Configuration menu
    Copy the full SHA
    d5edf20 View commit details
    Browse the repository at this point in the history

  3. wip

    @djaiss
    djaiss committed May 8, 2021
    Configuration menu
    Copy the full SHA
    7fa936e View commit details
    Browse the repository at this point in the history

  4. services should be done

    @djaiss
    djaiss committed May 8, 2021
    Configuration menu
    Copy the full SHA
    5735c7c View commit details
    Browse the repository at this point in the history

  5. collection to software index

    @djaiss
    djaiss committed May 8, 2021
    Configuration menu
    Copy the full SHA
    c71f449 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2021

  1. Update AdminSoftwareViewHelperTest.php

    @djaiss
    djaiss committed May 9, 2021
    Configuration menu
    Copy the full SHA
    b4600f5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into 2021-05-07-software

    @djaiss
    djaiss committed May 9, 2021
    Configuration menu
    Copy the full SHA
    969445e View commit details
    Browse the repository at this point in the history

Commits on May 10, 2021

  1. wip

    @djaiss
    djaiss committed May 10, 2021
    Configuration menu
    Copy the full SHA
    a8a8a5d View commit details
    Browse the repository at this point in the history

Commits on May 11, 2021

  1. Merge branch 'main' into 2021-05-07-software

    @djaiss
    djaiss committed May 11, 2021
    Configuration menu
    Copy the full SHA
    aa6ce4e View commit details
    Browse the repository at this point in the history

  2. wip

    @djaiss
    djaiss committed May 11, 2021
    Configuration menu
    Copy the full SHA
    376cde1 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2021

  1. Merge branch 'main' into 2021-05-07-software

    @djaiss
    djaiss committed May 21, 2021
    Configuration menu
    Copy the full SHA
    71edb75 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2021

  1. wip

    @djaiss
    djaiss committed May 23, 2021
    Configuration menu
    Copy the full SHA
    8596532 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into 2021-05-07-software

    @djaiss
    djaiss committed May 23, 2021
    Configuration menu
    Copy the full SHA
    b2a4b12 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2021

  1. wip

    @djaiss
    djaiss committed May 24, 2021
    Configuration menu
    Copy the full SHA
    53c1857 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2021

  1. wip

    @djaiss
    djaiss committed May 25, 2021
    Configuration menu
    Copy the full SHA
    d416684 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2021

  1. wip

    @djaiss
    djaiss committed May 26, 2021
    Configuration menu
    Copy the full SHA
    719dbe7 View commit details
    Browse the repository at this point in the history

  2. Update Show.vue

    @djaiss
    djaiss committed May 26, 2021
    Configuration menu
    Copy the full SHA
    35d6474 View commit details
    Browse the repository at this point in the history

  3. wip

    @djaiss
    djaiss committed May 26, 2021
    Configuration menu
    Copy the full SHA
    bfd3840 View commit details
    Browse the repository at this point in the history

  4. wip

    @djaiss
    djaiss committed May 26, 2021
    Configuration menu
    Copy the full SHA
    6dcb2d1 View commit details
    Browse the repository at this point in the history

  5. Update GiveSeatToEveryEmployeeTest.php

    @djaiss
    djaiss committed May 26, 2021
    Configuration menu
    Copy the full SHA
    2f5bcdb View commit details
    Browse the repository at this point in the history

  6. Update GiveSeatToEveryEmployeeTest.php

    @djaiss
    djaiss committed May 26, 2021
    Configuration menu
    Copy the full SHA
    2d3c7bf View commit details
    Browse the repository at this point in the history

Commits on May 29, 2021

  1. wip

    @djaiss
    djaiss committed May 29, 2021
    Configuration menu
    Copy the full SHA
    f426c2c View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2021

  1. wip

    @djaiss
    djaiss committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    9c82666 View commit details
    Browse the repository at this point in the history

  2. Update account.php

    @djaiss
    djaiss committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    ec87d3c View commit details
    Browse the repository at this point in the history

  3. wip

    @djaiss
    djaiss committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    e57c5ca View commit details
    Browse the repository at this point in the history

  4. wip

    @djaiss
    djaiss committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    5693c48 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2021

  1. Update Show.vue

    @djaiss
    djaiss committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    23fd97d View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2021

  1. merge

    @djaiss
    djaiss committed Jun 5, 2021
    Configuration menu
    Copy the full SHA
    d15437e View commit details
    Browse the repository at this point in the history

  2. Optimised images with calibre/image-actions

    @github-actions
    github-actions[bot] authored Jun 5, 2021
    Configuration menu
    Copy the full SHA
    c25d716 View commit details
    Browse the repository at this point in the history

  3. omg almost done

    @djaiss
    djaiss committed Jun 5, 2021
    Configuration menu
    Copy the full SHA
    d263d78 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2021

  1. Update AdminSoftwareViewHelperTest.php

    @djaiss
    djaiss committed Jun 6, 2021
    Configuration menu
    Copy the full SHA
    9cf4b6a View commit details
    Browse the repository at this point in the history

  2. Update phpstan.neon

    @djaiss
    djaiss committed Jun 6, 2021
    Configuration menu
    Copy the full SHA
    64ad700 View commit details
    Browse the repository at this point in the history

  3. fucking hell

    @djaiss
    djaiss committed Jun 6, 2021
    Configuration menu
    Copy the full SHA
    a41f7f9 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2021

  1. Merge branch 'main' into 2021-05-07-software

    @djaiss
    djaiss committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    c80e50f View commit details
    Browse the repository at this point in the history

  2. fix

    @djaiss
    djaiss committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    2298c18 View commit details
    Browse the repository at this point in the history

  3. wiip

    @djaiss
    djaiss committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    e683494 View commit details
    Browse the repository at this point in the history

  4. Update app/Http/Controllers/Company/Adminland/AdminSoftwareController… 

    ….php

Co-authored-by: Alexis Saettler <[email protected]>
    @djaiss @asbiin
    djaiss and asbiin authored Jun 7, 2021
    Configuration menu
    Copy the full SHA
    b7dfee6 View commit details
    Browse the repository at this point in the history

  5. Update routes/web.php 

    Co-authored-by: Alexis Saettler <[email protected]>
    @djaiss @asbiin
    djaiss and asbiin authored Jun 7, 2021
    Configuration menu
    Copy the full SHA
    af6068a View commit details
    Browse the repository at this point in the history

  6. Update resources/js/Pages/Adminland/Software/Show.vue 

    Co-authored-by: Alexis Saettler <[email protected]>
    @djaiss @asbiin
    djaiss and asbiin authored Jun 7, 2021
    Configuration menu
    Copy the full SHA
    9253454 View commit details
    Browse the repository at this point in the history

  7. Update resources/js/Pages/Adminland/Software/Show.vue 

    Co-authored-by: Alexis Saettler <[email protected]>
    @djaiss @asbiin
    djaiss and asbiin authored Jun 7, 2021
    Configuration menu
    Copy the full SHA
    29a4512 View commit details
    Browse the repository at this point in the history

  8. Update resources/js/Pages/Adminland/Software/Index.vue 

    Co-authored-by: Alexis Saettler <[email protected]>
    @djaiss @asbiin
    djaiss and asbiin authored Jun 7, 2021
    Configuration menu
    Copy the full SHA
    ba3efe2 View commit details
    Browse the repository at this point in the history

  9. Update app/Http/ViewHelpers/Employee/EmployeeShowViewHelper.php 

    Co-authored-by: Alexis Saettler <[email protected]>
    @djaiss @asbiin
    djaiss and asbiin authored Jun 7, 2021
    Configuration menu
    Copy the full SHA
    37011ce View commit details
    Browse the repository at this point in the history

  10. Update app/Http/ViewHelpers/Adminland/AdminSoftwareViewHelper.php 

    Co-authored-by: Alexis Saettler <[email protected]>
    @djaiss @asbiin
    djaiss and asbiin authored Jun 7, 2021
    Configuration menu
    Copy the full SHA
    11b306e View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' into 2021-05-07-software

    @djaiss
    djaiss authored Jun 7, 2021
    Configuration menu
    Copy the full SHA
    92e6be5 View commit details
    Browse the repository at this point in the history

  12. git add . && git commit -m 'wip'

    @djaiss
    djaiss committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    5bd339e View commit details
    Browse the repository at this point in the history

  13. Merge branch '2021-05-07-software' of github.com:officelifehq/officel… 

    …ife into 2021-05-07-software
    @djaiss
    djaiss committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    a2c51c8 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2021

  1. Merge branch 'main' into 2021-05-07-software

    @djaiss
    djaiss committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    2d7c0c9 View commit details
    Browse the repository at this point in the history

  2. add help links

    @djaiss
    djaiss committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    01c312a View commit details
    Browse the repository at this point in the history