EwelinaLasowy
|
f7aa85ac31
|
#41 - wip
|
2022-02-17 12:25:43 +01:00 |
|
EwelinaLasowy
|
0a921c45cc
|
#41 - wip
|
2022-02-16 11:38:07 +01:00 |
|
EwelinaLasowy
|
db4914392f
|
Merge branch 'main' into #41-email-notifications
|
2022-02-16 09:33:15 +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 |
|
EwelinaLasowy
|
3c499e8be3
|
Merge branch 'main' into #41-email-notifications
# Conflicts:
# app/Domain/CalendarGenerator.php
# app/Domain/Enums/VacationRequestState.php
# app/Domain/VacationRequestStateManager.php
# resources/js/Composables/statusInfo.js
# resources/js/Pages/Calendar.vue
# resources/js/Shared/MainMenu.vue
# resources/lang/pl.json
# tests/Feature/VacationRequestTest.php
# tests/Unit/VacationRequestStatesTest.php
|
2022-02-16 08:53:55 +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 |
|
EwelinaLasowy
|
40226305fb
|
Merge branch '#22-vacation-calendar' into #41-email-notifications
|
2022-02-15 10:07:08 +01:00 |
|
Adrian Hopek
|
09da5cacda
|
Merge remote-tracking branch 'origin/#22-vacation-calendar' into #22-vacation-calendar
|
2022-02-15 09:03:14 +01:00 |
|
Adrian Hopek
|
529b9d084a
|
#22 - fix
|
2022-02-15 09:02:58 +01:00 |
|
EwelinaLasowy
|
131924da76
|
#22 - fix
|
2022-02-14 15:30:09 +01:00 |
|
EwelinaLasowy
|
885dcdf9bb
|
#22 - fix
|
2022-02-14 15:29:24 +01:00 |
|
EwelinaLasowy
|
2bf2b99e28
|
#22 - fix
|
2022-02-14 15:26:50 +01:00 |
|
Adrian Hopek
|
bbbf1791ff
|
#22 - fix
|
2022-02-14 15:24:03 +01:00 |
|
Adrian Hopek
|
3249027020
|
#22 - fix
|
2022-02-14 15:01:15 +01:00 |
|
Adrian Hopek
|
eaaf908388
|
#22 - wip
|
2022-02-14 14:59:15 +01:00 |
|
Adrian Hopek
|
1fe6e72e9a
|
#22 - wip
|
2022-02-14 14:56:41 +01:00 |
|
Adrian Hopek
|
d3d6e3080c
|
#22 - wip
|
2022-02-14 13:43:38 +01:00 |
|
EwelinaLasowy
|
a0b64e6cb3
|
#41 - wip
|
2022-02-11 13:02:35 +01:00 |
|
EwelinaLasowy
|
d026d41715
|
#22 - fix
|
2022-02-10 11:18:29 +01:00 |
|
EwelinaLasowy
|
1586d121f9
|
#22 - wip
|
2022-02-09 11:27:48 +01:00 |
|
EwelinaLasowy
|
aae3c7fcb2
|
#22 - wip
|
2022-02-09 11:25:23 +01:00 |
|
EwelinaLasowy
|
accce6af2b
|
#22 - added some tests
|
2022-02-09 09:39:13 +01:00 |
|
Adrian Hopek
|
09b95602da
|
#22 - wip
|
2022-02-08 15:04:32 +01:00 |
|
Adrian Hopek
|
26a6d81dc2
|
#22 - fix
|
2022-02-08 14:05:40 +01:00 |
|
Adrian Hopek
|
61dab0c653
|
#22 - wip
|
2022-02-08 13:57:15 +01:00 |
|
Adrian Hopek
|
95bead085c
|
#22 - wip
|
2022-02-08 13:50:26 +01:00 |
|
Adrian Hopek
|
753d4bb296
|
#22 - wip
|
2022-02-08 13:46:52 +01:00 |
|
Adrian Hopek
|
75506dfb6d
|
Merge branch 'vacation-request-ui-polishing' into #22-vacation-calendar
|
2022-02-08 09:06:15 +01:00 |
|
Adrian Hopek
|
cc90851bca
|
#22 - wip
|
2022-02-07 14:37:14 +01:00 |
|
Adrian Hopek
|
6deb5b65e2
|
Merge remote-tracking branch 'origin/vacation-request-ui-polishing' into #22-vacation-calendar
|
2022-02-07 12:35:02 +01:00 |
|
Adrian Hopek
|
072fa6d432
|
Merge branch 'main' into #22-vacation-calendar
|
2022-02-07 12:31:27 +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 |
|
EwelinaLasowy
|
39665c9c31
|
wip
|
2022-02-07 10:38:42 +01:00 |
|
EwelinaLasowy
|
205fdd7671
|
wip
|
2022-02-04 15:27:11 +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
|
79d86b2491
|
#22 - wip
|
2022-02-04 08:43:12 +01:00 |
|
Adrian Hopek
|
47288917a2
|
Merge branch 'main' into #22-vacation-calendar
# Conflicts:
# resources/js/Pages/Dashboard.vue
# resources/js/Shared/Layout/AppLayout.vue
# resources/js/Shared/MainMenu.vue
# routes/web.php
|
2022-02-03 10:31:17 +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 |
|
EwelinaLasowy
|
b78ac0cb45
|
change layout
|
2022-02-01 08:55:36 +01:00 |
|
EwelinaLasowy
|
bbb0eb8f6c
|
change layout
|
2022-01-27 11:05:50 +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 |
|
Ewelina Lasowy
|
91bd46cc36
|
#17 - set up Laravel Dusk (#18)
* #17 - set up Laravel Dusk
* #17 - ecs fix
* #17 - fix
* #17 - fix
* #17 - fix
* #17 - fix
* Update .env.dusk.local
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
|
2022-01-18 12:22:02 +01:00 |
|
Adrian Hopek
|
0869395aab
|
#2 - authentication via google (#16)
* #2 - wip
* #2 - wip
* #2 - ui fixes to login page
* #2 - fix
* #2 - fix
* #2 - add title to login page
* Apply suggestions from code review
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
* #2 - cr fix
* #2 - cr fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
|
2022-01-13 14:19:11 +01:00 |
|
Adrian Hopek
|
e015f02892
|
#11 - basic layout (#15)
* #11 - basic layout
* #5 - bump dependencies
* #11 - fix
* #11 - fix
* #11 - fix logo
|
2022-01-12 14:18:25 +01:00 |
|