89 Commits

Author SHA1 Message Date
Adrian Hopek
c74fc16acd fix vue version 2022-05-11 12:22:04 +02:00
Adrian Hopek
3d0f132cab translations 2022-05-11 11:21:22 +02:00
Adrian Hopek
5dea3293c6 missing empty lines 2022-05-11 10:34:11 +02:00
Adrian Hopek
f50da3b79c lint fixes 2022-05-11 09:12:43 +02:00
Adrian Hopek
dd1aa0d0f8 Merge branch 'main' into #134-fill-users-data-for-resume
# Conflicts:
#	.eslintrc.js
#	composer.lock
#	package-lock.json
#	package.json
2022-05-11 09:06:12 +02:00
Adrian Hopek
3864b5394c wip 2022-05-11 09:01:16 +02:00
Adrian Hopek
cba8199178 wip 2022-05-11 08:01:00 +02:00
Adrian Hopek
37d9404226 wip 2022-05-10 14:54:09 +02:00
Adrian Hopek
22c5f7bb54 wip 2022-05-10 12:19:58 +02:00
Adrian Hopek
5c55f1860a wip 2022-05-10 10:14:48 +02:00
Krzysztof Rewak
88b1543071
- adding day of week to upcoming holidays (#143) 2022-05-10 09:41:30 +02:00
Adrian Hopek
928d3344c8 Merge remote-tracking branch 'origin/generate-cv' into generate-cv
# Conflicts:
#	resources/js/Pages/Resumes/Create.vue
2022-05-10 08:04:07 +02:00
Adrian Hopek
37ce3262ac wip 2022-05-09 15:03:09 +02:00
Ewelina Lasowy
f4d928c6ae
- UX fixes (#142)
* - changed homeoffice icon color

* - improved list of request on dashboard

* - hide holidays if no data

* - fix to holidays

* - fix

* - made forms looks better

* - hide chart when user has no vacation limit

* - linter fix

* - fix to pdf attachment for vacation request
2022-05-06 12:29:06 +02:00
Adrian Hopek
593f997403 wip 2022-05-06 12:23:04 +02:00
Adrian Hopek
47ad45cb73 wip 2022-05-06 09:00:46 +02:00
dependabot[bot]
497f47068c
#5 - (php) Bump laravel/framework from 9.9.0 to 9.10.1 (#140)
* #5 - (php) Bump laravel/framework from 9.9.0 to 9.10.1

Bumps [laravel/framework](https://github.com/laravel/framework) from 9.9.0 to 9.10.1.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.9.0...v9.10.1)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* #5 - May 2022 composer update

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-05-06 08:34:13 +02:00
dependabot[bot]
e1f449fb52
#5 - (js) Bump @vue/compiler-sfc from 3.2.31 to 3.2.33 (#141)
* #5 - (js) Bump @vue/compiler-sfc from 3.2.31 to 3.2.33

Bumps [@vue/compiler-sfc](https://github.com/vuejs/core/tree/HEAD/packages/compiler-sfc) from 3.2.31 to 3.2.33.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/commits/v3.2.33/packages/compiler-sfc)

---
updated-dependencies:
- dependency-name: "@vue/compiler-sfc"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* #5 - May 2022 npm packages update

* #5 - disabled multi-word-component-names

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-05-06 08:34:03 +02:00
Adrian Hopek
911c54f9ab wip 2022-04-29 15:07:19 +02:00
Krzysztof Rewak
3404bf1da8
#115 - Heroku deploy in GitHub Actions (#136) 2022-04-29 09:35:47 +02:00
dependabot[bot]
94da727fe4
- bump async from 2.6.3 to 2.6.4 (#137)
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-29 09:22:41 +02:00
Adrian Hopek
06863b854a
#138 - fix tables on safari (#139) 2022-04-29 09:22:02 +02:00
Adrian Hopek
f35fd2960a wip 2022-04-28 15:26:56 +02:00
Adrian Hopek
503c4e4629 wip 2022-04-28 15:26:35 +02:00
Adrian Hopek
0ae521a5c2 wip 2022-04-28 11:46:18 +02:00
EwelinaLasowy
9778434772 wip 2022-04-28 07:56:11 +02:00
Adrian Hopek
6b2556c1da
#126 - vacation request reminders (#130)
* #126 - vacation request reminders

* #126 - fix workdays

* #126 - changes

* #126 - cs fix

* #5 - bump codestyle

* #126 - fix

* #126 - fix

* #126 - fix

* #126 - fix

* #126 - tests

* #126 - fix

* #126 - fix

* #126 - fix seeders

* #126 - fix

* #126 - tests

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-04-27 15:26:55 +02:00
Adrian Hopek
c69866bb52
#116 - integration with slack (#129)
* wip

* wip

* wip

* wip

* fix

* wip

* wip

* fix

* fix

* cs fix

* #116 - fix

* #116 - changed home-office icon

* Apply suggestions from code review

Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>

* #116 - cr fix

* #116 - cs fix

* #116 - cs fix

* Apply suggestions from code review

Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>

* #5 - bump codestyle

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
2022-04-27 09:57:13 +02:00
Adrian Hopek
d60dc75f99
#118 - keys (#128)
* #118 - wip

* #118 - keys

* #118 - fix

* #118 - fix menu

* #118 - fix to policies and added translations

* #118 - wip

* #118 - tests

* #118 - fix

* #118 - fix

* #118 - fix

* Update resources/lang/pl.json

Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>

* #118 - cr fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
2022-04-21 08:16:31 +02:00
Adrian Hopek
c95d08c861
#120 - remote work (#127)
* #120 - wip

* #120 - add icon to home office

* #120 - wip

* #120 - wip

* #120 - wip

* #120 - wip

* #120 - wip

* #120 - ui fixes

* #120 - fix

* #120 - fix

* #120 - fix

* #120 - fix

* #120 - translation fix

* #120 - fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-04-21 07:44:22 +02:00
Adrian Hopek
cc981b02b4
#90 - user profile (#125)
* fix css focuses

* #90 - wip

* #90 - fix to generate PDF

* #90 - wip

* #90 - wip

* #90 - wip

* #90 - wip

* #90 - fix to calendar

* #90 - wip

* #90 - fix

* #90 - fix lint

* #90 - fix

* Apply suggestions from code review

Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>

* #90 - cr fixes

* #90 - fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
2022-04-14 11:58:45 +02:00
Adrian Hopek
459b62500e
#122 - fix missing people in vacation request view (#123) 2022-04-13 11:58:30 +02:00
Adrian Hopek
4af0482a93
#112 - change content of emails (#114)
* #112 - change content of emails

* #112 - wip
2022-04-08 08:12:41 +02:00
Adrian Hopek
ff8d6aade6
#71 - annual summary (#113)
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* fix

* lint fix

* cr fix

* fix
2022-04-07 14:33:15 +02:00
Adrian Hopek
84403a762a
#107 - bump laravel (#111) 2022-04-07 08:45:04 +02:00
Adrian Hopek
6af4380fe6
#108 - types of vacation request (#110)
* #108 - wip

* #108 - add icon to absence

* #108 - wip

* #108 - fix

* #108 - fix title

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-04-06 15:13:54 +02:00
Ewelina Lasowy
fa244b96cd
- Change logo to svg (#109)
* - sidebar logo fix

* - change icon

* - change logo to svg

* #108 - change icon color
2022-04-06 10:59:26 +02:00
Adrian Hopek
3ab02f1df4
- change document numbering system (#106) 2022-04-04 15:02:22 +02:00
Adrian Hopek
1ae23bd7cb
#48 - fix heroku deploy (#105)
* wip

* wip

* wip

* wip

* wip

* wip
2022-04-04 12:25:19 +02:00
Adrian Hopek
b52d206554
change order of release phase commands (#104) 2022-04-04 08:39:25 +02:00
dependabot[bot]
172eab162d
#5 - (php) Bump laravel/tinker from 2.7.1 to 2.7.2 (#102)
* #5 - (php) Bump laravel/tinker from 2.7.1 to 2.7.2

Bumps [laravel/tinker](https://github.com/laravel/tinker) from 2.7.1 to 2.7.2.
- [Release notes](https://github.com/laravel/tinker/releases)
- [Changelog](https://github.com/laravel/tinker/blob/2.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/tinker/compare/v2.7.1...v2.7.2)

---
updated-dependencies:
- dependency-name: laravel/tinker
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* #5 - bump dependencies

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
2022-04-01 08:35:14 +02:00
Krzysztof Rewak
794e8df3ea
#5 - update codestyle to 1.x (#101)
* #5 - update codestyle to 1.x

* #5 - update codestyle to 1.x
2022-03-31 14:16:14 +02:00
Adrian Hopek
b49fcadbba
#99 - ui changes (#100)
* #99 - ui changes

* #99 - logo fix

* #99 - tailwind plugin for eslint

* #99 - fix

* #99 - fix

* #99 - fix pagination

* #99 - fix logo

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-03-31 10:12:33 +02:00
Adrian Hopek
08421b8a69
- small changes (#98)
* - added some test

* - cr fix

* wip

* wip

* Update resources/js/Shared/MainMenu.vue

Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>

* fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
2022-03-30 10:33:18 +02:00
Ewelina Lasowy
ab16af1ca9
- Permissions tests (#97)
* - added some test

* - cr fix

* - cr fix

* - cr fix

* - cr fix
2022-03-30 09:54:29 +02:00
Ewelina Lasowy
fdbc374d7e
#93 - custom error pages (#94)
* #93 - wip

* #93 - wip

* #93 - fix if statement

* #93 - wip

* #93 - added default error page

* #93 - fix to error page

* #93 - fix linter

* #93 - delete unnecessary file

* #93 - added EOL

* #93 - fix

* #93 - cr fix

Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
2022-03-30 09:06:25 +02:00
Adrian Hopek
720d2c4e7b
#95 - unavailable days (#96)
* #95 - unavailable days

* #95 - fix

* #95 - fix
2022-03-28 14:05:59 +02:00
Adrian Hopek
957b07b3eb
#44 - vacation summary of all employees (#92)
* #44 - ui for summary

* #44 - vacation monthly usage

* #44 - fix

* #44 - fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-03-24 10:33:34 +01:00
Adrian Hopek
dcda8c6255
- vue composition api (#91)
* wip

* fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-03-22 15:03:42 +01:00
Adrian Hopek
95f5ed44d6
- actions and notifications refactor (#88)
* wip

* fix

* fix

* fix

* add test

* fix

* wip

* fix

* fix translations

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-03-21 15:29:20 +01:00