Commit Graph

1284 Commits

Author SHA1 Message Date
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
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
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
80178423ad merge master 2019-11-12 20:58:13 +05:30
bc69046f3b refactor template and deshboard invoice table 2019-11-12 20:55:51 +05:30
3efc3357c1 add key generate command 2019-11-12 20:25:00 +05:30
4063984e56 fix small issues 2019-11-12 20:09:45 +05:30
2171bccda1 remove unwanted files 2019-11-12 19:43:50 +05:30
0d4714082c fix conflicts 2019-11-12 19:39:59 +05:30
4923392db1 refactor environment controller and login validation 2019-11-12 19:37:04 +05:30
a192e2658a fix conflicts 2019-11-12 19:26:43 +05:30
17c8225880 refactor sweet-alert and add related icons in alert 2019-11-12 19:23:49 +05:30
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
2030ce603b change translation message 2019-11-12 18:58:19 +05:30
19f8d3c042 refactor update finished event 2019-11-12 18:56:24 +05:30
1b28b082d2 add auto update feature 2019-11-12 18:44:49 +05:30
050711ff6e fix conflict 2019-11-12 18:41:25 +05:30