Commit Graph

77 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
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
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
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
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
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
2dda0baa3f fix conflicts 2019-11-14 15:51:48 +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
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
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
ad68d68776 fix mail-config and modal icon size 2019-11-13 11:38:30 +05:30
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