Commit Graph

251 Commits

Author SHA1 Message Date
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
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
67973c2c4a Merge branch 'fix-view-alert' into 'master'
fix alert in view invoice

See merge request mohit.panjvani/crater-web!15
2019-11-14 06:23:45 +00:00
4b3823982d Merge branch 'password-length' into 'master'
fix the password length

See merge request mohit.panjvani/crater-web!17
2019-11-14 06:22:59 +00:00
9672f3fa12 Merge branch 'pdf-templates' into 'master'
Reports Download on different OS

See merge request mohit.panjvani/crater-web!16
2019-11-14 06:19:49 +00:00
4edd9a4190 password length change 2019-11-14 11:15:44 +05:30
441b6bb370 add update app on settings 2019-11-13 21:08:15 +05:30
fa1ddae78c refactor updater 2019-11-13 20:14:46 +05:30
35a12fd4d1 fix translation issues in french and fix issues in estimate action 2019-11-13 19:33:31 +05:30
e1d2888786 fix the password length 2019-11-13 19:02:03 +05:30
e4ba246435 merge master 2019-11-13 18:53:05 +05:30
b0a1b4a5fa refactor reports in downloading on diffrent os 2019-11-13 17:28:40 +05:30
5aeac185ea fix alert in view invoice 2019-11-13 16:51:58 +05:30
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
f28cd0dfaf remove unused files 2019-11-13 12:24:48 +05:30