Hillel Coren
|
5389a5aa87
|
Merge branch 'Self-updater' of https://github.com/codedge/invoiceninja into codedge-Self-updater
Conflicts:
resources/lang/en/texts.php
|
2016-08-21 19:39:31 +03:00 |
|
Hillel Coren
|
6c92a6a94a
|
Enabled adding expense to open invoice
|
2016-08-21 18:25:35 +03:00 |
|
Holger Lösken
|
d2d64d2a63
|
Use self-updater package, initial commit
|
2016-08-19 13:13:55 +00:00 |
|
Hillel Coren
|
9bb64d4984
|
Add help message to explain limited gateways
|
2016-08-19 16:11:00 +03:00 |
|
Hillel Coren
|
b35c44b1e8
|
Fixes for JSON import
|
2016-08-15 21:37:47 +03:00 |
|
Hillel Coren
|
c01e42ac87
|
Added option to include line item taxes in line total
|
2016-08-15 18:08:06 +03:00 |
|
Hillel Coren
|
bfae5018e0
|
Fixes for the bot
|
2016-08-14 12:30:16 +03:00 |
|
Hillel Coren
|
ce2c71843c
|
Working on the bot
|
2016-08-13 22:19:37 +03:00 |
|
Hillel Coren
|
73574fbd14
|
Workign on the bot
|
2016-08-10 20:48:24 +03:00 |
|
Hillel Coren
|
0a7381294e
|
Working on the bot
|
2016-08-10 17:04:17 +03:00 |
|
Hillel Coren
|
d374843e50
|
Working on the bot
|
2016-08-09 23:06:24 +03:00 |
|
Hillel Coren
|
f8fda5f241
|
Working on the bot
|
2016-08-07 22:42:32 +03:00 |
|
Hillel Coren
|
b8a124dc0f
|
Working on our bot
|
2016-08-07 09:10:36 +03:00 |
|
Hillel Coren
|
f1a278e4ff
|
Working on our bot
|
2016-08-06 20:54:56 +03:00 |
|
Hillel Coren
|
7f3bd44d9a
|
Working on bots
|
2016-08-04 20:01:30 +03:00 |
|
Hillel Coren
|
293e7cbb61
|
Support saving credit card and paypal tokens for the same client
|
2016-08-02 13:40:20 +03:00 |
|
Hillel Coren
|
af78a3dd2d
|
Test Stripe credentials when adding gateway
|
2016-07-29 14:58:26 +03:00 |
|
Hillel Coren
|
028743e440
|
Improve warning messages when sending emails
|
2016-07-28 23:08:51 +03:00 |
|
Hillel Coren
|
22c920701c
|
Implemented sweetalert
|
2016-07-28 19:55:23 +03:00 |
|
Hillel Coren
|
4795f33067
|
Adding back fixes
|
2016-07-21 16:04:23 +03:00 |
|
Hillel Coren
|
498578cefc
|
Rollback to 2.6.5
|
2016-07-21 15:35:23 +03:00 |
|
Hillel Coren
|
d13e95399e
|
Revert "Translate error template"
|
2016-07-21 15:30:11 +03:00 |
|
Holger Lösken
|
97d6fcbf06
|
Translate error template
- Fix #1001
- Translate error contact text
|
2016-07-21 12:52:33 +02:00 |
|
Hillel Coren
|
7bb8f0ca4a
|
Merge https://github.com/codedge/invoiceninja into codedge-#904-Unify-js-no-public-js
Conflicts:
app/Http/Controllers/AccountController.php
resources/lang/en/texts.php
|
2016-07-20 10:49:08 +03:00 |
|
Hillel Coren
|
bd70b4596c
|
Add batch limits for hosted imports
|
2016-07-19 18:57:01 +03:00 |
|
Hillel Coren
|
618ed868e6
|
Show WePay's fees
|
2016-07-18 23:10:04 +03:00 |
|
Hillel Coren
|
078964d297
|
Improve offsite payment checks
|
2016-07-18 21:45:32 +03:00 |
|
Hillel Coren
|
1e568dc408
|
Fixes for WePay
|
2016-07-16 23:51:18 +03:00 |
|
Hillel Coren
|
86c08f3af5
|
Working on new pricing
|
2016-07-15 11:24:08 +03:00 |
|
Hillel Coren
|
09e06703ea
|
Added dwolla to text files
|
2016-07-13 21:49:10 +03:00 |
|
Hillel Coren
|
f47b6dc5ac
|
Added dwolla to text files
|
2016-07-13 21:11:26 +03:00 |
|
Hillel Coren
|
fa9b0bf78b
|
Working on buy now buttons
|
2016-07-13 12:03:39 +03:00 |
|
Hillel Coren
|
401851e212
|
Working on buy now buttons
|
2016-07-12 23:46:41 +03:00 |
|
Hillel Coren
|
986487b4c9
|
Working on new hosted pricing
|
2016-07-11 20:08:43 +03:00 |
|
Hillel Coren
|
6756fde908
|
Merge pull request #955 from codedge/#583-Add-Task-creating-editing-to-activity-stream
#583 add task creating editing to activity stream
|
2016-07-10 12:42:29 +03:00 |
|
Hillel Coren
|
fd2155d10a
|
Merge pull request #950 from codedge/#868-Configurable-start-of-week
Adding configuration for first day of the week
|
2016-07-10 12:42:12 +03:00 |
|
Hillel Coren
|
386c606558
|
Added support for taxes to expenses
|
2016-07-07 19:54:06 +03:00 |
|
Hillel Coren
|
cd9aae1e22
|
Working on expense categories
|
2016-07-06 21:35:16 +03:00 |
|
Hillel Coren
|
21a91ff0e1
|
Added expense category
|
2016-07-05 21:49:47 +03:00 |
|
Holger Lösken
|
d1dc1a7e5b
|
Added tasks to activity on dashboard
- Fixes #583 and resolves #583
- Creating and updating tasks creates an activity now
- Each has its own event
- The activity is shown on the dashboard
|
2016-07-05 16:31:57 +00:00 |
|
Hillel Coren
|
979690d116
|
Improved options when exporting data
|
2016-07-05 16:09:52 +03:00 |
|
Hillel Coren
|
fdb2aefc66
|
Improved help for 2checkout.com
|
2016-07-04 22:26:41 +03:00 |
|
Hillel Coren
|
b5f606df47
|
Added and as email template variables
|
2016-07-04 21:47:05 +03:00 |
|
Holger Lösken
|
fcc8cac7b5
|
Adding configuration for first day of the week
- Fix #868 and resolves #868
- The first day of the week can be configured in localization settings,
which affects the Bootstrap date picker
|
2016-07-04 16:20:22 +02:00 |
|
Hillel Coren
|
6f1776004a
|
Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
|
2016-07-04 09:40:06 +03:00 |
|
Holger Lösken
|
a114f60127
|
Adding translation support for languages
- Languages can now be translated via texts.php
|
2016-07-04 01:02:38 +02:00 |
|
Hillel Coren
|
dc1bcfbd9e
|
Updates to white label marketing
|
2016-07-03 17:46:41 +03:00 |
|
vagrant
|
3e912db1cb
|
Resolve conflicts
|
2016-07-03 09:34:34 +00:00 |
|
Holger Lösken
|
1aa0110580
|
Return $LANG array for Transifex
|
2016-07-03 09:27:49 +00:00 |
|
Holger Lösken
|
337ed1c719
|
- Fix #426, closes #426
- Moved translations for industries, countries into texts.php
- Removed nested arrays in texts.php
|
2016-07-03 09:26:08 +00:00 |
|
Holger Lösken
|
b13b9a2d7d
|
Fix hardcoded translations for industry, country and payment types
- Fixes #426, resolves #426
|
2016-07-03 09:24:55 +00:00 |
|
Holger Lösken
|
da87f9342d
|
Return $LANG array for Transifex
|
2016-07-03 11:06:34 +02:00 |
|
Holger Lösken
|
96d15ccb2d
|
- Fix #426, closes #426
- Moved translations for industries, countries into texts.php
- Removed nested arrays in texts.php
|
2016-07-02 23:18:13 +02:00 |
|
Holger Lösken
|
fdb8c707e1
|
Fix hardcoded translations for industry, country and payment types
- Fixes #426, resolves #426
|
2016-07-01 23:19:09 +02:00 |
|
Holger Lösken
|
ae78a177b0
|
Fix #562
Make „Manual entry“ translatable
|
2016-06-30 14:38:55 +02:00 |
|
Hillel Coren
|
0449fe2515
|
Minor text/styling fixes
|
2016-06-28 21:22:16 +03:00 |
|
Hillel Coren
|
7c0875841a
|
Fixed autobill message in emails
|
2016-06-26 12:59:42 +03:00 |
|
Hillel Coren
|
dcdfb4f21c
|
Check to prevent duplicate gateways
|
2016-06-22 20:13:45 +03:00 |
|
Hillel Coren
|
e2ddabe95d
|
Minor fixes for payments
|
2016-06-22 12:22:38 +03:00 |
|
Hillel Coren
|
5ff69c6f29
|
Payments refactor
|
2016-06-20 17:14:43 +03:00 |
|
Hillel Coren
|
ffa67cef3b
|
Refactoring payments code...
|
2016-06-09 10:56:22 +03:00 |
|
Hillel Coren
|
d5cb8b3abe
|
Minor fixes
|
2016-06-05 22:55:23 +03:00 |
|
Hillel Coren
|
5c7a15ff83
|
Minor fixes
|
2016-06-05 19:10:15 +03:00 |
|
Hillel Coren
|
a7f92d0726
|
Merge pull request #901 from joshuadwire/wepay-integration
Wepay integration
|
2016-06-03 11:20:31 +03:00 |
|
Hillel Coren
|
0acf4ff1fc
|
Support importing JSON file
|
2016-06-02 22:03:59 +03:00 |
|
Joshua Dwire
|
49d47bb9e3
|
Merge remote-tracking branch 'upstream/develop' into wepay-integration
|
2016-06-01 16:46:03 -04:00 |
|
Hillel Coren
|
42ac9507e5
|
Enabled importing products
|
2016-05-31 23:15:55 +03:00 |
|
Hillel Coren
|
0e75ddb5e6
|
Added setting to hide second tax rate
|
2016-05-29 12:26:02 +03:00 |
|
Hillel Coren
|
c55d6510bf
|
Show permissions if not enabled
|
2016-05-26 16:04:53 +03:00 |
|
Joshua Dwire
|
acbc0e887f
|
Support adding WePay ACH from payment page
|
2016-05-25 16:54:49 -04:00 |
|
Joshua Dwire
|
4dded687b5
|
Tweak payment settings page
|
2016-05-25 15:55:23 -04:00 |
|
Joshua Dwire
|
c9f00274b1
|
Support storing WePay bank tokens
|
2016-05-25 15:04:58 -04:00 |
|
Joshua Dwire
|
6ddbbbc64d
|
Merge remote-tracking branch 'upstream/develop' into wepay-integration
|
2016-05-25 11:14:14 -04:00 |
|
Joshua Dwire
|
7d55ab033b
|
Merge branch 'wepay-ach' into wepay-integration
|
2016-05-25 11:11:47 -04:00 |
|
Joshua Dwire
|
d19a3715f9
|
Warn user when editing an ACH auto bill invoice
|
2016-05-25 11:07:20 -04:00 |
|
Joshua Dwire
|
c701c5563c
|
Add payment settings block
|
2016-05-25 10:36:40 -04:00 |
|
Hillel Coren
|
ba561c7d0d
|
Prevent clicking save while document is still uploading
|
2016-05-25 14:42:20 +03:00 |
|
Joshua Dwire
|
9d4b42a514
|
Mention in the invoice notification that the invoice will be auto billed on the due date
|
2016-05-24 23:14:19 -04:00 |
|
Joshua Dwire
|
724f5738aa
|
Add contact_key
|
2016-05-24 17:02:28 -04:00 |
|
Hillel Coren
|
f19058e35e
|
Improved message after update
|
2016-05-23 09:18:39 +03:00 |
|
Hillel Coren
|
cdfaae2700
|
Minor change to client portal settings page
|
2016-05-22 20:31:26 +03:00 |
|
Hillel Coren
|
ac09d86f68
|
Show warning when changing recurring invoice start date
|
2016-05-22 19:51:09 +03:00 |
|
Hillel Coren
|
6caf1ff30d
|
Minor fixes
|
2016-05-19 09:47:57 +03:00 |
|
Joshua Dwire
|
4f3bb7eeb4
|
Merge remote-tracking branch 'upstream/develop' into wepay-integration
|
2016-05-17 15:07:53 -04:00 |
|
Joshua Dwire
|
e905b29510
|
Partial WePay ACH support
|
2016-05-17 14:09:39 -04:00 |
|
Joshua Dwire
|
43fade2339
|
Support app fees and Canadian users
|
2016-05-17 11:32:17 -04:00 |
|
Hillel Coren
|
a82437b2bc
|
Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
Conflicts:
app/Http/routes.php
resources/lang/en/texts.php
|
2016-05-16 11:34:00 +03:00 |
|
Hillel Coren
|
3df6ad2529
|
Changes to support transifex.com
|
2016-05-15 23:16:08 +03:00 |
|
Hillel Coren
|
b067697b1c
|
Support manually importing OFX files
|
2016-05-15 13:58:11 +03:00 |
|
Hillel Coren
|
52fe1b0dec
|
Added missing text value
|
2016-05-15 10:06:14 +03:00 |
|
Joshua Dwire
|
947cb4a6f7
|
Better WePay configuration support
|
2016-05-14 17:23:20 -04:00 |
|
Hillel Coren
|
df3a103825
|
Added missing report field
|
2016-05-13 15:26:22 +03:00 |
|
Joshua Dwire
|
ba000546c4
|
Better WePay switching
|
2016-05-12 11:09:07 -04:00 |
|
Joshua Dwire
|
88c9fc1ac1
|
Add WePay configuration UI
|
2016-05-11 22:55:37 -04:00 |
|
Joshua Dwire
|
fc029a62e1
|
Merge remote-tracking branch 'upstream/develop' into payments-changes
|
2016-05-10 22:32:28 -04:00 |
|
Joshua Dwire
|
88ec714cd5
|
Store Stripe card summary locally
|
2016-05-10 18:46:32 -04:00 |
|
Hillel Coren
|
ee579f91f3
|
Added plan help text
|
2016-05-10 21:17:46 +03:00 |
|
Joshua Dwire
|
41f4c98e08
|
Merge remote-tracking branch 'upstream/develop' into payments-changes
|
2016-05-10 10:25:42 -04:00 |
|
Joshua Dwire
|
20f6f32a06
|
Update UI for configuring auto bill
|
2016-05-09 16:29:02 -04:00 |
|
Hillel Coren
|
f2e651d53f
|
Added message if adding users insn't supported
|
2016-05-08 12:59:32 +03:00 |
|
Joshua Dwire
|
0fc44962d4
|
Add Braintree/PayPal support
|
2016-05-06 22:33:03 -04:00 |
|
Joshua Dwire
|
cf98c37f40
|
Better Braintree support
|
2016-05-06 17:05:42 -04:00 |
|
Joshua Dwire
|
9a64db3234
|
Allow client to choose auto bill settings
|
2016-05-06 13:26:37 -04:00 |
|
Joshua Dwire
|
70b9c9bba7
|
Require authorization for ACH
|
2016-05-06 11:21:06 -04:00 |
|
Joshua Dwire
|
77bd6f7bc5
|
Restyle add bank account page
|
2016-05-06 10:50:50 -04:00 |
|
Hillel Coren
|
47cd8a0a33
|
Added preview for email templates
|
2016-05-05 19:43:44 +03:00 |
|
Hillel Coren
|
c79d9fe24c
|
Added preview for email templates
|
2016-05-05 17:46:22 +03:00 |
|
Hillel Coren
|
7744c6c41c
|
White label changes
|
2016-05-05 09:58:14 +03:00 |
|
Hillel Coren
|
ef2bc3d811
|
White label changes
|
2016-05-05 09:52:59 +03:00 |
|
Joshua Dwire
|
d78b874838
|
Add Plaid support
|
2016-04-30 22:45:51 -04:00 |
|
Joshua Dwire
|
ed1f2b6044
|
Handle failed payments
|
2016-04-30 17:54:56 -04:00 |
|
Joshua Dwire
|
c536bd8569
|
Add basic ACH support
|
2016-04-29 17:50:21 -04:00 |
|
Joshua Dwire
|
e5fb354643
|
Support configuring Stripe for ACH and Plaid
|
2016-04-28 16:38:01 -04:00 |
|
Joshua Dwire
|
1cb2b9dc25
|
Use existing PaymentType instead of CardType
|
2016-04-27 22:13:51 -04:00 |
|
Joshua Dwire
|
fe2a1fe66a
|
Add Braintree support
|
2016-04-26 19:59:52 -04:00 |
|
Hillel Coren
|
996b6d4ce6
|
Fixed typo in text files
|
2016-04-26 21:11:41 +03:00 |
|
Joshua Dwire
|
6e3b53f3cb
|
Make expiration table wrap with expiration date
|
2016-04-23 22:31:39 -04:00 |
|
Joshua Dwire
|
42c1f537bc
|
Store/display credit card type, expiration and last 4 digits
|
2016-04-23 22:10:51 -04:00 |
|
Joshua Dwire
|
b8170f0324
|
Support refunds from the admin UI
|
2016-04-23 16:40:19 -04:00 |
|
Hillel Coren
|
0dcee794b5
|
Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
Conflicts:
resources/lang/en/texts.php
resources/views/accounts/invoice_design.blade.php
resources/views/invoices/edit.blade.php
|
2016-04-19 22:48:03 +03:00 |
|
Hillel Coren
|
32d5a25f61
|
Enabled specifying invoice padding
|
2016-04-19 14:26:42 +03:00 |
|
Hillel Coren
|
cd52faa3bf
|
Automatically disable live preview when using a large font
|
2016-04-19 14:12:02 +03:00 |
|
Hillel Coren
|
9f5fe33059
|
Added page size and live preview settings
|
2016-04-19 10:51:57 +03:00 |
|
Joshua Dwire
|
22f65e8108
|
Finalize multi-plan support
* Allow admins to change plan
* Check features instead of plans
* Support linking/unlinking accounts
* Support creating/deleting accounts
|
2016-04-18 22:35:18 -04:00 |
|
Joshua Dwire
|
63b2c2c6b1
|
More intuitive account management page
|
2016-04-16 22:28:11 -04:00 |
|
Joshua Dwire
|
9b1bfef698
|
Add support for multiple plans/terms
|
2016-04-16 18:34:39 -04:00 |
|
Joshua Dwire
|
51cd82cba8
|
Move cancel account to new account management page
|
2016-04-16 10:58:53 -04:00 |
|
Hillel Coren
|
9b8b150766
|
Implemented enable_client_portal_dashboard
|
2016-04-13 22:08:41 +03:00 |
|
Hillel Coren
|
f91f32323f
|
Reworking taxes
|
2016-03-29 17:30:28 +03:00 |
|
Joshua Dwire
|
bb6e0b5186
|
Make dropzone translatable
|
2016-03-24 18:45:00 -04:00 |
|
Joshua Dwire
|
5e62d7d296
|
Allow documents to be attached to expenses
|
2016-03-24 18:15:52 -04:00 |
|
Joshua Dwire
|
cd8290946e
|
Add client portal documents tab
|
2016-03-24 11:58:30 -04:00 |
|
Joshua Dwire
|
1c5c45a1e1
|
Improved handling of various document types; better documents zip
|
2016-03-24 11:33:28 -04:00 |
|
Joshua Dwire
|
e6056104bd
|
Display documents and zip download on client invoice page
|
2016-03-23 22:41:19 -04:00 |
|
Joshua Dwire
|
2a7e8cb4b7
|
Add documents placeholder for emails
|
2016-03-23 21:25:33 -04:00 |
|
Joshua Dwire
|
f7d8f819b6
|
Add option to attach documents to invoice email
|
2016-03-23 19:20:08 -04:00 |
|
Joshua Dwire
|
942f543bbb
|
Display documents in invoice PDF
|
2016-03-23 18:40:42 -04:00 |
|
Joshua Dwire
|
88808d44bf
|
Add support for invoice attachments
|
2016-03-22 22:23:45 -04:00 |
|
Hillel Coren
|
5c1e9900d3
|
Fix for #779
|
2016-03-22 16:37:14 +02:00 |
|
Hillel Coren
|
ddbc254d4b
|
Add link to payments from invoice page
|
2016-03-22 15:17:46 +02:00 |
|
Hillel Coren
|
c9e0119bc2
|
Added permissions settings help
|
2016-03-21 22:00:59 +02:00 |
|
Hillel Coren
|
09414ca3f5
|
Fix for #776 Deleting expense vendor results in error
|
2016-03-19 23:30:23 +02:00 |
|
Hillel Coren
|
c3c7f25b32
|
Clarified partial labels
|
2016-03-18 14:34:46 +02:00 |
|
Hillel Coren
|
9b9e99ee78
|
Added SagePay referral
|
2016-03-17 15:28:28 +02:00 |
|
Hillel Coren
|
9a29efbc6f
|
Merge pull request #771 from joshuadwire/user-permissions
User permissions
|
2016-03-17 09:54:36 +02:00 |
|
Joshua Dwire
|
90e1f6695c
|
Improve user permission support
* Hide links based on permissions
* Restrict editing/creating within other UI
|
2016-03-15 22:07:11 -04:00 |
|
Joshua Dwire
|
0148d06205
|
Add user permission support
|
2016-03-15 19:08:00 -04:00 |
|
Hillel Coren
|
e0499ccf67
|
Show 'Create first invoice' for sample message
|
2016-03-15 22:24:09 +02:00 |
|
Hillel Coren
|
4e27b52618
|
Update import error message
|
2016-03-15 17:35:36 +02:00 |
|
Hillel Coren
|
f32a497d0d
|
Fix for tax rates test
|
2016-03-15 16:55:23 +02:00 |
|