1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-09 20:52:56 +01:00
Commit Graph

3133 Commits

Author SHA1 Message Date
=
4bc41fbf8e Fixes for lang file 2021-02-01 18:37:18 +11:00
David Bomba
239c3e5d8d
Merge branch 'master' into master 2021-02-01 09:04:57 +11:00
David Bomba
b99c40714f Update lang files 2021-02-01 09:02:33 +11:00
Hillel Coren
a3abff8766 Update lang file 2021-01-31 08:41:36 +02:00
Hillel Coren
3cc3548f69 Correct typo 2021-01-21 07:59:30 +02:00
Hillel Coren
f7d1d95e3a Update lang file 2021-01-20 20:49:30 +02:00
Hillel Coren
dbbd84b222 Update lang files 2021-01-06 08:36:44 +02:00
Hillel Coren
4234e50408 Update version 2021-01-06 08:32:09 +02:00
Benjamin Beganović
c469ef6671 force toggle parent company 2020-12-29 12:37:40 +01:00
Hillel Coren
b26399713d Update version 2020-12-29 08:07:24 +02:00
Benjamin Beganović
40bb6ad9ab
Merge branch 'master' into v4-support-for-api-key 2020-12-14 10:12:01 +01:00
Hillel Coren
39a58f909e Update lang files 2020-12-10 21:33:43 +02:00
Benjamin Beganović
aa9af574b6 Add support for X-Api-Token: 2020-12-10 15:04:59 +01:00
David Bomba
53e40a4e6a Fixes for purging existing company 2020-11-23 13:07:32 +11:00
Benjamin Beganović
716b818a41 Fix issue with listing companies in v4
- Endpoint typo fix
2020-11-19 12:29:49 +01:00
David Bomba
8351d5a9fb
Merge branch 'master' into v4-migration-fixes 2020-11-14 17:02:58 +11:00
Hillel Coren
a42597098f Update lang file 2020-11-12 20:26:17 +02:00
Benjamin Beganović
d24d2e4b93 Support multiple migrations at once 2020-11-10 16:20:02 +01:00
Benjamin Beganović
c4b147d7c8 Fix absolute route /migration/start 2020-11-10 14:29:38 +01:00
Hillel Coren
3190e5ac4d Update language files 2020-11-01 17:49:26 +02:00
Hillel Coren
08efcc0342 Minor fixes 2020-11-01 17:34:29 +02:00
Hillel Coren
6c54a7fa2b Update lang file 2020-11-01 11:58:11 +02:00
Hillel Coren
0962e0e301 Update lang file 2020-10-15 22:31:37 +03:00
Benjamin Beganović
ac49832ffd Cross account migration message update 2020-10-05 10:29:11 +02:00
Benjamin Beganović
0621c215e7 Fix migration urls 2020-10-05 09:50:32 +02:00
Hillel Coren
bac27c8609 Update lang file 2020-08-30 07:03:47 +03:00
Gregory Brown
2e1a49a0cf
Update style on Kanban column to allow vert scroll
Update the Kanban Column to allow for vertical scroll with the screen. This makes it easier for your to scroll horizontally when you have a very big list.
It's a quick workaround that fixes user experience for users with small screens and big lists.
2020-08-05 09:22:19 -03:00
Hillel Coren
40cca935dd Update languages 2020-06-28 14:23:18 +03:00
Hillel Coren
bac1ed5e0c Update lang file 2020-06-25 18:50:32 +03:00
Hillel Coren
286a1a608f Merge branch 'master' of github.com:invoiceninja/invoiceninja 2020-06-25 18:45:23 +03:00
Hillel Coren
f45f1895a8 Update lang files 2020-06-25 18:40:16 +03:00
Sibin
382593a8a2
handle id==0 and cancellation of confirm dialog box
handle id==0 and cancellation of confirm dialog box
2020-06-15 23:56:08 +05:30
David Bomba
1f1acaa500 Fixes for oauth images 2020-06-01 07:42:36 +10:00
Benjamin Beganović
59ad5724d5
Change (#3731) 2020-05-22 07:23:48 +10:00
Dominik "kuberninski" Kaminski
e16900ef11
Fix wrong tax calculation
Tax calculation is wrong in pdf when 'inclusive_taxes' is enabled. This fixes #3668
2020-05-02 17:31:19 +02:00
Benjamin Beganović
56a9bc2bdd
[v1] Include validation erorrs for migration (#3660)
* Add

* Fix
2020-04-29 22:33:55 +10:00
Benjamin Beganović
d36cb2fafa
Refactor steps controller (#3627) 2020-04-14 08:20:38 +10:00
Benjamin Beganović
602a15f648
Export 'company_key' with migrations (#3600)
- Removed 'Hosted' option for migrating
- Passing companyKey property when sending request
2020-04-08 06:43:20 +10:00
Benjamin Beganović
0c7620a381
Catching possible account errors (#3596)
Co-authored-by: David Bomba <turbo124@gmail.com>
2020-04-07 07:23:57 +10:00
Benjamin Beganović
4323968240
Prevent cross site migration (#3594)
- php-cs-fixer applied
- Added new 'cross_migration_message'
- errors.blade.php - unescape characters
2020-04-07 07:21:46 +10:00
Hillel Coren
7ee7146d00 Update lang files 2020-04-02 08:49:24 +03:00
Hillel Coren
30b5b33d0d Update languages 2020-03-31 13:00:02 +03:00
Hillel Coren
bb3603acd3 Rebuild JS files 2020-03-29 09:39:57 +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
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
Benjamin Beganović
d9a3b5453a
Make sure user is allowed to migrate (#3468) 2020-03-11 08:08:10 +11:00
Maikel Reyes
89a243f88c Fin aging fields for statements 2020-03-07 00:14:31 -05: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
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
Hillel Coren
a500bfb583 Update lang file 2020-02-23 12:38:52 +02: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ć
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
202d644d53 Update lang files 2019-11-04 11:01:18 +02:00
Hillel Coren
6ebc492454 Update lang files 2019-10-27 11:53:22 +02:00
Hillel Coren
e763a2b233 Update lang files 2019-10-06 12:25:40 +03:00
Hillel Coren
29ed0dd94b Bug fixes 2019-09-29 12:28:34 +03:00
Hillel Coren
fbb5826178 Duplicate payments 2019-09-29 12:02:30 +03:00
Joshua Dwire
f222390ce8 Upgrade to Laravel 5.5 and PHP 7.3 2019-09-12 19:30:10 -04:00
Hillel Coren
34600446d9 Update lang files 2019-08-29 13:18:02 +03:00
Hillel Coren
c1fa41ee30 Update lang file 2019-08-20 22:05:14 +03:00
Hillel Coren
f2416b3b91 Update lang files 2019-07-21 09:52:42 +03:00
Hillel Coren
5b76c0a2d1 Make 'email history' easier to find 2019-07-21 09:19:39 +03:00
Francisco Ferreira
5f998b0ea8 Fixes recurring invoices end date parsing (port of #2905 to master) (#2906)
* Invoice edit view: fix date parsing

View gets the date already formatted and Carbon isn't always able to parse that format automatically, so convert it back to SQL format

* RecurringInvoiceDatatable: fix status label
2019-07-18 16:26:59 +10:00
Francisco Ferreira
b0e680ee5c Stripe improvements (port #2863 to master) (#2903)
* View credit card: send more billing data to Stripe when available

As commit 8e8414ab49 shows, this commit had more code that was wrongly commited in ff064367d6 by another author

* Stripe: fill payment card details
2019-07-18 16:26:08 +10:00
Hillel Coren
6a41952552
Merge pull request #2898 from joshuadwire/master
Merge Stripe 3D Secure into master
2019-07-13 22:19:50 +03:00
Joshua Dwire
ff064367d6 Support Stripe 3D secure 2019-07-09 17:16:20 -04:00
Hillel Coren
e3dcf4aa47 Fix for tests 2019-05-26 21:57:43 +03:00
Hillel Coren
099e61343d Update lang files 2019-05-26 21:22:23 +03:00
Hillel Coren
1a5f89a905 Fix overlapping text 2019-05-26 18:40:08 +03:00
Hillel Coren
6c5af5c593 Fix recurring invoice status label 2019-05-26 18:31:28 +03:00
Hillel Coren
14684c8ba7 Add currencies 2019-05-22 14:41:09 +03:00
Hillel Coren
a1d781c435 Fix endless reminder translation 2019-04-17 18:18:19 +03:00
kilian
5f576a8852 Fix Typo: Speciy -> Specify 2019-03-14 11:12:38 +01:00
Hillel Coren
ecaf16f9bd Fix placholder translation 2019-02-28 15:07:40 +02:00
Hillel Coren
1a6e940888 Update language files 2019-02-28 09:45:38 +02:00
Hillel Coren
4426be8303 Add currencies 2019-02-28 09:39:07 +02:00
Hillel Coren
6c1bf7534a Hide export PDF option 2019-02-28 09:26:17 +02:00
Hillel Coren
3e8565bd70 Added lang strings 2019-02-22 09:04:22 +02:00
Hillel Coren
31a0641943 Update language files 2019-02-19 18:00:49 +02:00
Hillel Coren
6fddd3a815 Added BOB currency 2019-02-19 12:15:34 +02:00
Hillel Coren
fa45a02134 Add currencies 2019-02-19 11:47:29 +02:00
Hillel Coren
02b78055d4 Bug fixes 2019-02-18 16:08:16 +02:00
Hillel Coren
16cc898e6a Bug fixes 2019-02-18 13:05:00 +02:00
Hillel Coren
08be751aa4 Hide report export to PDF option 2019-02-18 12:02:56 +02:00
Hillel Coren
cd8b7649a1 Fixes for mobile app 2019-02-17 13:52:56 +02:00
David Bomba
ad973919ad
Fix for Google Maps (#2651) 2019-02-03 11:52:02 +11:00
David Bomba
aefe133ba0
fix permissions (#2637) 2019-01-30 22:25:37 +11:00
David Bomba
0fc66b0f02 Rebase to latest version of v4.5.9 2019-01-30 22:12:41 +11:00