Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 15:13:29 +01:00
Code Issues Releases Activity
9,416 Commits 9 Branches 923 Tags 2 GiB
9648764acb
Commit Graph

9416 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hillel Coren
bb3603acd3 Rebuild JS files 2020-03-29 09:39:57 +03:00
Hillel Coren
ca6e981f29 Fix client redirect 2020-03-29 09:28:30 +03:00
Hillel Coren
5a33c42278 Fix typo 2020-03-29 09:27:13 +03:00
Hillel Coren
fceb82ea51 Clarify credit error 2020-03-29 09:25:52 +03:00
Hillel Coren
43f38d9d84 Update readme 2020-03-29 07:43:45 +03:00
Hillel Coren
6bb4bc3e69 White label invoice fix 2020-03-29 07:32:27 +03:00
Hillel Coren
927cd5a9a6 Fix lang file 2020-03-29 07:30:42 +03:00
Hillel Coren
be00050615 Clarify Stripe help 2020-03-29 07:24:39 +03:00
Hillel Coren
3308df7fff Clarify help text 2020-03-29 07:16:07 +03:00
Hillel Coren
f157b76b5f Added ETB currency 2020-03-29 06:47:13 +03:00
Hillel Coren
70efb7a7f2 Clarify help text 2020-03-29 06:31:40 +03:00
Hillel Coren
fc26e77c95 Fix typo in texts 2020-03-15 10:11:39 +02:00
Hillel Coren
c3a0c2a465 UI tweaks and hide on hosted 2020-03-12 09:42:31 +02:00
David Bomba
f6fced6b82
Minor fixes for migration (#3484) 2020-03-12 17:25:51 +11:00
Benjamin Beganović
b4f83a5755
Export 'invitations' with invoices (#3479) 
* Export 'invitations' with invoices

* Export 'invitations' with quotes

* Send resource as 3rd parameter
 2020-03-12 07:53:06 +11:00
Benjamin Beganović
9d5c3bd951
[v1] Add check for 0 value (#3473) 
* Add check for 0 value

* David said, this one is better
 2020-03-11 10:06:57 +11:00
Benjamin Beganović
8bb70c7e9a
[V1] Update payment fields for export (#3469) 
* Update export payment fields

* Add currency_id, export
 2020-03-11 08:12:08 +11:00
Benjamin Beganović
3f25b62ab6
[V1] Update 'migrations:export' message (#3470) 
* Update command message

* Export migrations command improvements
 2020-03-11 08:11:31 +11:00
Benjamin Beganović
d9a3b5453a
Make sure user is allowed to migrate (#3468) 2020-03-11 08:08:10 +11:00
Hillel Coren
be96bef3f0
Merge pull request #3448 from maikelreyes/master 
Fix aging fields for statements
 2020-03-07 22:09:41 +02:00
Maikel Reyes
89a243f88c Fin aging fields for statements 2020-03-07 00:14:31 -05:00
David Bomba
9070dfe55b
Export migrations to folder (#3429) 
* Export migrations to folder

* Remove local property
 2020-03-06 07:30:48 +11:00
David Bomba
67044f9dd3
Migration improvements: (#3422) 
- Added option to force the migration
- Cleaned imports
 2020-03-05 07:30:10 +11:00
Benjamin Beganović
bde276ad67
(V1) Improve migration (#3415) 
* Imports improvements:
- Fix sorting
- Fix duplicate imports (Cannot use App\Http\Controllers\BaseController as BaseController because the name is already in use)

* Wrap up, sending migration file:
- Removed 'enable_invoice_quantity'
 2020-03-04 09:44:30 +11:00
David Bomba
65b30189b3
Bump symfony/http-foundation from 3.4.20 to 3.4.36 (#3404) 
Bumps [symfony/http-foundation](https://github.com/symfony/http-foundation) from 3.4.20 to 3.4.36.
- [Release notes](https://github.com/symfony/http-foundation/releases)
- [Changelog](https://github.com/symfony/http-foundation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-foundation/compare/v3.4.20...v3.4.36)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-03-01 21:14:43 +11:00
David Bomba
78f1df21ae
Bump symfony/dependency-injection from 3.4.6 to 3.4.35 (#3403) 
Bumps [symfony/dependency-injection](https://github.com/symfony/dependency-injection) from 3.4.6 to 3.4.35.
- [Release notes](https://github.com/symfony/dependency-injection/releases)
- [Changelog](https://github.com/symfony/dependency-injection/blob/master/CHANGELOG.md)
- [Commits](https://github.com/symfony/dependency-injection/compare/v3.4.6...v3.4.35)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-03-01 21:14:17 +11:00
Hillel Coren
17cddb902c Merge branch 'master' of github.com:invoiceninja/invoiceninja 2020-03-01 09:57:06 +02:00
Hillel Coren
bf7142ce43 Update lang file 2020-03-01 09:56:56 +02:00
Benjamin Beganović
ff455c8ed9
Exporting migration data via HTTP (v1) (#3364) 
* Migration: Option to select the migration type

* Migration: Logic for redirecting based on steps

* Work for migrations:
- Added authentication view, service
- Account connecting
- Scaffold services
- Companies service
- (wip) Sending data to v2

* Migration: Sending migration file

* Wrap up the migration first stage

* Split company per request / no bundle

Co-authored-by: David Bomba <turbo124@gmail.com>
 2020-02-25 08:17:16 +11:00
David Bomba
8020204c8d
Migrate Company Gateways and Client Tokens (#3369) 
* Working on migrations for Company Gateways and Client Tokens

* Working on exporting company gateways and documents
 2020-02-25 08:16:19 +11:00
Hillel Coren
a500bfb583 Update lang file 2020-02-23 12:38:52 +02:00
Hillel Coren
6365187a1c Merge mobile lang script 2020-02-23 12:36:40 +02:00
Hillel Coren
9db94c9354 Merge mobile lang script 2020-02-23 12:34:36 +02:00
Hillel Coren
c4d2c31e06 Fix for product report 2020-02-23 12:15:33 +02:00
Hillel Coren
1a554ea1e3 Fix for calculate payouts 2020-02-23 12:13:39 +02:00
Hillel Coren
fa5cb690ba Merge branch 'master' of github.com:invoiceninja/invoiceninja 2020-02-23 12:01:50 +02:00
Hillel Coren
cf873bd197 Fix for calculate payouts 2020-02-23 12:01:37 +02:00
Benjamin Beganović
9085a27361
Export 'documents' (#3343) 
* Export 'documents'

* Export 'invoice_id' & 'expense_id' with documents

* Code cleanup
 2020-02-19 07:53:38 +11:00
David Bomba
2a8d2c7f5e additional fixes for Checkout 2020-02-17 06:52:00 +11:00
David Bomba
ac11681073
fixes for checkout.com (#3336) 2020-02-16 17:41:00 +11:00
WillieWookiee
1ab5bc1f6b
Fixing cancel button. (#3309) 
This fix addresses a bug where if you create a quote and then go into the client portal to add a credit card, the cancel button will take you back to the first quote of the client regardless if it is a draft or not. This will now take you back to the previous page.
 2020-02-12 07:53:06 +11:00
Benjamin Beganović
6defaebf34
Export settings with company array (#3264) (#3268) 2020-01-30 14:34:58 +11:00
Hillel Coren
ae8457c588 Fix for postmark logs 2020-01-28 19:53:59 +02:00
Benjamin Beganović
e31ab11364 Export contacts with client array (#3251) 2020-01-28 07:54:54 +11:00
David Bomba
24daf955d8
Fix taxes (#3246) 2020-01-25 14:19:22 +11:00
David Bomba
c2dfc3055c Remove last_login from migration array of clients 2020-01-24 13:17:51 +11:00
Benjamin Beganović
b67b97430c Export data for the migration (master) (#3239) 
* Scaffold migration controller & steps

* - Basic controller scaffold
- Intro step
- Downloading data

* Import step for the v2

* Export file using account_key property

* Fix button displaying

* Client export mappings

* Company export mappings

* Add withTrashed() for clients

* Export users mappings

* Export invoices mappings

* Export company properties as array

* add withTrashed() for invoices

* Downloading the json file

* Fix 'account_id' for company export
- Code cleanup & leftovers

* Creating zip for logo & storing json as file (wip)

* Zipping & sending migration files (wip)

* Exporting & mappings for quotes

* Re-enable headers for downloading

* Mappings for tax rates

* Mappings for the products

* Fix formattings & php doc messages

* Bring back headers for downloading

* Export 'company_id', 'user_id' with clients

* Export 'id' with users resource

* Remove unused parameter

* Export mappings for payments

* Export 'line_items' with invoices

* Export credits & export client id

* Export 'credits' within main JSON

* Mappings for line_items

* Fix 'is_amount_discount' for invoice export

* Exporting migration file as .zip archive

* Improve settings card for migration

* Removed duplicated keys in texts.php for en

* Fix formatting in en/texts.php

* Integrate the migration part with rest of UI

* Export company as object, not array

* Clean up

* Fixes for V1

* Apply formatting

* Remove comments
- Added 'ext-zip' in composer.json
- Fixed $credits transform

* Remove unused params

Co-authored-by: David Bomba <turbo124@gmail.com>
 2020-01-24 07:34:30 +11:00
trevDev()
0dfaf043bf allow scrolling in time-tracker task form (#3211) 2020-01-15 21:24:28 +10:00
Hillel Coren
6b4d8fba4a Update check data 2019-12-22 10:16:22 +02:00
Hillel Coren
e702f24937 Merge branch 'master' of github.com:invoiceninja/invoiceninja 2019-12-22 08:54:22 +02:00