Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Code Issues Releases Activity
5,411 Commits 7 Branches 916 Tags 2 GiB
801b80c767
Commit Graph

733 Commits

Author SHA1 Message Date
Joshua Dwire
0fc2a4d323 Merge remote-tracking branch 'upstream/develop' into 2016-09-payments-changes 2016-09-15 11:40:53 -04:00
Hillel Coren
e743af4d24 Merged #1062 2016-09-15 13:41:09 +03:00
Hillel Coren
840ceb6551 Working on sidebar 2016-09-14 22:31:34 +03:00
Hillel Coren
0439338750 Updated sidebar color 2016-09-14 21:47:57 +03:00
Hillel Coren
0b5ddefdf0 Updated sidebar color 2016-09-14 21:43:56 +03:00
Joshua Dwire
6d8e1de2c9 Rebuild 2016-09-14 14:35:25 -04:00
Joshua Dwire
989b514788 Merge remote-tracking branch 'upstream/develop' into 2016-09-payments-changes 2016-09-14 14:35:03 -04:00
Hillel Coren
ce3a510037 Working on the dashboard 2016-09-11 17:30:23 +03:00
Joshua Dwire
620e93084f Allow admin to set min/max amount for each payment type 2016-09-05 18:16:56 -04:00
Hillel Coren
f49827d4ad Tweaking UI colors 2016-09-05 22:18:35 +03:00
Hillel Coren
0f5065336a Working on invoice fields 2016-09-05 17:44:01 +03:00
Hillel Coren
d14cf5f9ed Working on invoice fields 2016-09-05 15:28:59 +03:00
Hillel Coren
08590a4b6f Working on invoice fields 2016-09-05 08:10:39 +03:00
Hillel Coren
188486641a Working on design 2016-09-02 17:53:16 +03:00
Hillel Coren
27ee5edd8a Working on history sidebar 2016-09-01 18:57:04 +03:00
Hillel Coren
e535750127 Working on history sidebar 2016-09-01 18:52:26 +03:00
Hillel Coren
d55cdd7619 Working on sidebar 2016-08-23 23:20:03 +03:00
Hillel Coren
f021ee11fa Working on nav sidebar 2016-08-23 20:28:45 +03:00
Hillel Coren
b2767c69af Working on sidebar navigation 2016-08-23 13:42:17 +03:00
Hillel Coren
0cfbecb576 Fix for second custom line item field 2016-08-22 17:21:20 +03:00
Holger Lösken
1a6306f63b Pull CSS & JS sources from resources directory 
- Revert custom config of Elixir to work as default
- Moved unminified(original) files to resources directory
- Still not everything cleaned up, but it's a start.. ;)
 2016-08-17 08:34:12 +00:00
Holger Lösken
2d59747bb0 Remove builds folder from public 
- The folder is not in use
- It's not the default Laravel public/build folder, thus can be removed
 2016-08-15 22:55:23 +02:00
Hillel Coren
c5eed8f902 Host google fonts locally 2016-08-15 22:07:41 +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
2ebd40f46e Added activities to API dashboard data 2016-08-15 16:43:26 +03:00
Holger Lösken
3e3c319d79 Fix #639 
- Image dimensions for images on dashboard
- Image dimensions for IN logo
- No stretching, use margin instead of padding
- Optimized PNGs with TinyPNG.com
 2016-08-15 13:17:04 +02:00
Hillel Coren
36959668f6 Merge pull request #1036 from codedge/Set-up-Elixir-with-built.js 
Set up Elixir with built.js
 2016-08-15 13:09:27 +03:00
