Commit Graph

95 Commits

Author SHA1 Message Date
fab1dea6c1 Merge branch 'update-app-translation' into 'master'
translation changes in update app

See merge request mohit.panjvani/crater-web!42
2019-11-17 06:07:44 +00:00
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
9d12f3162e refactor styles 2019-11-16 19:39:08 +05:30
eebec45ce1 fix button color and some route change 2019-11-16 18:34:28 +05:30
7e0ff3f6cf refactor component 2019-11-16 17:53:20 +05:30
8de610ad63 fix logo upload 2019-11-16 17:50:21 +05:30
8aef621692 merge dev 2019-11-16 16:33:19 +05:30
cb2fc18d55 update default wizard step to first 2019-11-16 14:11:24 +05:30
6286ccca2e translation changes in update app 2019-11-16 14:07:15 +05:30
6df6cf498b fix update-app 2019-11-16 13:42:26 +05:30
7b4b9daecc Merge branch 'master' of gitlab.com:mohit.panjvani/crater-web 2019-11-16 13:37:22 +05:30
2a0c6932ca fix update-app screen spacing and alerts 2019-11-16 13:27:37 +05:30
fa9197c5bc fix cropper logo 2019-11-16 13:25:30 +05:30
748a252fa8 solve conflict 2019-11-16 11:40:50 +05:30
5d70832f20 remove unused files and refactor variable names and function names 2019-11-15 21:02:53 +05:30
0dafc47f52 merge master 2019-11-15 20:56:24 +05:30
a2b6130150 refactor reponsive invoice and estimate
crater styles
2019-11-15 20:55:25 +05:30
173e919a1a fixes 2019-11-15 20:03:20 +05:30
1567d9fd37 refactor base modal styles 2019-11-15 19:42:16 +05:30
19947e6008 Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into item-modal-styling 2019-11-15 19:06:00 +05:30
a08171f47f validation changes 2019-11-15 19:04:22 +05:30
563ae2c3f9 fixes 2019-11-15 18:48:00 +05:30
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
c3f69a3f60 fix invoice and estimate page-break margin 2019-11-15 18:00:42 +05:30
d8948af0b1 front end changes 2019-11-15 17:42:03 +05:30
a5fa5458ec Merge branch 'auto-update' of https://gitlab.com/mohit.panjvani/crater-web into auto-update 2019-11-15 17:41:11 +05:30
cf1d39d111 Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into item-modal-styling 2019-11-15 16:43:41 +05:30
17abcdb67b made changes 2019-11-15 16:43:34 +05:30
a76286c402 made some changes and removed changes of vue-multi-select 2019-11-15 11:31:33 +05:30
6ff47c4286 Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into modal-size 2019-11-15 09:49:32 +05:30
34d78df68a merge master 2019-11-14 20:55:59 +05:30
ba54b85709 refactor template 2019-11-14 20:54:53 +05:30
21cc2d7674 fix conflict 2019-11-14 19:46:55 +05:30
0fa5be9124 merge with master 2019-11-14 19:42:23 +05:30
0debf9b393 fix date display and other small issues 2019-11-14 19:41:33 +05:30
b3a9291d44 update front changes 2019-11-14 19:40:56 +05:30
929ae6bdc7 mark-as-sent in vue action 2019-11-14 19:02:34 +05:30
f2546d96b5 Merge branch 'master' of gitlab.com:mohit.panjvani/crater-web 2019-11-14 18:11:06 +05:30
447c1af517 fix estimate description padding 2019-11-14 18:10:48 +05:30
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
3d15ac5f8f Merge branch 'unit-pc' into 'master'
add media query in modals and pc in item units

See merge request mohit.panjvani/crater-web!21
2019-11-14 12:31:18 +00:00
a1bfd2f738 fix the change 2019-11-14 17:27:30 +05:30
0eb4d91086 add validation on installation wizard 2019-11-14 17:02:56 +05:30
1e04a8d0a5 add media query in modals and pc in item units 2019-11-14 16:28:09 +05:30
23112b5ecd fix conflicts 2019-11-14 15:57:19 +05:30
2dda0baa3f fix conflicts 2019-11-14 15:51:48 +05:30
8fc1ef9348 status color 2019-11-14 15:05:39 +05:30
85cc6427e9 status color 2019-11-14 14:54:12 +05:30
9cce0b10a2 Merge branch 'translation-warning-french' into 'master'
fix translation issues in french and fix issues in estimate action

See merge request mohit.panjvani/crater-web!18
2019-11-14 06:33:36 +00:00
e91b3b9782 change in expense report 2019-11-14 11:59:11 +05:30