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 |
|
EwelinaLasowy
|
4ef131021c
|
#4 - wip
|
2022-01-18 09:05:19 +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
|
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
|
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
|
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
|
38af769f7b
|
#2 - wip
|
2022-01-13 09:23:39 +01:00 |
|
Adrian Hopek
|
197e7da9cc
|
#2 - wip
|
2022-01-12 15:36:35 +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 |
|
Adrian Hopek
|
262d37d862
|
#9 - set up frontend (#10)
* #9 - set up inertia and tailwind
* #9 - fix
* #9 - headless ui, heroicons and some webpack stuff
* #9 - fix
* #9 - fix
* #9 - fix
* #9 - eslint
* #9 - github pr review
* #9 - run linter manually
* Update resources/js/Pages/Dashboard.vue
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* #9 - fix
* Update .eslintrc.js
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
|
2022-01-11 14:04:01 +01:00 |
|