kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity
73 Commits 12 Branches 0 Tags
4059b101f53515bf48d764a71a3b928be90298a8
Commit Graph

73 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Hopek
4059b101f5 #90 - fix 2022-04-14 11:14:51 +02:00
Adrian Hopek
8a8905c9d7 #90 - fix lint 2022-04-14 10:58:33 +02:00
Adrian Hopek
8840c61289 Merge branch 'main' into #90-user-profile 
# Conflicts:
#	app/Infrastructure/Http/Controllers/VacationRequestController.php
 2022-04-14 10:49:07 +02:00
Adrian Hopek
71772dbb09 #90 - fix 2022-04-14 10:37:29 +02:00
Adrian Hopek
5356b0fc8c #90 - wip 2022-04-14 10:36:39 +02:00
EwelinaLasowy
d27d1736d7 #90 - fix to calendar 2022-04-14 10:24:51 +02:00
Adrian Hopek
d80ba8f41b #90 - wip 2022-04-14 09:39:30 +02:00
Adrian Hopek
25c13c027e #90 - wip 2022-04-14 09:14:39 +02:00
Adrian Hopek
61451aca88 #90 - wip 2022-04-14 09:03:53 +02:00
Adrian Hopek
e679302430 Merge remote-tracking branch 'origin/#90-user-profile' into #90-user-profile 2022-04-13 14:49:08 +02:00
Adrian Hopek
636e83b71f #90 - wip 2022-04-13 14:48:56 +02:00
EwelinaLasowy
52d681ca88 #90 - fix to generate PDF 2022-04-13 14:04:58 +02:00
Adrian Hopek
459b62500e #122 - fix missing people in vacation request view (#123) 2022-04-13 11:58:30 +02:00
Adrian Hopek
c0866dc374 Merge branch 'fix-css-focuses' into #90-user-profile 2022-04-13 11:35:05 +02:00
Adrian Hopek
6506855bba #90 - wip 2022-04-13 09:19:42 +02:00
Adrian Hopek
90e8812a98 fix css focuses 2022-04-11 10:10:33 +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
Adrian Hopek
d8ac2bd61f #84 - fix remembering user (#89) 
* #84 - fix remembering user

* #84 - ecs fix

* #84 - fix

* #84 - fix test

* #84 - wip

* #84 - add comment to observer

* #84 - cr fix

* Apply suggestions from code review

Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>

* #84 - cr fix

Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
 2022-03-21 14:36:18 +01:00
Adrian Hopek
a0e60a3160 #74 - vacation calendar (#87) 
* - polishing calendar

* wip

* wip

* #74 - wip

* #74 - wip

* #74 - wip

* #74 - fix icons

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
 2022-03-21 11:57:32 +01:00
Adrian Hopek
8c1819aa01 #85 - google calendar improvements (#86) 
* google calendar improvements

* fix

* change vacation request name

* #85 - google calendar improvements

* #85 - fix

* #85 - fix

* #85 - fix
 2022-03-18 08:11:34 +01:00
Adrian Hopek
afb1a5e9ff #73 - cancel vacation request (#83) 
* #73 - cancel vacation request

* #73 - fix

* #73 - changed text for cancelling vacation request

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
 2022-03-17 09:33:29 +01:00
Ewelina Lasowy
43870fa060 #72 - UX improvement (#81) 
* #72 - UX improvement

* #72 - wip

* #72 - UX improvement fix

Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
 2022-03-16 14:07:27 +01:00
Adrian Hopek
0076c04e88 #76 - fix menu active status (#80) 2022-03-16 11:53:16 +01:00
Adrian Hopek
287c6c19ab #75 - fix data leak to ui-avatars (#79) 
* #75 - fix data leak to ui-avatars

* #75 - ecs fix

* #75 - new colors

* #75 - change font color

* #75 - ecs fix

* #75 - change colors order

* #75 - fix

* #75 - fix

* #75 - ecs fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
 2022-03-16 11:53:05 +01:00
Adrian Hopek
8a54403318 #77 - center Google "G" icon (#78) 2022-03-16 09:10:24 +01:00
Adrian Hopek
6d62c8b776 #48 - heroku deployment (#70) 
* test

* #48 - deployment

* #48 - fixes

* #48 - prod assets

* #48 - readme for heroku deployment

* #48 - fix

* #48 - ecs fix

* #48 - fix

* #48 - fix

* #48 - cr fix

* #48 - remove predis dependency
 2022-03-15 14:46:42 +01:00
Adrian Hopek
db4be79c91 #62 - vacation request list for approvers (#69) 
* 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

* #62 - wip

* #62 - wip

* #62 - wip

* #62 - fix

* #62 - fix

* #62 - fix

* #62 - fix

* #62 - fix

* #62 - ecs fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
 2022-03-08 09:25:24 +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
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
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
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