Adrian Hopek
|
474707e691
|
Merge branch 'main' into #43-vacation-summary-for-employee
# Conflicts:
# app/Infrastructure/Http/Controllers/HolidayController.php
# app/Infrastructure/Http/Controllers/VacationLimitController.php
# app/Infrastructure/Http/Controllers/VacationRequestController.php
# composer.lock
# resources/js/Pages/Holidays/Index.vue
# resources/js/Pages/VacationRequest/Create.vue
|
2022-03-02 10:44:07 +01:00 |
|
Adrian Hopek
|
d825dd727f
|
#63 - permissions (#67)
* wip
* fix
* wip
* #63 - permissions
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
|
2022-03-02 09:52:50 +01:00 |
|
Adrian Hopek
|
92784846dc
|
#5 - bump dependencies
|
2022-03-01 09:31:45 +01:00 |
|
EwelinaLasowy
|
7381556f31
|
wip
|
2022-02-25 14:23:50 +01:00 |
|
Adrian Hopek
|
17cdee38e0
|
#38 - vacation request by administrative approver (#57)
* #38 - wip
* #38 - wip
* #38 - fix
* #38 - fix
* #38 - fix
* #38 - fix
* Update resources/lang/pl.json
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
* #38 - cr fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
|
2022-02-22 11:02:36 +01:00 |
|
Ewelina Lasowy
|
77a4d5711c
|
#41 - email notifications (#54)
* change layout
* change layout
* #22 - wip
* wip
* wip
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - wip
* #22 - added some tests
* #22 - wip
* #22 - wip
* #22 - fix
* #41 - wip
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #41 - wip
* #41 - wip
* #49 - laravel 9
* #41 - wip
* #41 - fix
* #41 - fix
* Apply suggestions from code review
Co-authored-by: Jacek Sawoszczuk <jacek.sawoszczuk@gmail.com>
* #41 - cr fix
* #41 - cr fix
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
Co-authored-by: Jacek Sawoszczuk <jacek.sawoszczuk@gmail.com>
|
2022-02-21 13:19:59 +01:00 |
|
Adrian Hopek
|
026dd87a44
|
#6 - Google calendar (#52)
* change layout
* change layout
* #22 - wip
* wip
* wip
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - wip
* #22 - added some tests
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #6 - wip
* #6 - update readme
* #6 - fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
|
2022-02-16 09:01:11 +01:00 |
|
Adrian Hopek
|
6c352b629c
|
#22 - vacation calendar (#51)
* change layout
* change layout
* #22 - wip
* wip
* wip
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - wip
* #22 - added some tests
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - cr fixes
* #22 - cr fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
|
2022-02-15 15:08:26 +01:00 |
|
Adrian Hopek
|
b161981d5a
|
#36 - validate vacation request (#47)
* #36 - wip
* #36 - wip
* #36 - wip
* #36 - added some translations
* #36 - fix
* #36 - fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
|
2022-02-07 12:29:46 +01:00 |
|
Adrian Hopek
|
41c769d4ab
|
#40 - generate pdf for vacation request (#46)
* #40 - wip
* #40 - generate pdf
* #40 - fix
* Update resources/js/Pages/VacationRequest/Show.vue
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
* #40 - fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
|
2022-02-04 10:57:11 +01:00 |
|
Adrian Hopek
|
067b343f24
|
#20 - vacation requests (#35)
* #20 - wip
* #20 - wip
* #20 - fix
* #20 - wip
* #20 - fix
* #20 - fix
|
2022-02-03 08:39:09 +01:00 |
|
Krzysztof Rewak
|
f6d59f8bfb
|
- directory refactor (#32)
* - directory refactor
* - readme.md update
* Update readme.md
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
* Update readme.md
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
* Update readme.md
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
* Update readme.md
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
* Update readme.md
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
|
2022-01-26 12:31:26 +01:00 |
|