Hillel Coren
63f9f92536 Added video to the readme 2016-08-15 06:39:15 +03:00
Holger Lösken
63e725695a Set up Elixir with built.js 2016-08-15 00:03:47 +02:00
Hillel Coren
bfae5018e0 Fixes for the bot 2016-08-14 12:30:16 +03:00
Hillel Coren
91ecfc0ea8 Updating built files with latest version of elixir 2016-08-09 17:19:33 +03:00
Hillel Coren
fa88c74d23 Fix for images in Firefox 2016-08-09 15:22:33 +03:00
Holger Lösken
a1adedb2b1 Remove all CSS comments from minified files 2016-08-05 10:50:23 +02:00
Hillel Coren
837fbe3763 Check in built files from gulp --production 2016-08-05 09:55:12 +03:00
Hillel Coren
d64f18ef99 Looking into bots... 2016-08-03 12:40:40 +03:00
Holger Lösken
4b3e068e61 - Set up Elixir with built.css 2016-07-29 16:10:38 +02:00
Hillel Coren
22c920701c Implemented sweetalert 2016-07-28 19:55:23 +03:00
Hillel Coren
7b52776f6e Fixes for browser fav icons 2016-07-27 16:00:32 +03:00
Holger Lösken
62a25b00b3 Set up Elixir with built.public.js 2016-07-26 13:03:40 +00:00
Hillel Coren
f6c23ead60 Fix alignment of logo in footer 2016-07-26 09:55:39 +03:00
Holger Lösken
f362bb663c Set up Elixir with pdf.built.js 2016-07-24 17:43:03 +02:00
Holger Lösken
3d471f7c82 Set up D3.js with Elixir 
- Use latest V3 version (3.5.17)
- V4 not supported by IN / gives errors
- Use Elixir to minify + deploy to public dir
 2016-07-24 13:31:25 +02:00
Holger Lösken
31297be564 Use Chart.js with Elixir 2016-07-24 12:41:56 +02:00
Holger Lösken
a6bc152f1e Remove built.public.js 2016-07-23 23:57:08 +02:00
Holger Lösken
1e1a636ebb Building built.public js via Elixir 
- Fetching bootstrap-combobox via Bower, same version as before
- Minifying result
 2016-07-22 17:48:14 +02:00
Hillel Coren
74b552e132 Show 0% tax rates in line items 2016-07-21 20:21:57 +03:00
Hillel Coren
5fd4bddcd8 Show 0% tax rates in line items 2016-07-21 20:21:27 +03:00
Hillel Coren
8568f68ad2 Show 0% tax rates in line items 2016-07-21 20:18:32 +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
Holger Lösken
089ad1bd18 Making assets minified 2016-07-20 23:12:46 +02:00
Hillel Coren
660ffab0c5 Checked in compiled files 2016-07-20 23:49:02 +03:00
Holger Lösken
f5a5457d2b JS problems after using elixir 
- Added missing JS files
- Added missing images
- Recreated merged files
 2016-07-20 19:38:56 +02:00
Holger Lösken
d36675b15b Use Elixir for asset management 
- Set up Elixir for asset management
- CSS + JS will be handled via Elixir/Gulp in gulpfile.js
- Removed outdates public/js files
 2016-07-20 08:29:45 +00:00
Hillel Coren
d534b5595b Workaround for problem with images in PDF on MS Edge 2016-07-19 15:42:08 +03:00
Hillel Coren
60982deb08 Don't show clients w/o names 2016-07-18 22:53:54 +03:00
Hillel Coren
d2d70eb12a Fix for branding logo with custom designs 2016-07-14 22:58:26 +03:00
Hillel Coren
bf166a1a6f Fix for [Object] problem with certain designs 2016-07-13 21:10:22 +03:00
Hillel Coren
21a91ff0e1 Added expense category 2016-07-05 21:49:47 +03:00
Hillel Coren
c6b0b792b2 Added blank browserconfig.xml file 2016-07-04 12:45:28 +03:00
Hillel Coren
dc1bcfbd9e Updates to white label marketing 2016-07-03 17:46:41 +03:00
Hillel Coren
698ec1e9d4 Fix for markdown when text is a single line 2016-07-03 13:20:46 +03:00
Hillel Coren
6dc0f93534 Fix for #922 2016-07-03 12:18:46 +03:00
Hillel Coren
fec1161434 Fix for invoice footer 2016-06-30 20:53:18 +03:00
Hillel Coren
cbe39f9aaf Fix for elegant design 2016-06-29 22:59:54 +03:00
Hillel Coren
9603439a33 Added additional designs 2016-06-29 22:48:56 +03:00
Hillel Coren
e2ddabe95d Minor fixes for payments 2016-06-22 12:22:38 +03:00
Alexandre Villeneuve
eafdc12fa5 Add style to multiple subtotals labels 2016-06-08 14:00:44 -04:00
Hillel Coren
2f3c309d41 Remove fallback support for dropzone 2016-05-30 11:51:41 +03:00
Hillel Coren
990b9bff28 Improved footer images 2016-05-29 17:20:55 +03:00
Joshua Dwire
947cb4a6f7 Better WePay configuration support 2016-05-14 17:23:20 -04:00
Joshua Dwire
41f4c98e08 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 10:25:42 -04:00
Hillel Coren
12c185ca49 Fix for regex issue with product autocomplete 2016-05-09 20:57:23 +03:00
Hillel Coren
786b6567b6 Hide unit cost if the quantity column is hidden 2016-05-09 17:40:55 +03:00
Raymond
986156117e Copy custom values of invoice items 2016-05-07 15:29:27 +02:00
Raymond
e4ce4e0fc8 Added dynamic dates to custom invoice fields + fixed bug in processing of notes, terms and footer. 2016-05-07 15:06:56 +02:00
Joshua Dwire
0fc44962d4 Add Braintree/PayPal support 2016-05-06 22:33:03 -04:00
Hillel Coren
1676064fbf Fix for long names in search 2016-05-05 22:16:02 +03:00
Hillel Coren
54be2f0b84 Improvements to the user table seeder 2016-05-05 20:18:02 +03:00
Hillel Coren
25a3f2aae0 Fix for balance\partial due label 2016-05-05 20:17:00 +03:00
Hillel Coren
861a47c3bb Don't show due date in recurring invoice preview 2016-05-05 19:48:33 +03:00
Joshua Dwire
d78b874838 Add Plaid support 2016-04-30 22:45:51 -04:00
Joshua Dwire
c536bd8569 Add basic ACH support 2016-04-29 17:50:21 -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
Joshua Dwire
42c1f537bc Store/display credit card type, expiration and last 4 digits 2016-04-23 22:10:51 -04:00
Hillel Coren
07f50d188f Fix for partial invoice label on PDF 2016-04-24 00:08:16 +03:00
Hillel Coren
b27505f63c Fix for saving invoice client with id/public_id 2016-04-21 13:01:36 +03: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
a805e2b8bb Merge pull request #814 from joshuadwire/enterprise-plan 
Enterprise plan
 2016-04-19 12:01:56 +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
