Commit Graph

1267 Commits

Author SHA1 Message Date
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
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
3f550da1f5 refactor namespace and update routes for api 2019-11-15 18:05:22 +05:30
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
200d7a33df remove temp directory 2019-11-15 16:26:04 +05:30
206dee519d Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into auto-update 2019-11-15 14:11:00 +05:30
b3e212c9fd Merge branch 'auto-update' of https://gitlab.com/mohit.panjvani/crater-web into auto-update 2019-11-15 13:59:26 +05:30
22784cc230 refector listener 2019-11-15 13:46:31 +05:30
1051b03b00 refactor auto updateand invoice and estimate send 2019-11-15 13:39:57 +05:30
03da6eec2a Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-view-status 2019-11-15 13:05:20 +05:30
adbc04846c fix invoice getter 2019-11-15 12:55:35 +05:30
40b0f84cb7 Merge branch 'update-front' of https://gitlab.com/mohit.panjvani/crater-web into auto-update 2019-11-15 12:20:47 +05:30
9707b6b3a2 Merge branch 'modal-size' into 'master'
mark-as-sent in vue action

See merge request mohit.panjvani/crater-web!25
2019-11-15 06:17:48 +00:00
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
5515287120 Merge branch 'pdf-templates' into 'master'
Templates refactors

See merge request mohit.panjvani/crater-web!28
2019-11-14 15:39:28 +00:00
55bb6ee0a3 Merge branch 'auto-update' into 'master'
Auto update

See merge request mohit.panjvani/crater-web!23
2019-11-14 15:39:05 +00:00
917b618ac7 add check version and refactpr auto update 2019-11-14 21:00:17 +05:30
34d78df68a merge master 2019-11-14 20:55:59 +05:30
ba54b85709 refactor template 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 2019-11-14 19:57:14 +05:30
090c33f63c fix status action in view invoice 2019-11-14 19:54:23 +05:30
c00c4b8ae7 Merge branch 'fix-small-issue' into 'master'
add validation on installation wizard

See merge request mohit.panjvani/crater-web!22
2019-11-14 14:17:14 +00:00
21cc2d7674 fix conflict 2019-11-14 19:46:55 +05:30
b610577e79 Merge branch 'safari-issue' into 'master'
Safari issue

See merge request mohit.panjvani/crater-web!26
2019-11-14 14:15:04 +00:00
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
0d9ca2a0fd refactor sales reports 2019-11-14 18:59:31 +05:30
eee69a5d42 refactor updater event calling 2019-11-14 18:27:27 +05:30
78fc41c9d2 refactor updater 2019-11-14 18:23:07 +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
3b789dc49e refactor updater 2019-11-14 18:08:50 +05:30
8276054d01 merge old validation-changes branch 2019-11-14 18:08:40 +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
a2b0b6ed63 Merge branch 'mail-settings' into 'master'
connect mail settings to api

See merge request mohit.panjvani/crater-web!7
2019-11-14 12:29:23 +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
3053764583 Merge branch 'master' into 'mail-settings'
# Conflicts:
#   resources/assets/plugins/vue-font-awesome/index.js
2019-11-14 10:32:24 +00:00
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