Commit Graph

1357 Commits

Author SHA1 Message Date
hastichavda
e1d2888786 fix the password length 2019-11-13 19:02:03 +05:30
Jay_Makwana
e4ba246435 merge master 2019-11-13 18:53:05 +05:30
Jay_Makwana
b0a1b4a5fa refactor reports in downloading on diffrent os 2019-11-13 17:28:40 +05:30
satyaprakash10
5aeac185ea fix alert in view invoice 2019-11-13 16:51:58 +05:30
Mohit Panjwani
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
Mohit Panjwani
f28cd0dfaf remove unused files 2019-11-13 12:24:48 +05:30
Mohit Panjwani
ad68d68776 fix mail-config and modal icon size 2019-11-13 11:38:30 +05:30
Mohit Panjwani
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
Mohit Panjwani
2c84e0f07d Merge branch 'pdf-templates' into 'master'
refactor templates and some small changes

See merge request mohit.panjvani/crater-web!13
2019-11-13 05:44:59 +00:00
Jay_Makwana
80178423ad merge master 2019-11-12 20:58:13 +05:30
Jay_Makwana
bc69046f3b refactor template and deshboard invoice table 2019-11-12 20:55:51 +05:30
jayvirsinh_gohil
3efc3357c1 add key generate command 2019-11-12 20:25:00 +05:30
yogesh_gohil
4063984e56 fix small issues 2019-11-12 20:09:45 +05:30
satyaprakash10
2171bccda1 remove unwanted files 2019-11-12 19:43:50 +05:30
satyaprakash10
0d4714082c fix conflicts 2019-11-12 19:39:59 +05:30
jayvirsinh_gohil
4923392db1 refactor environment controller and login validation 2019-11-12 19:37:04 +05:30
satyaprakash10
a192e2658a fix conflicts 2019-11-12 19:26:43 +05:30
satyaprakash10
17c8225880 refactor sweet-alert and add related icons in alert 2019-11-12 19:23:49 +05:30
Mohit Panjwani
9192b26b9d Merge branch 'sweetalert-on-action' into 'master'
add sweet-alert on actions and update icon

See merge request mohit.panjvani/crater-web!8
2019-11-12 13:37:10 +00:00
bansarishukla
2030ce603b change translation message 2019-11-12 18:58:19 +05:30
jayvirsinh_gohil
19f8d3c042 refactor update finished event 2019-11-12 18:56:24 +05:30
jayvirsinh_gohil
1b28b082d2 add auto update feature 2019-11-12 18:44:49 +05:30
Mohit Panjwani
050711ff6e fix conflict 2019-11-12 18:41:25 +05:30
Mohit Panjwani
1f5c17b655 fix styles 2019-11-12 18:40:27 +05:30
jayvirsinh_gohil
81f34b8912 add previous status method in invoice model 2019-11-12 18:30:17 +05:30
jayvirsinh_gohil
a144b67a4e validation and status changes 2019-11-12 18:26:29 +05:30
bansarishukla
4b8f4388df Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into sweetalert-on-action 2019-11-12 18:07:13 +05:30
bansarishukla
97c84ac2ff change in toastr message 2019-11-12 18:05:23 +05:30
bansarishukla
1d08b3d47e add sweetalert on actions and update icon 2019-11-12 17:55:51 +05:30
yogesh_gohil
4839e57791 connect mail settings to api 2019-11-12 17:21:06 +05:30
Mohit Panjwani
4decc56b7c Merge branch 'language-validation' into 'master'
Language and  validation

See merge request mohit.panjvani/crater-web!6
2019-11-12 10:03:57 +00:00
Mohit Panjwani
134a70d934 Merge branch 'linechart-formatmoney' into 'master'
Linechart formatmoney and change rout for mark as sent

See merge request mohit.panjvani/crater-web!3
2019-11-12 10:02:59 +00:00
Mohit Panjwani
969ca696ca Merge branch 'pdf-templates' into 'master'
fix invoice and estimate templates

See merge request mohit.panjvani/crater-web!4
2019-11-12 10:01:56 +00:00
Mohit Panjwani
1e38ac924e Merge branch 'fix-small-issue' into 'master'
fix wizard and item select issue

See merge request mohit.panjvani/crater-web!2
2019-11-12 10:01:22 +00:00
raishvaria
cb328f86ae fix taxtypes issue 2019-11-12 14:32:43 +05:30
hastichavda
2868609372 delete public file 2019-11-12 13:43:27 +05:30
hastichavda
73d90f73fd fix validation and language changes 2019-11-12 13:03:17 +05:30
hastichavda
905064e0be fix the conflict 2019-11-12 11:04:55 +05:30
hastichavda
03d18065c6 fix the validation 2019-11-12 11:00:35 +05:30
raishvaria
418ad89087 fix item selection issue 2019-11-12 10:20:57 +05:30
raishvaria
a68fd4f71e Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-small-issue 2019-11-12 09:24:06 +05:30
Jay_Makwana
deac667c78 add mailconfig in settings 2019-11-11 21:01:59 +05:30
Jay_Makwana
617b0711ee refactor templates and reports 2019-11-11 20:24:15 +05:30
yogesh_gohil
d31bd7849f fix invoice and estimate templates 2019-11-11 19:28:20 +05:30
bansarishukla
d82b83adfd change route for mark as sent 2019-11-11 18:42:18 +05:30
raishvaria
6b8fd9f267 fix wizard and item select issue 2019-11-11 18:25:00 +05:30
Mohit Panjwani
0fbc26bbe1 Merge branch 'translation' into 'master'
Fix translation issues

See merge request mohit.panjvani/crater-web!1
2019-11-11 12:49:49 +00:00
radhu587
ff3121e0d9 Fix translation issues 2019-11-11 17:53:47 +05:30
bansarishukla
fa95f7a725 add format money in line chart 2019-11-11 16:43:22 +05:30
Mohit Panjwani
80a761dbe0 fix spelling mistakes and reduce logo size 2019-11-11 13:56:51 +05:30