Commit Graph

520 Commits

Author SHA1 Message Date
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
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
Mohit Panjwani 3cd975dbbd new build 2020-01-25 13:33:50 +05:30
Mohit Panjwani 8e50c36a71 Merge branch 'master' 2020-01-25 13:12:39 +05:30
Mohit Panjwani b499741ab4 change button style of primary actions on view pages 2020-01-25 13:12:20 +05:30
Mohit Panjwani b409cdb913 Merge branch 'auto-update' into 'master'
fix auto update issue in dev

See merge request mohit.panjvani/crater-web!160
2020-01-22 16:10:36 +00:00
raishvaria 13e56105e3 fix auto update issue in dev 2020-01-22 13:39:59 +05:30
Mohit Panjwani da996c1f33 Merge branch 'master' of https://github.com/bytefury/crater 2020-01-19 11:49:35 +05:30
MakerLab 0990ce4678 cross-env should only be in devDependencies 2020-01-18 16:29:48 +01:00
Mohit Panjwani bb6fb2f49d Merge pull request #131 from jjoseba/master
Spanish corrections
2020-01-08 15:39:16 +05:30
Joseba S 400296575e Updated Spanish translation 2020-01-08 10:58:26 +01:00
Mohit Panjwani d58c790b1f Merge branch 'build-300' into 'master'
fix mailgun config issue & build 300

See merge request mohit.panjvani/crater-web!153
2020-01-07 08:32:04 +00:00
raishvaria c674c2ab9e build verison 300 2020-01-07 13:10:55 +05:30
bansarishukla d79692cf3b mail configuration issue 2020-01-07 12:33:03 +05:30
Mohit Panjwani 0176a854b8 Merge branch 'refactor-master' into 'master'
refactor payment view and mutation

See merge request mohit.panjvani/crater-web!151
2020-01-06 16:08:53 +00:00
Jay_Makwana 00548ea908 refactor payment view 2020-01-06 19:03:08 +05:30
Mohit Panjwani 09e335a8a7 fix conflicts 2020-01-06 14:48:08 +05:30
Mohit Panjwani 53e2ed253f Merge branch 'master' 2020-01-06 14:47:06 +05:30
Mohit Panjwani 06b035d9ac Merge branch 'build-300' into 'master'
fix payment issue & build version 300

See merge request mohit.panjvani/crater-web!150
2020-01-06 09:16:49 +00:00
Mohit Panjwani 5c88cbcc42 Merge branch 'master' 2020-01-06 14:45:09 +05:30
raishvaria d9b175a676 fix payment issue & build version 300 2020-01-06 14:08:29 +05:30
Mohit Panjwani f5b9bc95c6 Merge branch 'build-300' into 'master'
build version 300

See merge request mohit.panjvani/crater-web!149
2020-01-06 06:47:08 +00:00
raishvaria 586dcdea0d build version 300 2020-01-06 12:02:12 +05:30
Mohit Panjwani 50957fc179 Merge pull request #127 from hypnodev/typo-fix-crop-popup
Typo fix crop popup
2020-01-05 23:41:51 +05:30
Cristian Cosenza c725e4744b Compiled assets 2020-01-05 19:00:29 +01:00
Cristian Cosenza 7479ce237e Typo fix #126 2020-01-05 18:57:46 +01:00
Cristian Cosenza 84420441c0 Merge pull request #2 from bytefury/master
Merge pull request #2 from bytefury/master
2020-01-05 14:03:26 +01:00
Mohit Panjwani ac96721e87 build 220 2020-01-05 13:50:08 +05:30
Mohit Panjwani db4c7f5e32 fix merge conflicts 2020-01-05 13:45:10 +05:30
Mohit Panjwani 87dc78eea0 Merge pull request #115 from hypnodev/add-available-lang-to-onboarding
Added available languages to Onboarding
2020-01-05 13:39:02 +05:30
Mohit Panjwani e9c2898056 Merge pull request #119 from hypnodev/fix-http-mixed-request
Fix http mixed request
2020-01-05 13:37:27 +05:30
Mohit Panjwani b9c4570137 Merge pull request #121 from MakerLab-Dev/translations-updates
Translations Updates
2020-01-05 13:35:01 +05:30