Commit Graph

  • 4cd15c71d7 responsive tables label fix Aman upadhyay 2019-11-16 12:36:58 +05:30
  • 6098fbe4b3 Merge branch 'item-modal-scss' into 'master' Mohit Panjwani 2019-11-16 06:24:08 +00:00
  • da800a8766 changes in item modal and some others hastichavda 2019-11-16 11:46:33 +05:30
  • 748a252fa8 solve conflict hastichavda 2019-11-16 11:40:50 +05:30
  • 94533b575b Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into namespace-changes jayvirsinh_gohil 2019-11-16 10:58:59 +05:30
  • b83f476f28 remove germen language jayvirsinh_gohil 2019-11-16 10:50:23 +05:30
  • 5d70832f20 remove unused files and refactor variable names and function names Mohit Panjwani 2019-11-15 21:02:53 +05:30
  • 0dafc47f52 merge master Jay_Makwana 2019-11-15 20:56:24 +05:30
  • a2b6130150 refactor reponsive invoice and estimate crater styles Jay_Makwana 2019-11-15 20:55:25 +05:30
  • 9a3e52b658 Merge branch 'app-update' into 'master' Mohit Panjwani 2019-11-15 14:45:20 +00:00
  • ebd4e2856d Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into app-update Aman upadhyay 2019-11-15 20:05:37 +05:30
  • 173e919a1a fixes Aman upadhyay 2019-11-15 20:03:20 +05:30
  • 69fbf73d6d Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-view-status satyaprakash10 2019-11-15 19:44:48 +05:30
  • d529c1d68f fix status action in view estimate satyaprakash10 2019-11-15 19:43:42 +05:30
  • 1567d9fd37 refactor base modal styles Jay_Makwana 2019-11-15 19:42:16 +05:30
  • d7f73e8e9d Merge branch 'namespace-changes' into 'master' Mohit Panjwani 2019-11-15 13:40:27 +00:00
  • b5d144eae5 Merge branch 'app-update' into 'master' Mohit Panjwani 2019-11-15 13:40:23 +00:00
  • 19947e6008 Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into item-modal-styling hastichavda 2019-11-15 19:06:00 +05:30
  • a08171f47f validation changes hastichavda 2019-11-15 19:04:22 +05:30
  • e018d71443 Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-view-status satyaprakash10 2019-11-15 18:56:57 +05:30
  • 563ae2c3f9 fixes Aman upadhyay 2019-11-15 18:48:00 +05:30
  • e0bad068de Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into namespace-changes jayvirsinh_gohil 2019-11-15 18:46:50 +05:30
  • 24f8175c2a refactor send invoice and estimate jayvirsinh_gohil 2019-11-15 18:24:42 +05:30
  • c8c550d74f Merge branch 'namespace-changes' into 'master' Mohit Panjwani 2019-11-15 12:43:42 +00:00
  • 35c5757c34 Merge branch 'pdf-templates' into 'master' Mohit Panjwani 2019-11-15 12:42:35 +00:00
  • d3fb878f30 Merge branch 'auto-update' into 'master' Mohit Panjwani 2019-11-15 12:40:36 +00:00
  • 3f550da1f5 refactor namespace and update routes for api jayvirsinh_gohil 2019-11-15 18:05:22 +05:30
  • c3f69a3f60 fix invoice and estimate page-break margin yogesh_gohil 2019-11-15 18:00:42 +05:30
  • d8948af0b1 front end changes Aman upadhyay 2019-11-15 17:42:03 +05:30
  • a5fa5458ec Merge branch 'auto-update' of https://gitlab.com/mohit.panjvani/crater-web into auto-update Aman upadhyay 2019-11-15 17:41:11 +05:30
  • cf1d39d111 Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into item-modal-styling hastichavda 2019-11-15 16:43:41 +05:30
  • 17abcdb67b made changes hastichavda 2019-11-15 16:43:34 +05:30
  • 200d7a33df remove temp directory jayvirsinh_gohil 2019-11-15 16:26:04 +05:30
  • 206dee519d Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into auto-update jayvirsinh_gohil 2019-11-15 14:11:00 +05:30
  • b3e212c9fd Merge branch 'auto-update' of https://gitlab.com/mohit.panjvani/crater-web into auto-update Aman upadhyay 2019-11-15 13:59:26 +05:30
  • 22784cc230 refector listener jayvirsinh_gohil 2019-11-15 13:46:31 +05:30
  • 1051b03b00 refactor auto updateand invoice and estimate send jayvirsinh_gohil 2019-11-15 13:39:57 +05:30
  • 03da6eec2a Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-view-status satyaprakash10 2019-11-15 13:05:20 +05:30
  • adbc04846c fix invoice getter yogesh_gohil 2019-11-15 12:55:35 +05:30
  • 40b0f84cb7 Merge branch 'update-front' of https://gitlab.com/mohit.panjvani/crater-web into auto-update Aman upadhyay 2019-11-15 12:20:47 +05:30
  • 9707b6b3a2 Merge branch 'modal-size' into 'master' Mohit Panjwani 2019-11-15 06:17:48 +00:00
  • a76286c402 made some changes and removed changes of vue-multi-select bansarishukla 2019-11-15 11:31:33 +05:30
  • 6ff47c4286 Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into modal-size bansarishukla 2019-11-15 09:49:32 +05:30
  • 5515287120 Merge branch 'pdf-templates' into 'master' Mohit Panjwani 2019-11-14 15:39:28 +00:00
  • 55bb6ee0a3 Merge branch 'auto-update' into 'master' Mohit Panjwani 2019-11-14 15:39:05 +00:00
  • 917b618ac7 add check version and refactpr auto update jayvirsinh_gohil 2019-11-14 21:00:17 +05:30
  • 34d78df68a merge master Jay_Makwana 2019-11-14 20:55:59 +05:30
  • ba54b85709 refactor template Jay_Makwana 2019-11-14 20:54:53 +05:30
  • 75b0cd4a5e Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-view-status-action satyaprakash10 2019-11-14 19:57:14 +05:30
  • 090c33f63c fix status action in view invoice satyaprakash10 2019-11-14 19:54:23 +05:30
  • c00c4b8ae7 Merge branch 'fix-small-issue' into 'master' Mohit Panjwani 2019-11-14 14:17:14 +00:00
  • 21cc2d7674 fix conflict Mohit Panjwani 2019-11-14 19:46:55 +05:30
  • b610577e79 Merge branch 'safari-issue' into 'master' Mohit Panjwani 2019-11-14 14:15:04 +00:00
  • 0fa5be9124 merge with master yogesh_gohil 2019-11-14 19:42:23 +05:30
  • 0debf9b393 fix date display and other small issues yogesh_gohil 2019-11-14 19:41:33 +05:30
  • b3a9291d44 update front changes Aman upadhyay 2019-11-14 19:40:56 +05:30
  • 929ae6bdc7 mark-as-sent in vue action bansarishukla 2019-11-14 19:02:34 +05:30
  • 0d9ca2a0fd refactor sales reports jayvirsinh_gohil 2019-11-14 18:59:31 +05:30
  • eee69a5d42 refactor updater event calling jayvirsinh_gohil 2019-11-14 18:27:27 +05:30
  • 78fc41c9d2 refactor updater jayvirsinh_gohil 2019-11-14 18:23:07 +05:30
  • f2546d96b5 Merge branch 'master' of gitlab.com:mohit.panjvani/crater-web Mohit Panjwani 2019-11-14 18:11:06 +05:30
  • 447c1af517 fix estimate description padding Mohit Panjwani 2019-11-14 18:10:48 +05:30
  • 3b789dc49e refactor updater jayvirsinh_gohil 2019-11-14 18:08:50 +05:30
  • 8276054d01 merge old validation-changes branch jayvirsinh_gohil 2019-11-14 18:08:40 +05:30
  • 297e7c9cd1 Merge branch 'status-color-crater-web' into 'master' Mohit Panjwani 2019-11-14 12:31:28 +00:00
  • 3d15ac5f8f Merge branch 'unit-pc' into 'master' Mohit Panjwani 2019-11-14 12:31:18 +00:00
  • a2b0b6ed63 Merge branch 'mail-settings' into 'master' Mohit Panjwani 2019-11-14 12:29:23 +00:00
  • a1bfd2f738 fix the change hastichavda 2019-11-14 17:27:30 +05:30
  • 0eb4d91086 add validation on installation wizard raishvaria 2019-11-14 17:02:56 +05:30
  • 1e04a8d0a5 add media query in modals and pc in item units hastichavda 2019-11-14 16:28:09 +05:30
  • 3053764583 Merge branch 'master' into 'mail-settings' Yogesh Gohil 2019-11-14 10:32:24 +00:00
  • 23112b5ecd fix conflicts yogesh_gohil 2019-11-14 15:57:19 +05:30
  • 2dda0baa3f fix conflicts yogesh_gohil 2019-11-14 15:51:48 +05:30
  • 8fc1ef9348 status color bansarishukla 2019-11-14 15:05:39 +05:30
  • 85cc6427e9 status color bansarishukla 2019-11-14 14:54:12 +05:30
  • 9cce0b10a2 Merge branch 'translation-warning-french' into 'master' Mohit Panjwani 2019-11-14 06:33:36 +00:00
  • e91b3b9782 change in expense report bansarishukla 2019-11-14 11:59:11 +05:30
  • 67973c2c4a Merge branch 'fix-view-alert' into 'master' Mohit Panjwani 2019-11-14 06:23:45 +00:00
  • 4b3823982d Merge branch 'password-length' into 'master' Mohit Panjwani 2019-11-14 06:22:59 +00:00
  • 9672f3fa12 Merge branch 'pdf-templates' into 'master' Mohit Panjwani 2019-11-14 06:19:49 +00:00
  • 4edd9a4190 password length change hastichavda 2019-11-14 11:15:44 +05:30
  • 441b6bb370 add update app on settings Jay_Makwana 2019-11-13 21:08:15 +05:30
  • fa1ddae78c refactor updater jayvirsinh_gohil 2019-11-13 20:14:46 +05:30
  • 35a12fd4d1 fix translation issues in french and fix issues in estimate action bansarishukla 2019-11-13 19:33:31 +05:30
  • e1d2888786 fix the password length hastichavda 2019-11-13 19:02:03 +05:30
  • e4ba246435 merge master Jay_Makwana 2019-11-13 18:53:05 +05:30
  • b0a1b4a5fa refactor reports in downloading on diffrent os Jay_Makwana 2019-11-13 17:28:40 +05:30
  • 5aeac185ea fix alert in view invoice satyaprakash10 2019-11-13 16:51:58 +05:30
  • 821ef9fc41 Merge branch 'fix-issue' into 'master' Mohit Panjwani 2019-11-13 08:35:26 +00:00
  • f28cd0dfaf remove unused files Mohit Panjwani 2019-11-13 12:24:48 +05:30
  • ad68d68776 fix mail-config and modal icon size Mohit Panjwani 2019-11-13 11:38:30 +05:30
  • 7e52421238 Merge branch 'fix-alert' into 'master' Mohit Panjwani 2019-11-13 05:46:19 +00:00
  • 2c84e0f07d Merge branch 'pdf-templates' into 'master' Mohit Panjwani 2019-11-13 05:44:59 +00:00
  • 80178423ad merge master Jay_Makwana 2019-11-12 20:58:13 +05:30
  • bc69046f3b refactor template and deshboard invoice table Jay_Makwana 2019-11-12 20:55:51 +05:30
  • 3efc3357c1 add key generate command jayvirsinh_gohil 2019-11-12 20:25:00 +05:30
  • 4063984e56 fix small issues yogesh_gohil 2019-11-12 20:09:45 +05:30
  • 2171bccda1 remove unwanted files satyaprakash10 2019-11-12 19:43:50 +05:30
  • 0d4714082c fix conflicts satyaprakash10 2019-11-12 19:39:59 +05:30
  • 4923392db1 refactor environment controller and login validation jayvirsinh_gohil 2019-11-12 19:37:04 +05:30