Commit Graph

355 Commits

Author SHA1 Message Date
Thilina Pituwala
cdac95bc0e Merge tag 'v27.0.2.OS' into develop
v27.0.2.OS
2020-06-10 02:06:25 +02:00
Thilina Pituwala
8bb61ef4e0 Merge branch 'release/v27.0.2.OS' v27.0.2.OS 2020-06-10 02:06:25 +02:00
Thilina Pituwala
22a6f47c8c Update version to v27.0.2.OS 2020-06-10 02:05:41 +02:00
Thilina Pituwala
7decc9d810 Merge branch 'develop' of github.com:gamonoid/icehrm into develop 2020-06-10 02:04:18 +02:00
Thilina Pituwala
c65bdbbfb3 Fix broken filtering | fix photo attendance | add vagrant development environment 2020-06-10 02:03:44 +02:00
Thilina Hasantha
a245826ae7 Fix code style issues 2020-06-03 06:06:17 +02:00
Thilina Hasantha
80c3b23ce5 Add ref link 2020-06-03 05:41:16 +02:00
Thilina Hasantha
65ef379219 Update version, show icehrm pro info only to admin users 2020-06-03 05:22:17 +02:00
Thilina Pituwala
61ef77a31f Merge tag 'v27.0.1.OS' into develop
v27.0.1.OS
2020-06-02 08:31:59 +02:00
Thilina Pituwala
5f38c8e723 Merge branch 'release/v27.0.1.OS' v27.0.1.OS 2020-06-02 08:31:59 +02:00
Thilina Pituwala
ca7c767ebf Fix key verification 2020-06-02 08:31:13 +02:00
Thilina Pituwala
6d2244ef29 Merge branch 'release/v27.0.0.OS' v27.0.0.OS 2020-06-01 12:33:40 +02:00
Thilina Pituwala
14a5b88e48 Merge tag 'v27.0.0.OS' into develop
v27.0.0.OS
2020-06-01 12:33:40 +02:00
Thilina Pituwala
3cf5e4ef91 Fix php 5.6 issue 2020-06-01 12:32:12 +02:00
Thilina Pituwala
b8299b5c57 Merge tag 'v27.0.0.OS' into develop
v27.0.0.OS
2020-06-01 09:28:25 +02:00
Thilina Pituwala
7baec8faf2 Merge branch 'release/v27.0.0.OS' 2020-06-01 09:28:24 +02:00
Thilina Pituwala
d897b1ae3e Release notes 2020-06-01 09:22:34 +02:00
Thilina Pituwala
d0740e66b4 Update development sample data 2020-06-01 08:49:08 +02:00
Thilina Pituwala
c1f93ae663 Update version 2020-06-01 08:33:12 +02:00
Thilina Pituwala
52358d27b0 Merge tag 'v27.0.0.OS' into develop
v27.0.0.OS
2020-05-31 10:24:51 +02:00
Thilina Pituwala
87941971bd Merge branch 'release/v27.0.0.OS' 2020-05-31 10:24:50 +02:00
Thilina Pituwala
2ff6a1ba8d Fix action button display issue 2020-05-31 10:17:56 +02:00
Thilina Pituwala
e700c4f6ac compile assets / change overtime menu name 2020-05-31 10:08:17 +02:00
Thilina Pituwala
7bc44d3dd5 Merge tag 'v27.0.0.OS' into develop
v27.0.0.OS
2020-05-31 09:29:14 +02:00
Thilina Pituwala
7a76f52f5a Merge branch 'release/v27.0.0.OS' 2020-05-31 09:29:13 +02:00
Thilina Pituwala
648901b104 Key verification 2020-05-31 09:21:24 +02:00
Thilina Pituwala
dd9e904378 Fix menu names 2020-05-31 07:07:38 +02:00
Thilina Pituwala
f87139ef41 Fix cypress tests 2020-05-30 16:12:56 +02:00
Thilina Hasantha
df7ca7e924 Fix travel request approval by supervisor 2020-05-30 02:55:36 +02:00
Thilina Hasantha
5bc3fb2588 Update readme 2020-05-29 06:49:07 +02:00
Thilina Hasantha
016fbe0f3b Update readme and fix code style issues 2020-05-25 07:39:54 +02:00
Thilina Pituwala
d0be9c988b Update readme 2020-05-25 06:27:54 +02:00
Thilina Pituwala
7f20318092 Merge tag 'v27.0.0.OS' into develop
v27.0.0.OS
2020-05-25 06:04:05 +02:00
Thilina Pituwala
89e5a54550 Merge branch 'release/v27.0.0.OS' 2020-05-25 06:03:55 +02:00
Thilina Hasantha
86a3ae485f Merge pull request #215 from gamonoid/feature/docker-setup
Feature/docker setup
2020-05-25 04:13:28 +02:00
Thilina Pituwala
a2ca93db83 Icehrm docker worker and readme 2020-05-25 04:12:35 +02:00
Thilina Pituwala
0f7530024e Split clients and projects modules 2020-05-24 02:35:02 +02:00
Thilina Pituwala
854e1038c6 Update icehrm docker production setup 2020-05-24 02:24:55 +02:00
Thilina Pituwala
b68401efeb Fix cypress test run in docker 2020-05-24 01:29:36 +02:00
Thilina Pituwala
c366248434 Remove vagrant and add testing docker 2020-05-23 20:01:53 +02:00
Thilina Pituwala
1e50da36e6 setup xdebug for development docker setup 2020-05-21 16:45:01 +02:00
Thilina Pituwala
12799bef9c Update readme 2020-05-21 12:15:45 +02:00
Thilina Pituwala
d91283912e Adding docker development env 2020-05-21 12:07:58 +02:00
Thilina Pituwala
a7ef560f79 Merge branch 'master' into develop 2020-05-20 21:22:34 +02:00
Thilina Pituwala
ae78c85806 Merge branch 'master' of github.com:gamonoid/icehrm
# Conflicts:
#	package-lock.json
2020-05-20 21:18:44 +02:00
Thilina Pituwala
7453a58aad Latest updates from IceHrmPro 2020-05-20 18:47:29 +02:00
Thilina Pituwala
1ca9cc0ed6 Fix vagrant key / ubuntu gulp issues 2020-05-20 12:04:28 +02:00
Thilina Hasantha
60c92d7935 Fix non existing class errors 2019-09-05 06:32:07 +02:00
Thilina Hasantha
bb274de175 Fox travis build (#197)
* Update mysql version for travis

* Add ant to travis ci
2019-08-30 03:23:51 +02:00
Thilina Hasantha
91bb1d2d8a Add ant to travis ci 2019-08-30 03:18:38 +02:00