1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 17:01:33 +02:00
Commit Graph

3330 Commits

Author SHA1 Message Date
hillelcoren
81a27ace73 New admin portal build 2020-12-02 17:39:44 +00:00
Benjamin Beganović
00ab670d71 Checkout.com migration to Frames:
- Changed cardToken to token in CreditCard reference
- Updated checkout.com.js
- Added "Pay" translation
- Fix issue with switching between token & credt card
2020-12-02 15:33:43 +01:00
David Bomba
bcb21fb234 Working on invoice deletion 2020-12-02 22:01:50 +11:00
David Bomba
bc0a925f39 Fixes for include 2020-12-02 19:59:45 +11:00
David Bomba
e26263f9ef
Merge pull request #4414 from turbo124/v5-stable
Fixes for sending email user
2020-12-02 14:36:28 +11:00
David Bomba
9a1ea49793
Merge pull request #4413 from turbo124/v5-develop
Fixes for sending email user
2020-12-02 14:35:35 +11:00
David Bomba
aa852930e6 refactor from email names to use config() values 2020-12-02 14:08:35 +11:00
David Bomba
b63972e250 fixes for payment refunds 2020-12-02 11:56:29 +11:00
David Bomba
66fc75bb83
Merge pull request #4410 from turbo124/v5-develop
V5 develop
2020-12-02 08:32:45 +11:00
David Bomba
c2344f142a
Merge pull request #4409 from turbo124/v5-stable
Fixes for .htaccess
2020-12-02 07:29:13 +11:00
David Bomba
54fd048614
Merge pull request #4408 from turbo124/v5-develop
V5 develop
2020-12-02 07:28:23 +11:00
hillelcoren
32c5f88122 New admin portal build 2020-12-01 20:24:12 +00:00
Benjamin Beganović
052b76a895
Merge pull request #4405 from beganovich/v5-support-for-sameday-tasks
(v5) Group tasks' date if they were on the same date
2020-12-01 15:53:05 +01:00
Benjamin Beganović
9198cf5175 support tasks as of same day 2020-12-01 15:52:12 +01:00
Benjamin Beganović
a5aa21f441
Merge pull request #4401 from beganovich/v5-fix-issue-with-client-dateform
(v5) Apply client's date format on the tasks
2020-12-01 15:27:49 +01:00
Benjamin Beganović
e5af99d884 fix issue with client date formatc 2020-12-01 15:25:48 +01:00
Benjamin Beganović
d6dc7ffc27
Merge pull request #4400 from beganovich/v5-alias-task.item-to-task.service
(v5) Alias task.product_key as task.service
2020-12-01 15:20:14 +01:00
Benjamin Beganović
1a066f2f9f add alias to task searvice from task product 2020-12-01 15:18:48 +01:00
Benjamin Beganović
66445631ee
Merge pull request #4399 from beganovich/v5-whitelabeling
(v5) Update whitelabeling partials/components
2020-12-01 14:46:26 +01:00
Benjamin Beganović
35fe90fc9f update whitelabeling partials 2020-12-01 14:44:35 +01:00
Benjamin Beganović
686a98eec4
Merge pull request #4398 from beganovich/v5-stripe-issue-with-refunding
(v5) Fix issues with Stripe refunding
2020-12-01 14:12:57 +01:00
Benjamin Beganović
b373a3df52 fix stripe refunding & apply php-cs-fixer 2020-12-01 13:46:09 +01:00
David Bomba
9623dba2c8 fix for showinvoicerequest 2020-12-01 21:22:48 +11:00
David Bomba
6a21da8aba Minor fixes for .htaccess 2020-12-01 21:22:01 +11:00
David Bomba
741e82002c Remove API_SECRET from .env 2020-11-30 21:27:18 +11:00
David Bomba
704ed8349e Fix for flutter path 2020-11-30 21:04:41 +11:00
David Bomba
a8958f4b09 Minor fixes for batch migrations 2020-11-30 18:43:33 +11:00
David Bomba
792262dee4
Merge pull request #4394 from turbo124/v5-stable
Minor changes to migration
2020-11-30 09:59:20 +11:00
David Bomba
1210a81a09 Minor changes to migration 2020-11-30 09:58:31 +11:00
David Bomba
fb5a4134c1
Merge pull request #4393 from turbo124/v5-stable
Fixes for regression of migration
2020-11-30 08:33:47 +11:00
David Bomba
f2f8837269 Merge branch 'v5-stable' of https://github.com/turbo124/invoiceninja into v5-stable 2020-11-30 08:32:27 +11:00
David Bomba
503a0cbab6 Version bump 2020-11-30 08:32:18 +11:00
David Bomba
4368dc7272
Merge pull request #4392 from turbo124/v5-develop
Fixes for migration file location
2020-11-30 08:31:30 +11:00
David Bomba
d7dd592d18 Fixes for migration file location 2020-11-30 08:28:12 +11:00
Benjamin Beganović
a0bad23860
Merge pull request #4391 from beganovich/v5-surround-strings-with-quotes-if-needed
(v5) Update surround logic for strings
2020-11-29 14:22:03 +01:00
Benjamin Beganović
d888780ed8 update quotes logic 2020-11-29 14:20:47 +01:00
Benjamin Beganović
35b23206dd
Merge pull request #4390 from beganovich/v5-surround-strings-with-quotes-if-needed
(v5) Surround multiple words with quotes in env file
2020-11-29 13:54:53 +01:00
Benjamin Beganović
ba6c157128 Surround multiple words with quotes in env file 2020-11-29 13:54:12 +01:00
David Bomba
4505e9b0e4
Merge pull request #4387 from turbo124/v5-stable
Fixes for import
2020-11-28 17:23:08 +11:00
David Bomba
9aee129737 Fixes for import 2020-11-28 17:22:43 +11:00
David Bomba
d497d3c494
Merge pull request #4386 from turbo124/v5-stable
Minor fixes
2020-11-28 15:17:09 +11:00
David Bomba
7d96a6d389
Merge pull request #4385 from turbo124/v5-develop
Fixes for lock
2020-11-28 15:16:00 +11:00
David Bomba
870dea8981
Merge pull request #4369 from beganovich/v5-paypal-refactor
(v5) PayPal refactor
2020-11-28 15:15:07 +11:00
David Bomba
e33ab05b6f
Merge pull request #4384 from turbo124/v5-stable
Fixes for lock file
2020-11-28 15:14:56 +11:00
David Bomba
3d1aeac621 Fixes for lock file 2020-11-28 15:14:28 +11:00
Benjamin Beganović
4284870c4e Merge remote-tracking branch 'upstream/v5-develop' into v5-paypal-refactor 2020-11-28 01:01:18 +01:00
David Bomba
fd0f57a771
Merge pull request #4383 from turbo124/v5-stable
version bump
2020-11-28 10:36:33 +11:00
David Bomba
01e97f89c1 version bump 2020-11-28 10:36:11 +11:00
David Bomba
9e32bff2f3
Merge pull request #4382 from turbo124/v5-stable
Version bump
2020-11-28 10:29:36 +11:00
David Bomba
2df178ca25 Version bump 2020-11-28 10:29:10 +11:00