Commit Graph

552 Commits

Author SHA1 Message Date
Mohit Panjwani
8562ee5414 Merge branch 'settings-customization-payments' into 'master'
Payments and UnitItems in doubles issue fixed...

See merge request mohit.panjvani/crater-web!218
2020-04-27 16:09:25 +00:00
satyaprakash10
06c66a756c Payments and UnitItems in doubles issue fixed... 2020-04-27 18:54:24 +05:30
Mohit Panjwani
ac33164342 Merge branch '3.1.0' into 'master'
add listener 310

See merge request mohit.panjvani/crater-web!202
2020-04-18 07:29:08 +00:00
Mohit Panjwani
5c7c0d84ea Merge branch 'refactor-crater-3.0.0' into 'master'
Refactor line-chart

See merge request mohit.panjvani/crater-web!203
2020-04-18 07:15:52 +00:00
Jay Makwana
7ca725ac37 refactor line-chart 2020-04-17 19:53:08 +05:30
jayvirsinh_gohil
510a4b3dbb add listener 310 2020-04-17 19:05:10 +05:30
Mohit Panjwani
25114009e3 remove unused components and update eslint + prettier config 2020-03-30 11:40:45 +05:30
Mohit Panjwani
742e1e445a Merge branch 'expense-refactor' into 'master'
add customer in expense

See merge request mohit.panjvani/crater-web!172
2020-03-20 07:12:39 +00:00
Mohit Panjwani
386f96d60e Merge branch 'version301' into 'master'
add new minor version update 3.0.1

See merge request mohit.panjvani/crater-web!169
2020-03-20 07:12:27 +00:00
Jay Makwana
82d85af672 refactor and merge backend 2020-03-18 18:21:53 +05:30
jayvirsinh_gohil
4d1b267688 Merge branch 'expense-refactor' of https://gitlab.com/mohit.panjvani/crater-web into expense-refactor 2020-03-18 17:41:15 +05:30
jayvirsinh_gohil
bc99ad63a6 add user to expense 2020-03-18 17:40:03 +05:30
Jay Makwana
4bb44f8c93 add customer filter on index 2020-03-18 17:19:09 +05:30
Jay Makwana
c72265ed50 add languages 2020-03-17 19:38:59 +05:30
Jay Makwana
b8958c9eb6 add customer in expense 2020-03-17 19:20:42 +05:30
Mohit Panjwani
e33e314cb7 new frontend build 2020-03-09 15:20:59 +05:30
Mohit Panjwani
84cebee9da Merge branch 'master' of https://github.com/bytefury/crater 2020-03-09 15:19:54 +05:30
Mohit Panjwani
34d3cf7ae8 Merge branch 'item-refactor' into 'master'
refactor item search problem

See merge request mohit.panjvani/crater-web!171
2020-03-09 09:49:26 +00:00
Mohit Panjwani
93d0da836a Merge pull request #172 from digitalsign/master
Change project name in composer.json
2020-02-26 14:35:21 +05:30
Xiaohui Lam
fd51276948 Change project name in composer.json 2020-02-26 13:31:57 +08:00
Jay Makwana
d6274854ba refactor search problem 2020-02-19 19:10:43 +05:30
Mohit Panjwani
ea4bd1a31d Merge pull request #154 from lukasmu/bugfix/expenses-note
Fixed small bug that might occur when an expense is updated
2020-02-09 12:01:43 +05:30
Mohit Panjwani
286e047963 Merge pull request #129 from deanhouseholder/master
Detect if no .env file exists and add it on composer commands.
2020-02-09 12:01:25 +05:30
Mohit Panjwani
be16f48f3d Merge pull request #153 from MakerLab-Dev/patch-3
Improved error handling
2020-02-09 12:00:23 +05:30
jayvirsinh_gohil
ebea1e0813 add new minor version update 3.0.1 2020-02-07 17:20:32 +05:30
Mohit Panjwani
cc8d08f829 Merge pull request #142 from miraro3/master
Added Kyrgyzstani som
2020-02-07 16:42:15 +05:30
Mohit Panjwani
aacffc22eb fix merge conflict 2020-02-03 21:15:07 +05:30
Lukas Müller
d71ca4ffb9 Fixed small bug that might occur when an expense is updated
Previoulsy a string with contents "null" is transmitted and saved to the database when updating an expense with an empty note. This fix prevents that.
Please note that this fix still needs to be compiled with npm.
2020-02-01 14:52:07 +01:00
Mohit Panjwani
186004f7f8 fix merge conflicts 2020-01-31 14:28:16 +05:30
Mohit Panjwani
c2eb22d666 Merge pull request #137 from MakerLab-Dev/patch-1
cross-env should only be in devDependencies
2020-01-31 01:26:32 +05:30
MakerLab-Dev
af189b15b6 Small fix 2020-01-30 20:48:16 +01:00
MakerLab-Dev
1c19be85c3 Improved error handling 2020-01-30 20:47:51 +01:00
MakerLab
4bb4362d23 Removed unnecessary notification
Removed unnecessary notification as the improved error handler will show it
2020-01-30 20:45:39 +01:00
Mohit Panjwani
f6f66b3ae6 Merge pull request #152 from mdpoulter/email-subject
More descriptive email fields.
2020-01-31 00:21:29 +05:30
Mohit Panjwani
b4ccecbcf1 Merge pull request #149 from proea/master
Fix for "Empty PDF rendered in Docker #69"
2020-01-31 00:11:51 +05:30
Evgenij
92f1f196bb Update Dockerfile 2020-01-27 22:38:47 +03:00
Evgenij
ee14070a7b Update Dockerfile
slight change
2020-01-27 22:37:41 +03:00
mdpoulter
8ce7e14a02 Add name in From field. 2020-01-27 20:37:25 +02:00
mdpoulter
3401ca049e Make viewed emails more descriptive. 2020-01-27 14:47:02 +02:00
mdpoulter
5dcc7b9efd Add more descriptive subject lines. 2020-01-27 14:45:40 +02:00
Mohit Panjwani
06a538bb81 Merge branch 'build-version300' into 'master'
Build version300

See merge request mohit.panjvani/crater-web!162
3.0.0
2020-01-27 09:26:58 +00:00
raishvaria
7ab0419f27 build version300 2020-01-27 14:47:45 +05:30
raishvaria
a7275aaa42 fix report download & payments delete issue 2020-01-27 14:46:40 +05:30
raishvaria
bc4e6a05ea fix Surround DB_PASSWORD with quotes #104 issue 2020-01-27 14:22:21 +05:30
raishvaria
ca170f5a87 fix dashbord & using FROM_MAIL_ADDRESS issues 2020-01-27 13:43:48 +05:30
raishvaria
22e7e96dfa fix new lines in address field issue 2020-01-27 11:57:47 +05:30
raishvaria
fcfd1ddb7a build 300 2020-01-27 11:19:22 +05:30
raishvaria
daf8c9265b fix tab & language issue 2020-01-27 11:18:11 +05:30
Evgenij
406d098172 Update Dockerfile
Generation does not work due to:
iconv(): Wrong charset, conversion from `UTF-8' to `UTF-8//IGNORE' is not allowed

Installing the library gnu-libiconv will solve the problem
2020-01-26 23:18:15 +03:00
Mohit Panjwani
824d2e3e8d update app version 2020-01-26 12:32:57 +05:30