Commit Graph

150 Commits

Author SHA1 Message Date
Mohit Panjwani ee18fcc306 new build 2019-11-19 20:44:58 +05:30
Jay_Makwana 6378d77cfa merge master 2019-11-19 20:39:30 +05:30
Jay_Makwana 98579040cc refactor login 2019-11-19 20:38:38 +05:30
Jay_Makwana 7d7f4fba73 login refactor 2019-11-19 20:36:21 +05:30
Jay_Makwana 3a5fa43ef4 mail refactor 2019-11-19 20:36:06 +05:30
Mohit Panjwani e63836e1d7 update mail description 2019-11-19 20:06:50 +05:30
Mohit Panjwani b3aeafef47 update env.example and fix token-issue 2019-11-19 19:26:13 +05:30
Jay_Makwana 4ef5a3efb2 merge dev 2019-11-19 19:11:11 +05:30
Jay_Makwana 360b353ab1 refactor notification of user have no email 2019-11-19 18:40:41 +05:30
yogesh_gohil 39170a5765 change checkbox color 2019-11-19 16:23:30 +05:30
Mohit Panjwani 2a8c1deff6 Merge branch 'refactor-mail-config' into 'dev'
add mail lang & fix deselect issue

See merge request mohit.panjvani/crater-web!53
2019-11-19 09:20:06 +00:00
raishvaria 8d6b5207c8 Merge branch 'refactor-mail-config' of https://gitlab.com/mohit.panjvani/crater-web into refactor-mail-config 2019-11-19 14:42:13 +05:30
raishvaria 2af94468b8 fix deselect issue 2019-11-19 14:41:53 +05:30
Aman upadhyay dd9642d445 language changes 2019-11-19 14:33:35 +05:30
Mohit Panjwani 37a4737155 Merge branch 'pdf-mail' into 'master'
Add Logo and Company name on Email Template

See merge request mohit.panjvani/crater-web!49
2019-11-19 08:47:30 +00:00
Mohit Panjwani 8f55b30b0d Merge branch 'refactor-mail-config' into 'master'
change validation message

See merge request mohit.panjvani/crater-web!52
2019-11-19 08:47:10 +00:00
raishvaria 163a76cd37 change url of onboarding 2019-11-19 14:11:52 +05:30
yogesh_gohil ac20ef1cd8 fix mail templates 2019-11-19 13:50:02 +05:30
raishvaria 1e98f0a8dc change validation message 2019-11-19 13:41:56 +05:30
Mohit Panjwani 88ca05a588 Merge branch 'refactor-mail-config' into 'master'
Refactor mail config

See merge request mohit.panjvani/crater-web!51
2019-11-19 07:42:21 +00:00
raishvaria 3b06e62502 remove sparkpost and mandrill 2019-11-19 12:17:44 +05:30
Mohit Panjwani 5572571840 fix self-update 2019-11-19 11:29:10 +05:30
raishvaria f1711ac2e9 refactor mail var save on env 2019-11-19 10:44:55 +05:30
raish_varia b074cda26e refactor mail stuff 2019-11-19 08:39:54 +05:30
Mohit Panjwani b6c5105748 Merge branch 'dashboard-refactor' into 'master'
add separate actions for dashboard tables

See merge request mohit.panjvani/crater-web!45
2019-11-18 14:29:57 +00:00
Mohit Panjwani fc58152eb4 Merge branch 'master' of gitlab.com:mohit.panjvani/crater-web 2019-11-18 19:56:04 +05:30
Jay_Makwana e3a0be8b7c merge dev 2019-11-18 19:50:29 +05:30
Jay_Makwana 94d48c76b8 refactor dashboard actions and send email actions 2019-11-18 19:41:31 +05:30
yogesh_gohil d6cf0402a4 add company name to pdf 2019-11-18 19:35:52 +05:30
raishvaria f0a995bfa0 add mail on wizard 2019-11-18 18:44:15 +05:30
raishvaria 6d350db854 add mail configuration 2019-11-18 17:30:04 +05:30
Mohit Panjwani 88dd744537 fix wizard logo size and environment issue 2019-11-18 15:12:31 +05:30
yogesh_gohil 4a8ac36b3a fix small issue 2019-11-18 12:14:08 +05:30
yogesh_gohil 52d3c6a944 merge with master 2019-11-18 10:14:43 +05:30
raishvaria 88199996fb Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into dashboard-refactor 2019-11-18 09:14:33 +05:30
Mohit Panjwani 9ae2947cec fix auto update issues 2019-11-17 19:45:05 +05:30
yogesh_gohil 0711393bd1 add seprate actions for dashboard tables 2019-11-17 16:36:30 +05:30
Mohit Panjwani 18c9a02773 fix spacing 2019-11-17 13:04:48 +05:30
Mohit Panjwani d19f3c3fb0 fix production build issues and refactor variable names 2019-11-17 12:37:13 +05:30
Mohit Panjwani 425ad1e939 Merge branch 'fix-view-status' into 'master'
Fix view status

See merge request mohit.panjvani/crater-web!37
2019-11-17 06:22:42 +00:00
Mohit Panjwani 06057a8720 Merge branch 'fix-view-status-action' into 'master'
fix status action  in view invoice

See merge request mohit.panjvani/crater-web!27
2019-11-17 06:22:16 +00:00
Mohit Panjwani 006522d8eb Merge branch 'master' of gitlab.com:mohit.panjvani/crater-web 2019-11-17 11:39:33 +05:30
Mohit Panjwani 5e799a4fd1 fix spelling error 2019-11-17 11:39:25 +05:30
Mohit Panjwani 613d0eac0e Merge branch 'front-fixes' into 'master'
responsive tables label fix

See merge request mohit.panjvani/crater-web!40
2019-11-17 06:08:09 +00:00
Mohit Panjwani 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
Mohit Panjwani 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
Jay_Makwana 9d12f3162e refactor styles 2019-11-16 19:39:08 +05:30
yogesh_gohil eebec45ce1 fix button color and some route change 2019-11-16 18:34:28 +05:30
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