Commit Graph

1356 Commits

Author SHA1 Message Date
Aman upadhyay b01eb65d5e Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into front-fixes 2019-11-16 18:16:53 +05:30
Jay_Makwana 7e0ff3f6cf refactor component 2019-11-16 17:53:20 +05:30
yogesh_gohil 8de610ad63 fix logo upload 2019-11-16 17:50:21 +05:30
Jay_Makwana 8aef621692 merge dev 2019-11-16 16:33:19 +05:30
jayvirsinh_gohil 99d2fe025f Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into namespace-changes 2019-11-16 16:27:34 +05:30
Mohit Panjwani cb2fc18d55 update default wizard step to first 2019-11-16 14:11:24 +05:30
yogesh_gohil 09c03af9f8 remove unwatnted code 2019-11-16 14:10:27 +05:30
hastichavda 6286ccca2e translation changes in update app 2019-11-16 14:07:15 +05:30
yogesh_gohil 8e13518524 fix estimate status in view page 2019-11-16 13:52:46 +05:30
Mohit Panjwani 6df6cf498b fix update-app 2019-11-16 13:42:26 +05:30
Mohit Panjwani 7b4b9daecc Merge branch 'master' of gitlab.com:mohit.panjvani/crater-web 2019-11-16 13:37:22 +05:30
Mohit Panjwani 2a0c6932ca fix update-app screen spacing and alerts 2019-11-16 13:27:37 +05:30
jayvirsinh_gohil 848c5646f9 refactor upadater 2019-11-16 13:25:39 +05:30
yogesh_gohil fa9197c5bc fix cropper logo 2019-11-16 13:25:30 +05:30
Mohit Panjwani 61a7aea0cd fix version compare check on listner.php 2019-11-16 12:41:46 +05:30
Aman upadhyay 4cd15c71d7 responsive tables label fix 2019-11-16 12:36:58 +05:30
Mohit Panjwani 6098fbe4b3 Merge branch 'item-modal-scss' into 'master'
Item modal scss

See merge request mohit.panjvani/crater-web!39
2019-11-16 06:24:08 +00:00
hastichavda da800a8766 changes in item modal and some others 2019-11-16 11:46:33 +05:30
hastichavda 748a252fa8 solve conflict 2019-11-16 11:40:50 +05:30
jayvirsinh_gohil 94533b575b Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into namespace-changes 2019-11-16 10:58:59 +05:30
jayvirsinh_gohil b83f476f28 remove germen language 2019-11-16 10:50:23 +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
Mohit Panjwani 9a3e52b658 Merge branch 'app-update' into 'master'
App update

See merge request mohit.panjvani/crater-web!36
2019-11-15 14:45:20 +00:00
Aman upadhyay ebd4e2856d Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into app-update 2019-11-15 20:05:37 +05:30
Aman upadhyay 173e919a1a fixes 2019-11-15 20:03:20 +05:30
satyaprakash10 69fbf73d6d Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-view-status 2019-11-15 19:44:48 +05:30
satyaprakash10 d529c1d68f fix status action in view estimate 2019-11-15 19:43:42 +05:30
Jay_Makwana 1567d9fd37 refactor base modal styles 2019-11-15 19:42:16 +05:30
Mohit Panjwani d7f73e8e9d Merge branch 'namespace-changes' into 'master'
refactor send invoice and estimate

See merge request mohit.panjvani/crater-web!32
2019-11-15 13:40:27 +00:00
Mohit Panjwani b5d144eae5 Merge branch 'app-update' into 'master'
fixes

See merge request mohit.panjvani/crater-web!33
2019-11-15 13:40:23 +00:00
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
hastichavda a08171f47f validation changes 2019-11-15 19:04:22 +05:30
satyaprakash10 e018d71443 Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-view-status 2019-11-15 18:56:57 +05:30
Aman upadhyay 563ae2c3f9 fixes 2019-11-15 18:48:00 +05:30
jayvirsinh_gohil e0bad068de Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into namespace-changes 2019-11-15 18:46:50 +05:30
jayvirsinh_gohil 24f8175c2a refactor send invoice and estimate 2019-11-15 18:24:42 +05:30
Mohit Panjwani c8c550d74f Merge branch 'namespace-changes' into 'master'
Namespace changes

See merge request mohit.panjvani/crater-web!31
2019-11-15 12:43:42 +00:00
Mohit Panjwani 35c5757c34 Merge branch 'pdf-templates' into 'master'
fix invoice and estimate page-break margin

See merge request mohit.panjvani/crater-web!30
2019-11-15 12:42:35 +00:00
Mohit Panjwani d3fb878f30 Merge branch 'auto-update' into 'master'
Auto update

See merge request mohit.panjvani/crater-web!29
2019-11-15 12:40:36 +00:00
jayvirsinh_gohil 3f550da1f5 refactor namespace and update routes for api 2019-11-15 18:05:22 +05:30
yogesh_gohil c3f69a3f60 fix invoice and estimate page-break margin 2019-11-15 18:00:42 +05:30
Aman upadhyay d8948af0b1 front end changes 2019-11-15 17:42:03 +05:30
Aman upadhyay a5fa5458ec Merge branch 'auto-update' of https://gitlab.com/mohit.panjvani/crater-web into auto-update 2019-11-15 17:41:11 +05:30
hastichavda cf1d39d111 Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into item-modal-styling 2019-11-15 16:43:41 +05:30
hastichavda 17abcdb67b made changes 2019-11-15 16:43:34 +05:30
jayvirsinh_gohil 200d7a33df remove temp directory 2019-11-15 16:26:04 +05:30
jayvirsinh_gohil 206dee519d Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into auto-update 2019-11-15 14:11:00 +05:30
Aman upadhyay b3e212c9fd Merge branch 'auto-update' of https://gitlab.com/mohit.panjvani/crater-web into auto-update 2019-11-15 13:59:26 +05:30