Adrian Hopek
|
b11e60ab74
|
#62 - fix
|
2022-03-07 15:16:53 +01:00 |
|
Adrian Hopek
|
f0355f56d3
|
#62 - fix
|
2022-03-07 15:13:37 +01:00 |
|
Adrian Hopek
|
069109c4b0
|
#62 - fix
|
2022-03-07 14:43:40 +01:00 |
|
Adrian Hopek
|
78d209dc3e
|
#62 - fix
|
2022-03-07 14:08:40 +01:00 |
|
Adrian Hopek
|
937d9572a7
|
#62 - fix
|
2022-03-07 13:33:31 +01:00 |
|
Adrian Hopek
|
b2f08f61b7
|
#62 - wip
|
2022-03-07 13:05:49 +01:00 |
|
Adrian Hopek
|
5d64ad9d2a
|
#62 - wip
|
2022-03-07 11:31:53 +01:00 |
|
Adrian Hopek
|
3a1b9862c1
|
Merge branch 'main' into #62-vacation-request-list-for-approvers
# Conflicts:
# app/Eloquent/Helpers/UserAvatarGenerator.php
# composer.lock
# database/factories/VacationRequestActivityFactory.php
# database/seeders/DatabaseSeeder.php
# database/seeders/DemoSeeder.php
|
2022-03-07 10:53:35 +01:00 |
|
Adrian Hopek
|
af6f747aa2
|
#48 - deployment (#68)
* #48 - postgreSQL db
* #43 - vacation summary for employee (#66)
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* #5 - bump dependencies
* #43 - wip
* #43 - add composer script
* #43 - fix
* #43 - fix
* #43 - wip
* #43 - ecs fix
* #43 - cr fix
* #43 - cr fix
* #43 - fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
* #48 - redis stuff
* #48 - user avatars using ui-avatars.com
* #48 - fix
* #48 - fix
* Apply suggestions from code review
Co-authored-by: Marcin Tracz <marcin.tracz@blumilk.pl>
* #48 - cr fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Marcin Tracz <marcin.tracz@blumilk.pl>
|
2022-03-04 14:47:45 +01:00 |
|
Adrian Hopek
|
fdafb76461
|
#62 - wip
|
2022-03-03 10:52:05 +01:00 |
|
Adrian Hopek
|
3d9726039c
|
#43 - vacation summary for employee (#66)
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* #5 - bump dependencies
* #43 - wip
* #43 - add composer script
* #43 - fix
* #43 - fix
* #43 - wip
* #43 - ecs fix
* #43 - cr fix
* #43 - cr fix
* #43 - fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
|
2022-03-03 09:03:17 +01:00 |
|
Adrian Hopek
|
c21d2c8663
|
#43 - fix
|
2022-03-02 10:54:47 +01:00 |
|
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
|
758689d376
|
#43 - cr fix
|
2022-03-02 09:52:25 +01:00 |
|
Adrian Hopek
|
afe5834af6
|
#43 - cr fix
|
2022-03-02 09:29:23 +01:00 |
|
Adrian Hopek
|
ac81882b3f
|
#43 - ecs fix
|
2022-03-01 12:47:51 +01:00 |
|
Adrian Hopek
|
bdbb183b7d
|
#43 - wip
|
2022-03-01 12:46:45 +01:00 |
|
Adrian Hopek
|
2073256067
|
#43 - fix
|
2022-03-01 12:42:44 +01:00 |
|
Adrian Hopek
|
730b0f9adb
|
#43 - fix
|
2022-03-01 12:41:07 +01:00 |
|
Adrian Hopek
|
37c08f3823
|
#43 - add composer script
|
2022-03-01 12:36:06 +01:00 |
|
Adrian Hopek
|
a37be18da6
|
#43 - wip
|
2022-03-01 12:36:00 +01:00 |
|
Adrian Hopek
|
92784846dc
|
#5 - bump dependencies
|
2022-03-01 09:31:45 +01:00 |
|
Adrian Hopek
|
936a279606
|
Merge branch 'vacation-request-form' into dashboard
|
2022-02-28 15:26:46 +01:00 |
|
Adrian Hopek
|
2c15cde6c8
|
wip
|
2022-02-28 14:22:04 +01:00 |
|
Adrian Hopek
|
0c5e3b5926
|
wip
|
2022-02-28 07:51:35 +01:00 |
|
EwelinaLasowy
|
22fc753c73
|
wip
|
2022-02-28 07:46:18 +01:00 |
|
Adrian Hopek
|
c050c4c42d
|
wip
|
2022-02-28 07:33:47 +01:00 |
|
EwelinaLasowy
|
e442da9303
|
wip
|
2022-02-25 16:20:08 +01:00 |
|
EwelinaLasowy
|
7381556f31
|
wip
|
2022-02-25 14:23:50 +01:00 |
|
Adrian Hopek
|
5ded4008c7
|
wip
|
2022-02-25 10:29:45 +01:00 |
|
Adrian Hopek
|
5cb46d2fc4
|
#60 - fix avatars (#61)
* #60 - wip
* #60 - wip
* #60 - fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
|
2022-02-23 11:11:53 +01:00 |
|
Adrian Hopek
|
10b5d0c37e
|
#58 - highlight active section in menu (#59)
* #58 - wip
* Update resources/js/Shared/MainMenu.vue
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
|
2022-02-22 13:46:09 +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 |
|
Adrian Hopek
|
39b464388c
|
#39 - generate timesheet (#56)
* #39 - wip
* #39 - fix
* #39 - wip
* #39 - wip
* #39 - wip
* Update app/Domain/Enums/Month.php
Co-authored-by: Marcin Tracz <marcin.tracz@blumilk.pl>
* #39 - cr fixes
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Marcin Tracz <marcin.tracz@blumilk.pl>
|
2022-02-21 16:09:45 +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
|
597d6f0ddb
|
#49 - laravel 9 (#55)
|
2022-02-18 11:42:06 +01:00 |
|
Adrian Hopek
|
fae50cb21c
|
#37 - cancel vacation request (#53)
* #37 - cancel vacation request
* #37 - fix
* #37 - fix
|
2022-02-17 13:31:33 +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 |
|
Ewelina Lasowy
|
f81c7ca8fa
|
#42 - global notifications (#50)
* 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
* #42 - wip
* #42 - wip
* #42 - fix
* #42 - wip
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
|
2022-02-16 08:43:12 +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 |
|
Adrian Hopek
|
026bfe485f
|
#28 - holidays management (#30)
* #28 - holidays management
* #28 - fix
* #28 - fix
* #28 - fix
* #28 - fix
* #28 - fix
* #28 - fix
* #28 - cr fix
|
2022-01-25 09:02:48 +01:00 |
|
Adrian Hopek
|
6854c7a9f8
|
#27 - separate fields for name and surname (#29)
* #27 - separate fields for name and surname
* #27 -cr fix
|
2022-01-24 12:40:56 +01:00 |
|
Adrian Hopek
|
e147d24365
|
#23 - collective editing vacation days (#26)
* #23 - wip
* #23 - wip
* #23 - wip
* #23 - wip
* #23 - fix
* #23 - ecs fix
* #23 - fix
* #23 - fix
* #23 - cr fix
|
2022-01-24 11:28:00 +01:00 |
|
Adrian Hopek
|
652587dbf1
|
#19 - year periods (#25)
* #19 - year periods
* #19 - fix
|
2022-01-19 11:00:17 +01:00 |
|
Adrian Hopek
|
9aa2d5ec0f
|
#4 - users CRUD (#24)
* #2 - wip
* #2 - wip
* #2 - ui fixes to login page
* #2 - fix
* #2 - fix
* #4- wip
* #4 - wip
* #4 - wip
* #4 - wip
* #4- wip
* #4 - wip
* #4 - wip
* #4 - tests
* #4 - ecs fix
* #4 - fix
* #4 - wip
* #4 - fix
* #4 - fix
* #4 - fix composer
* #4 - cr fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
|
2022-01-19 10:55:10 +01:00 |
|