Commit Graph

43 Commits

Author SHA1 Message Date
Mohit Panjwani 9ae2947cec fix auto update issues 2019-11-17 19:45:05 +05:30
Mohit Panjwani 18c9a02773 fix spacing 2019-11-17 13:04:48 +05:30
Mohit Panjwani d19f3c3fb0 fix production build issues and refactor variable names 2019-11-17 12:37:13 +05:30
Mohit Panjwani 858ef44919 Merge branch 'logo-upload' into 'master'
fix cropper Logo upload

See merge request mohit.panjvani/crater-web!43
2019-11-17 06:06:11 +00:00
Jay_Makwana 9d12f3162e refactor styles 2019-11-16 19:39:08 +05:30
yogesh_gohil eebec45ce1 fix button color and some route change 2019-11-16 18:34:28 +05:30
Jay_Makwana 7e0ff3f6cf refactor component 2019-11-16 17:53:20 +05:30
Jay_Makwana 8aef621692 merge dev 2019-11-16 16:33:19 +05:30
hastichavda 748a252fa8 solve conflict 2019-11-16 11:40:50 +05:30
Mohit Panjwani 5d70832f20 remove unused files and refactor variable names and function names 2019-11-15 21:02:53 +05:30
Jay_Makwana 0dafc47f52 merge master 2019-11-15 20:56:24 +05:30
Jay_Makwana a2b6130150 refactor reponsive invoice and estimate
crater styles
2019-11-15 20:55:25 +05:30
Jay_Makwana 1567d9fd37 refactor base modal styles 2019-11-15 19:42:16 +05:30
hastichavda 19947e6008 Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into item-modal-styling 2019-11-15 19:06:00 +05:30
Aman upadhyay 563ae2c3f9 fixes 2019-11-15 18:48:00 +05:30
Aman upadhyay d8948af0b1 front end changes 2019-11-15 17:42:03 +05:30
hastichavda 17abcdb67b made changes 2019-11-15 16:43:34 +05:30
yogesh_gohil 0fa5be9124 merge with master 2019-11-14 19:42:23 +05:30
yogesh_gohil 0debf9b393 fix date display and other small issues 2019-11-14 19:41:33 +05:30
Mohit Panjwani f2546d96b5 Merge branch 'master' of gitlab.com:mohit.panjvani/crater-web 2019-11-14 18:11:06 +05:30
Mohit Panjwani 447c1af517 fix estimate description padding 2019-11-14 18:10:48 +05:30
Mohit Panjwani 297e7c9cd1 Merge branch 'status-color-crater-web' into 'master'
Status color

See merge request mohit.panjvani/crater-web!20
2019-11-14 12:31:28 +00:00
hastichavda 1e04a8d0a5 add media query in modals and pc in item units 2019-11-14 16:28:09 +05:30
bansarishukla 8fc1ef9348 status color 2019-11-14 15:05:39 +05:30
bansarishukla 85cc6427e9 status color 2019-11-14 14:54:12 +05:30
Jay_Makwana 441b6bb370 add update app on settings 2019-11-13 21:08:15 +05:30
Mohit Panjwani 821ef9fc41 Merge branch 'fix-issue' into 'master'
fix small issues

See merge request mohit.panjvani/crater-web!12
2019-11-13 08:35:26 +00:00
Mohit Panjwani ad68d68776 fix mail-config and modal icon size 2019-11-13 11:38:30 +05:30
Mohit Panjwani 7e52421238 Merge branch 'fix-alert' into 'master'
refactor sweet-alert and add related icons in alert

See merge request mohit.panjvani/crater-web!11
2019-11-13 05:46:19 +00:00
Jay_Makwana 80178423ad merge master 2019-11-12 20:58:13 +05:30
Jay_Makwana bc69046f3b refactor template and deshboard invoice table 2019-11-12 20:55:51 +05:30
yogesh_gohil 4063984e56 fix small issues 2019-11-12 20:09:45 +05:30
satyaprakash10 0d4714082c fix conflicts 2019-11-12 19:39:59 +05:30
satyaprakash10 a192e2658a fix conflicts 2019-11-12 19:26:43 +05:30
satyaprakash10 17c8225880 refactor sweet-alert and add related icons in alert 2019-11-12 19:23:49 +05:30
Mohit Panjwani 9192b26b9d Merge branch 'sweetalert-on-action' into 'master'
add sweet-alert on actions and update icon

See merge request mohit.panjvani/crater-web!8
2019-11-12 13:37:10 +00:00
Mohit Panjwani 050711ff6e fix conflict 2019-11-12 18:41:25 +05:30
Mohit Panjwani 1f5c17b655 fix styles 2019-11-12 18:40:27 +05:30
bansarishukla 4b8f4388df Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into sweetalert-on-action 2019-11-12 18:07:13 +05:30
bansarishukla 1d08b3d47e add sweetalert on actions and update icon 2019-11-12 17:55:51 +05:30
Jay_Makwana 617b0711ee refactor templates and reports 2019-11-11 20:24:15 +05:30
Mohit Panjwani 80a761dbe0 fix spelling mistakes and reduce logo size 2019-11-11 13:56:51 +05:30
Mohit Panjwani bdf2ba51d6 init crater 2019-11-11 12:16:00 +05:30