Upgrade to v26 (#172)

* A bunch of new updates from icehrm pro * Push changes to frontend
2019-02-03 14:00:34 +01:00
parent a75325fb52
commit 16014bb38e
734 changed files with 131230 additions and 17430 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,17 @@
-/.settings
-/.buildpath
-/.project
-/.idea/
-/build
-/deployment/clients/dev/data/
-/deployment/clients/test/data/
-/deployment/clients/local/data/
-/.vagrant
-/app/config.php
-/app/data/*
+.settings
+.buildpath
+.project
+.idea/
+build
+deployment/clients/dev/data/
+deployment/clients/test/data/
+deployment/clients/local/data/
+.vagrant
+app/config.php
+app/data/*
+cache.properties
+node_modules/*
+web/dist/*.map
+web/admin/dist/*.map
+web/modules/dist/*.map
 .gitkeep