Commit Graph

  • 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
  • a192e2658a fix conflicts satyaprakash10 2019-11-12 19:26:43 +05:30
  • 17c8225880 refactor sweet-alert and add related icons in alert satyaprakash10 2019-11-12 19:23:49 +05:30
  • 9192b26b9d Merge branch 'sweetalert-on-action' into 'master' Mohit Panjwani 2019-11-12 13:37:10 +00:00
  • 2030ce603b change translation message bansarishukla 2019-11-12 18:58:19 +05:30
  • 19f8d3c042 refactor update finished event jayvirsinh_gohil 2019-11-12 18:56:24 +05:30
  • 1b28b082d2 add auto update feature jayvirsinh_gohil 2019-11-12 18:44:49 +05:30
  • 050711ff6e fix conflict Mohit Panjwani 2019-11-12 18:41:25 +05:30
  • 1f5c17b655 fix styles Mohit Panjwani 2019-11-12 18:40:27 +05:30
  • 81f34b8912 add previous status method in invoice model jayvirsinh_gohil 2019-11-12 18:30:17 +05:30
  • a144b67a4e validation and status changes jayvirsinh_gohil 2019-11-12 18:26:29 +05:30
  • 4b8f4388df Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into sweetalert-on-action bansarishukla 2019-11-12 18:07:13 +05:30
  • 97c84ac2ff change in toastr message bansarishukla 2019-11-12 18:05:23 +05:30
  • 1d08b3d47e add sweetalert on actions and update icon bansarishukla 2019-11-12 17:55:51 +05:30
  • 4839e57791 connect mail settings to api yogesh_gohil 2019-11-12 17:21:06 +05:30
  • 4decc56b7c Merge branch 'language-validation' into 'master' Mohit Panjwani 2019-11-12 10:03:57 +00:00
  • 134a70d934 Merge branch 'linechart-formatmoney' into 'master' Mohit Panjwani 2019-11-12 10:02:59 +00:00
  • 969ca696ca Merge branch 'pdf-templates' into 'master' Mohit Panjwani 2019-11-12 10:01:56 +00:00
  • 1e38ac924e Merge branch 'fix-small-issue' into 'master' Mohit Panjwani 2019-11-12 10:01:22 +00:00
  • cb328f86ae fix taxtypes issue raishvaria 2019-11-12 14:32:43 +05:30
  • 2868609372 delete public file hastichavda 2019-11-12 13:43:27 +05:30
  • 73d90f73fd fix validation and language changes hastichavda 2019-11-12 13:03:17 +05:30
  • 905064e0be fix the conflict hastichavda 2019-11-12 11:04:55 +05:30
  • 03d18065c6 fix the validation hastichavda 2019-11-12 11:00:35 +05:30
  • 418ad89087 fix item selection issue raishvaria 2019-11-12 10:20:57 +05:30
  • a68fd4f71e Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-small-issue raishvaria 2019-11-12 09:24:06 +05:30
  • deac667c78 add mailconfig in settings Jay_Makwana 2019-11-11 21:01:59 +05:30
  • 617b0711ee refactor templates and reports Jay_Makwana 2019-11-11 20:24:15 +05:30
  • d31bd7849f fix invoice and estimate templates yogesh_gohil 2019-11-11 19:28:20 +05:30
  • d82b83adfd change route for mark as sent bansarishukla 2019-11-11 18:42:18 +05:30
  • 6b8fd9f267 fix wizard and item select issue raishvaria 2019-11-11 18:25:00 +05:30
  • 0fbc26bbe1 Merge branch 'translation' into 'master' Mohit Panjwani 2019-11-11 12:49:49 +00:00
  • ff3121e0d9 Fix translation issues radhu587 2019-11-11 17:53:47 +05:30
  • fa95f7a725 add format money in line chart bansarishukla 2019-11-11 16:43:22 +05:30
  • 80a761dbe0 fix spelling mistakes and reduce logo size Mohit Panjwani 2019-11-11 13:56:51 +05:30
  • ae6290108b fix validation and translation issues Mohit Panjwani 2019-11-11 13:44:24 +05:30
  • d3310b71bd delete unused logos Mohit Panjwani 2019-11-11 13:40:10 +05:30
  • 08309d6b82 fix environment issue Mohit Panjwani 2019-11-11 13:04:09 +05:30
  • bc7f5d4271 build Mohit Panjwani 2019-11-11 12:56:33 +05:30
  • e9e87cccb4 fix Mohit Panjwani 2019-11-11 12:50:21 +05:30
  • bdec6101b8 fix Mohit Panjwani 2019-11-11 12:32:14 +05:30
  • bdf2ba51d6 init crater Mohit Panjwani 2019-11-11 12:16:00 +05:30