Hillel Coren
2772eb82cf Updating PDF.js compatability.js 2016-04-15 13:10:26 +03:00
Hillel Coren
8550543089 Made textareas the same width 2016-04-13 17:35:36 +03:00
Hillel Coren
cd2c992158 Fix for bold design when product key is blank 2016-04-13 10:52:40 +03:00
Hillel Coren
def0e1a24a Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-04-13 10:48:20 +03:00
Hillel Coren
bb6d9a0ed8 Changed panel border style 2016-04-13 10:40:27 +03:00
Andrew Peng
b46d6bb737 Updated .htaccess file 
Fixed spelling in line 17 for "enable"
 2016-04-12 21:43:23 -05:00
Hillel Coren
f8256127ec Working on multiple tax rates 2016-03-31 13:28:22 +03:00
Hillel Coren
be9e7beaed Support for multiple tax rates 2016-03-31 12:29:01 +03:00
Hillel Coren
f91f32323f Reworking taxes 2016-03-29 17:30:28 +03:00
Hillel Coren
c076f2887c Merge pull request #785 from joshuadwire/attached-documents 
Add support for attached documents
 2016-03-27 18:04:09 +03:00
Joshua Dwire
db322d3fc7 Don't expect an invoice to have expenses 2016-03-24 19:08:38 -04:00
Joshua Dwire
5e62d7d296 Allow documents to be attached to expenses 2016-03-24 18:15:52 -04:00
Joshua Dwire
bff6782026 Add support for uploading documents on older browsers 2016-03-24 15:13:54 -04:00
Joshua Dwire
1c5c45a1e1 Improved handling of various document types; better documents zip 2016-03-24 11:33:28 -04:00
Joshua Dwire
942f543bbb Display documents in invoice PDF 2016-03-23 18:40:42 -04:00
Hillel Coren
bdf24f0ce3 Tweaking the drop shadows 2016-03-23 15:15:18 +02:00
Joshua Dwire
88808d44bf Add support for invoice attachments 2016-03-22 22:23:45 -04:00
Hillel Coren
2a7c84714d Minor style fixes 2016-03-22 14:25:30 +02:00
Hillel Coren
86cda04806 Minor styling fix 2016-03-22 12:18:20 +02:00
Hillel Coren
dab023d898 Minor styling changes 2016-03-22 12:08:48 +02:00
Hillel Coren
c66e933de5 Minor improvements to client portal styling 2016-03-21 22:34:30 +02:00
Hillel Coren
40ce28c433 Made dropdown shadows consistent 2016-03-21 13:42:00 +02:00
Hillel Coren
c3c7f25b32 Clarified partial labels 2016-03-18 14:34:46 +02:00
Hillel Coren
8cd56fa969 Minor fixes 2016-03-17 09:54:32 +02:00
Hillel Coren
2aa5ef9911 Fix for table style in Firefox 2016-03-15 23:55:49 +02:00
Hillel Coren
4e9cc45a55 Hide custom invoice line item fields if not pro 2016-03-15 22:08:12 +02:00
Hillel Coren
2eb569ebbc Working on Travis tests 2016-03-15 12:00:29 +02:00
Hillel Coren
2cfdc6c244 Working on Travis tests 2016-03-15 11:59:04 +02:00
Hillel Coren
25b0957a7f Fix navigation when not signed up and browser is narrower 2016-03-14 23:37:13 +02:00
Akira Matsuda
83e60c7188 Add Japanese fonts. 2016-03-10 00:18:14 +09:00
Hillel Coren
eef80d94d2 Use typeahead for product key on invoice page 2016-02-29 11:40:52 +02:00
Hillel Coren
6a9b2130c5 Added fuzzy search using fuse.js 2016-02-28 22:43:43 +02:00
Hillel Coren
2153a8e227 Added custom invoice item fields 2016-02-28 13:59:52 +02:00
Hillel Coren
1c47f4e03f If product key is blank remove column from PDF 2016-02-28 10:13:58 +02:00
Hillel Coren
4a749d5868 Improvements to custom designer 2016-02-25 20:34:23 +02:00
Hillel Coren
689efc3e3e Lazy load images 2016-02-25 12:16:27 +02:00
Christian González
dc1924dcdd added helper for RewriteBase 2016-02-20 12:09:56 +01:00
Hillel Coren
049c20f062 Zapier improvements 2016-02-16 17:30:09 +02:00
Hillel Coren
4012bd39ed Removed CSS break-word 2016-02-15 19:39:54 +02:00
Hillel Coren
da83776aa9 Fixed new header/footer settings 2016-02-15 10:43:40 +02:00
Hillel Coren
40f372023d Update email image to use new logo 2016-02-14 20:49:12 +02:00
ridgarou
55f26c9ea5 Update jquery.datetimepicker.js 2016-02-09 11:12:23 +01:00
Hillel Coren
25b8c54355 Bug: fix 'Invoice issued to' in business design for quote 2016-02-03 22:19:15 +02:00
Hillel Coren
c14133d66e Added new logo 2016-02-03 10:08:28 +02:00
Hillel Coren
523b008d01 Added support for right aligning table columns 2016-02-01 15:58:52 +02:00
Hillel Coren
387f89440c Add Header/Footer options to invoice design settings 2016-01-31 23:42:20 +02:00
Hillel Coren
02f137f95f Implemented StackTraceJS 2016-01-31 21:36:50 +02:00
Hillel Coren
25f5cdbcdd Added check to ensure expense currency matches client\invoice currency 2016-01-31 15:10:33 +02:00
Hillel Coren
89622f86e2 Fix for #661 2016-01-28 16:07:03 +02:00
Hillel Coren
efc9ab4f9e Working on OFX support 2016-01-26 22:22:33 +02:00
Hillel Coren
7a26dd610c Working on expenses 2016-01-21 22:36:49 +02:00
Hillel Coren
b24a6109ba Working on expenses 2016-01-21 21:15:30 +02:00
Hillel Coren
dff7ad91c8 Merge: Bugfixed version of Vendor / Expense module (#635) 2016-01-21 00:09:10 +02:00
Hillel Coren
6166464003 Merge: Make automatic conversion of quote to invoice optional (#636) 2016-01-20 10:41:57 +02:00
steenrabol
6133c6ff07 Merge branch 'master' of https://github.com/invoiceninja/invoiceninja 
# Conflicts:
#	app/Http/Controllers/InvoiceController.php
#	resources/lang/en/texts.php
#	resources/views/invoices/edit.blade.php
 2016-01-11 20:39:18 +01:00
Hillel Coren
26e1a0df8d Added license for UKai font 2016-01-11 12:30:02 +02:00
Hillel Coren
36859c8262 Only show header on the first page of the PDF 2016-01-10 16:31:56 +02:00
Hillel Coren
56d4aaef66 Added support for Chinese 2016-01-08 00:19:44 +02:00