Adrian Hopek
|
e59ae4a855
|
#4 - cr fix
|
2022-01-18 15:01:34 +01:00 |
|
Adrian Hopek
|
5d580a71d0
|
#4 - fix composer
|
2022-01-18 12:30:58 +01:00 |
|
Adrian Hopek
|
ffba69319c
|
Merge branch 'main' into #4-users-crud
# Conflicts:
# composer.lock
# resources/js/Shared/MainMenu.vue
|
2022-01-18 12:23:35 +01:00 |
|
EwelinaLasowy
|
1b446baa5f
|
#4 - fix
|
2022-01-18 11:46:55 +01:00 |
|
Adrian Hopek
|
c8e15dbfa4
|
#4 - fix
|
2022-01-18 11:18:39 +01:00 |
|
EwelinaLasowy
|
f9c9c7b873
|
#4 - wip
|
2022-01-18 10:54:34 +01:00 |
|
Adrian Hopek
|
e883b8c9b7
|
#4 - fix
|
2022-01-18 10:22:32 +01:00 |
|
Adrian Hopek
|
d7d84a1b30
|
Merge branch 'main' into #4-users-crud
# Conflicts:
# .env.example
# app/Http/Controllers/GoogleController.php
# app/Http/Middleware/Authenticate.php
# app/Http/Resources/UserResource.php
# app/Models/User.php
# composer.lock
# database/factories/UserFactory.php
# database/migrations/2014_10_12_000000_create_users_table.php
# package-lock.json
# package.json
# resources/js/Pages/Login.vue
# resources/js/Shared/Layout/GuestLayout.vue
# resources/js/Shared/MainMenu.vue
# resources/js/app.js
# resources/lang/pl.json
# routes/web.php
|
2022-01-18 10:06:53 +01:00 |
|
Adrian Hopek
|
c615acd264
|
#4 - ecs fix
|
2022-01-18 09:57:10 +01:00 |
|
Adrian Hopek
|
fe1d98a218
|
#4 - tests
|
2022-01-18 09:55:57 +01:00 |
|
EwelinaLasowy
|
4ef131021c
|
#4 - wip
|
2022-01-18 09:05:19 +01:00 |
|
Adrian Hopek
|
55eb288e23
|
#4 - wip
|
2022-01-18 08:18:22 +01:00 |
|
Adrian Hopek
|
13d166ee81
|
Merge remote-tracking branch 'origin/#4-users-crud' into #4-users-crud
# Conflicts:
# app/Enums/FormOfEmployment.php
# app/Models/User.php
# resources/js/Pages/Users/Index.vue
# routes/web.php
|
2022-01-18 07:51:08 +01:00 |
|
Adrian Hopek
|
acf2eba95d
|
#4- wip
|
2022-01-18 07:39:03 +01:00 |
|
EwelinaLasowy
|
df0390134c
|
#4 - wip
|
2022-01-17 11:02:09 +01:00 |
|
EwelinaLasowy
|
fc4669568c
|
#4 - wip
|
2022-01-17 10:39:47 +01:00 |
|
Adrian Hopek
|
7dca5d1e6c
|
#4 - wip
|
2022-01-14 15:09:08 +01:00 |
|
Adrian Hopek
|
d4f43421cd
|
#4- wip
|
2022-01-14 07:44:12 +01:00 |
|
Adrian Hopek
|
63f5a28794
|
#2 - fix
|
2022-01-13 13:25:39 +01:00 |
|
Adrian Hopek
|
fb23be4850
|
#2 - fix
|
2022-01-13 12:51:47 +01:00 |
|
EwelinaLasowy
|
8a23217345
|
#2 - ui fixes to login page
|
2022-01-13 12:42:48 +01:00 |
|
Adrian Hopek
|
7527ebbb43
|
Merge branch 'main' into #2-auth-via-google
# Conflicts:
# app/Http/Middleware/HandleInertiaRequests.php
# public/img/logo.png
# resources/js/Pages/Dashboard.vue
# resources/js/Shared/MainMenu.vue
# resources/js/app.js
|
2022-01-13 09:26:16 +01:00 |
|
Adrian Hopek
|
38af769f7b
|
#2 - wip
|
2022-01-13 09:23:39 +01:00 |
|
Adrian Hopek
|
197e7da9cc
|
#2 - wip
|
2022-01-12 15:36:35 +01:00 |
|