Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 22:54:25 +01:00
Code Issues Releases Activity
1,581 Commits 9 Branches 921 Tags 2 GiB
0b2705b943
Commit Graph

1089 Commits

Author SHA1 Message Date
Hillel Coren
935780f7bc Bug fixes 2015-05-15 11:51:22 +03:00
Hillel Coren
19c1a33d52 Bug fixes 2015-05-13 18:32:59 +03:00
Hillel Coren
140943f166 Fixed problem when adding user 2015-05-12 12:36:32 +03:00
Hillel Coren
0fa30fb55f Bug fixes 2015-05-11 14:16:36 +03:00
Hillel Coren
fcbec2617b Bug fixes 2015-05-10 22:02:35 +03:00
Hillel Coren
bdb9fe4324 Change 2015-05-10 13:15:41 +03:00
Hillel Coren
c4a94834a1 API improvements 2015-05-10 11:45:03 +03:00
Hillel Coren
f41e0d999b Bug fixes 2015-05-09 21:25:16 +03:00
Hillel Coren
9198677277 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2015-05-08 11:21:43 +03:00
Hillel Coren
ef6e930f1b Minor dashboard improvements 2015-05-08 11:21:29 +03:00
Viktor Rennert
0eaed84132 Fixed Invoice object in Mailer instance. 2015-05-05 22:53:54 +02:00
Hillel Coren
b368e5589c Bug fixes 2015-05-05 12:48:23 +03:00
Hillel Coren
5a28ff2612 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2015-04-30 20:54:41 +03:00
Hillel Coren
1d6013178f Working on basic reports 2015-04-30 20:54:19 +03:00
Jeramy Simpson
9cb51f449b Fix PHP 5.4 Compatibility for pdfupload 2015-04-29 11:49:28 +10:00
Hillel Coren
bc10719fbe Added support for custom subdomains 2015-04-28 23:13:52 +03:00
Hillel Coren
723aa285f5 Bug fixes 2015-04-27 15:28:40 +03:00
Hillel Coren
b2678220c3 Working on PDF attachments 2015-04-23 00:40:21 +03:00
Hillel Coren
dc6ed9fca1 Updating design 2015-04-22 22:21:04 +03:00
Hillel Coren
c0571b0b2e Bug fixes 2015-04-21 23:09:45 +03:00
Hillel Coren
8018bcad6c Working on pdfmake 2015-04-21 14:42:31 +03:00
Hillel Coren
6d651a250c Working on L5 2015-04-20 17:47:14 +03:00
Hillel Coren
e95b6461bb Working on L5 2015-04-20 17:34:23 +03:00
Hillel Coren
dea421259c Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2015-04-17 14:57:34 +03:00
Hillel Coren
168bb7cfb0 Added support for partial payments 2015-04-17 14:57:17 +03:00
sigitas
9be2538213 Merge remote-tracking branch 'remotes/ninja/master' 2015-04-17 00:34:57 +03:00
Hillel Coren
96a71864ed Added support for partial payments 2015-04-16 22:57:12 +03:00
Hillel Coren
caae008403 Added support for partial payments 2015-04-16 20:12:56 +03:00
Hillel Coren
be327fbcbf Added support for Bitcoin 2015-04-15 19:35:41 +03:00
Hillel Coren
868744c696 Working on L5 2015-04-14 21:58:07 +03:00
Hillel Coren
00e1a5d2a2 Working on L5 2015-04-14 06:22:33 +03:00
Hillel Coren
686953aafd Working on L5 2015-04-13 22:43:51 +03:00
Hillel Coren
635c1b9df1 Working on L5 2015-04-13 18:05:34 +03:00
Hillel Coren
3641019d04 Enabled re-sending confirmation email 2015-04-13 15:49:40 +03:00
Hillel Coren
5a6197fbb4 Added notification email when quote is approved 2015-04-13 15:00:31 +03:00
sigitas
5f1495073f use custom fonts 2015-04-13 12:23:43 +03:00
Hillel Coren
564d006428 Working on L5 2015-04-13 10:54:51 +03:00
Hillel Coren
9dcc4e0e52 Working on L5 2015-04-12 17:18:05 +03:00
Hillel Coren
c19d09fa0c Added back gruntfile 2015-04-12 12:58:28 +03:00
Hillel Coren
0e2eba4521 Bug fixes 2015-04-12 12:43:51 +03:00
Hillel Coren
717d214157 Working on L5 2015-04-08 21:19:58 +03:00
Hillel Coren
4750bacd71 Reworked query caching for L5 2015-04-08 16:19:17 +03:00
Hillel Coren
424eb15870 Working on L5 2015-04-06 14:46:02 +03:00
Jeramy Simpson
810507bd33 Update Version 2015-04-06 17:13:19 +10:00
Jeramy Simpson
05b120e449 L5 Updates 2015-04-06 16:58:47 +10:00
Jeramy Simpson
a1eb78faac PDF Setting Fixed 2015-04-06 16:24:35 +10:00
Jeramy Simpson
b356c61505 Fix merge from master 
Moving migration file
 2015-04-06 15:59:00 +10:00
Jeramy Simpson
b8c1d49e30 Remove last mentions of PHP-Payments 
Closes #257
 2015-04-06 15:55:17 +10:00
Jeramy Simpson
698809fa01 L5 Updates 2015-04-06 15:45:27 +10:00
Jeramy Simpson
b51f889219 Merge branch 'master' of github.com:hillelcoren/invoice-ninja into laravel-5 
Fixed Conflicts:
	resources/views/invoices/view.blade.php
 2015-04-06 10:32:23 +10:00
Hillel Coren
b8f2f59b5b Working on L5 2015-04-05 22:15:37 +03:00
Hillel Coren
ca242a4f21 Moved new date format to be the last 2015-04-05 14:15:58 +03:00
MagicFab
35846028f2 Added ISO format date (YYYY-MM-DD) 2015-04-04 02:16:26 -04:00
MagicFab
3f51f5da0c Started work on French Canadian (Quebec) locale 2015-04-04 01:30:31 -04:00
Hillel Coren
d47d715181 Working on L5 2015-04-02 16:12:12 +03:00
Hillel Coren
83a48df567 Working on L5 2015-04-02 16:06:16 +03:00
Hillel Coren
66f4ec3ab6 Fixed issue with default currency not being used 2015-04-02 10:00:32 +03:00
Hillel Coren
1c0aa4ec8d Fixed issue with default currency not being used 2015-04-02 09:58:23 +03:00
Jeramy Simpson
37ca4c9481 Working on L5 
Also includes very minor meta tag changes to bring to industry standard.
 2015-04-02 14:09:32 +10:00
Hillel Coren
515f6fd131 Working on L5 2015-04-01 22:57:02 +03:00
Hillel Coren
194eb9e28a Working on L5 2015-04-01 18:44:55 +03:00
Hillel Coren
7f69991ca8 Working on L5 2015-03-31 21:50:58 +03:00
Hillel Coren
4fc7e3f5d1 Reworking events for L5 2015-03-31 20:42:37 +03:00
Hillel Coren
bb66ed7a96 Fixed creating invoices 2015-03-31 12:38:24 +03:00
Hillel Coren
36473a0722 Working on users in L5 2015-03-30 22:56:01 +03:00
Hillel Coren
f4930681b0 Working on users in L5 2015-03-30 22:45:10 +03:00
Hillel Coren
58746d9eec Working on users in L5 2015-03-30 18:20:53 +03:00
Hillel Coren
78502f74e4 Working on users in L5 2015-03-29 15:37:42 +03:00
Hillel Coren
c4d20b252f Show pay now based on invoice balance 2015-03-27 12:32:45 +03:00
Jeramy Simpson
768f04e3a9 L5 Syntax Changes 2015-03-27 16:06:14 +10:00
Jeramy Simpson
1cc88c1a76 L5 Syntax Changes 2015-03-27 15:02:19 +10:00
Jeramy Simpson
d787b566e0 Minor Fixes and Cleanup 2015-03-27 11:09:13 +10:00
Hillel Coren
8ed675ebe1 Working on users 2015-03-26 16:35:57 +02:00
Jeramy Simpson
1080d9e2f6 L5 Syntax Changes and Namespacing 2015-03-26 16:24:02 +10:00
Jeramy Simpson
7c78753a2d L5 Syntax - Cache for Currency 2015-03-26 15:13:31 +10:00
Jeramy Simpson
de1a5252ec Fixes the creation of the initial user during setup 2015-03-26 14:15:18 +10:00
Jeramy Simpson
4b83070845 Commenting out incompatible L5 Function 
Will need to come back and fix this at a later date.
Relates to Git Issue #274
 2015-03-26 13:59:18 +10:00
Jeramy Simpson
0a818526e0 Update Namespacing 2015-03-26 13:52:42 +10:00
Jeramy Simpson
c6d8b6f8e1 Merge Master Changes 
Had to manually resolve conflict issues
 2015-03-26 10:10:22 +10:00
Hillel Coren
b0421b8321 Working on setup page 2015-03-25 22:00:00 +02:00
Hillel Coren
d773c72970 Working on setup page 2015-03-25 21:56:31 +02:00
Hillel Coren
a014bf313c Fixed issue related to using multiple gateways 2015-03-25 17:52:01 +02:00
Hillel Coren
13994f98a8 Changed PDF attachment to use private id 2015-03-24 18:07:48 +02:00
Hillel Coren
7662729570 Fixed footer location and added Quetzal 2015-03-24 17:26:39 +02:00
Jeramy Simpson
54a126a0d0 Fix Namespacing 2015-03-24 18:26:57 +10:00
Jeramy Simpson
6ae6a29117 Fix Ninja Namespace 
Also includes other minor clean ups and L5 syntax changes
 2015-03-24 18:21:12 +10:00
Jeramy Simpson
ccf547c54d Very Minor Cleanup 2015-03-24 17:35:20 +10:00
Jeramy Simpson
7718d8b8cb L5 Namespacing Update 2015-03-24 17:34:27 +10:00
Jeramy Simpson
651e06fdb9 Update Confide Config Setting for L5 
Also adds other package config settings however they have not yet been called in ConfigServiceProvider
 2015-03-24 17:27:43 +10:00
Jeramy Simpson
427d8ddc3f Very Minor Cleanup 2015-03-24 17:25:31 +10:00
Jeramy Simpson
f83d694477 Minor Cleanup and Syntax Changes 2015-03-24 17:24:44 +10:00
Jeramy Simpson
37921e4653 Merge branch 'master' of github.com:hillelcoren/invoice-ninja into laravel-5 2015-03-24 09:55:21 +10:00
Jeramy Simpson
6659803a21 Update Config Settings to use .env 
Also has a minor change to the install and upgrade function to work with L5.
 2015-03-24 09:54:49 +10:00
Hillel Coren
8142db61f0 Merge pull request #258 from Grovespaz/master 
Added missing Dutch translations.
 2015-03-23 14:12:41 +02:00
Hillel Coren
8271330700 Merge pull request #260 from Destination-Design/feature_email_pdf_attachment 
Feature: Added ability to attach invoice as pdf to email templates.
 2015-03-23 10:13:47 +02:00
Jeramy Simpson
cf5adfad25 Namespace Updates and Confide Changes 2015-03-23 16:52:01 +10:00
Jeramy Simpson
5584121afb Update Namespaces 2015-03-23 14:20:33 +10:00
Jeramy Simpson
2ccc61224a Merge branch 'master' of github.com:hillelcoren/invoice-ninja into laravel-5 2015-03-23 14:09:28 +10:00
Hillel Coren
09838a1b19 Bug fix for activity tracking 2015-03-20 09:17:15 +02:00
Hillel Coren
4e3e29a78e Bug fix for activity tracking 2015-03-20 09:11:58 +02:00
Viktor Rennert
40b689f19b Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja into feature_email_pdf_attachment 2015-03-18 13:20:40 +01:00
Viktor Rennert
2a6f7e00b5 Reworked pdf store flow from AjaxController to invoice save. 2015-03-18 13:20:02 +01:00
Jeramy Simpson
291242fcb0 Update language references 
As a result of removing confide, the lang name for some text must change.
 2015-03-18 13:55:05 +10:00
Jeramy Simpson
80392e5902 Update imported classes 2015-03-18 13:46:36 +10:00
Jeramy Simpson
b332d7690a Update Namespaces and Syntax in Ninja/Repositories 2015-03-18 10:39:01 +10:00
Jeramy Simpson
638d9c5087 Move Auth Files back to Model Folder 2015-03-18 09:58:34 +10:00
Jeramy Simpson
82a97b23ab Merge branch 'master' of github.com:hillelcoren/invoice-ninja into laravel-5 2015-03-18 09:52:42 +10:00
Jeramy Simpson
f6b0cda9ec Update Namespaces 2015-03-18 09:39:03 +10:00
Hillel Coren
e8193927d3 Fix for license payment 2015-03-17 16:43:35 +02:00
Hillel Coren
206d57ef6b Fixed analytics tag 2015-03-17 16:25:53 +02:00
Hillel Coren
8e238a2c7a Fixed issue when saving recurring invoice 2015-03-17 15:43:13 +02:00
Hillel Coren
35b1379f61 Fixed bug where stripe token billing was incorrectly shown 2015-03-17 15:09:28 +02:00
Hillel Coren
392fd537cb Fixed issue if there are line breaks in the account invoice terms 2015-03-17 13:07:33 +02:00
Hillel Coren
3e55f43270 Corrected link to the homepage 2015-03-17 12:45:48 +02:00
Jeramy Simpson
eb3d9f44a2 Syntax Changes 2015-03-17 15:22:44 +10:00
Hillel Coren
4eb56a8f88 Updated version number and set new favicon 2015-03-17 07:20:56 +02:00
Jeramy Simpson
4f775fa432 Filter File becomes Middleware 2015-03-17 14:14:05 +10:00
Jeramy Simpson
9af731545c Update Namespaces & Syntax 2015-03-17 11:30:56 +10:00
Jeramy Simpson
04c392136e Add Files 2015-03-17 07:45:25 +10:00
Viktor Rennert
00fb18a52f Added ability to attach invoice as pdf to email templates. 
Added flag in setting to turn pdf attachments on/off.
Client side generated pdf is uploaded on send email action.
Backend will check for actuall pdf.
Added dummy strings to all languages.

Added migration.
 2015-03-15 18:54:40 +01:00
Govert Versluis
78adb790f7 Added missing Dutch translations. 
This commit adds >90% of the missing strings. I tried to stay faithful to the already present translations as much as posssible.
 2015-03-13 16:41:16 +01:00
Jeramy Simpson
77922893d2 Fixing Dependancies, re-organising files 
Only a little progress. Still heaps to do
 2015-03-13 15:01:27 +10:00
root
2c696666df Initial Progress. 
- Moved most files
- fixed composer dependencies
- Started fixing issues.
 2015-03-12 13:39:52 +10:00
root
32e78ef3da Bring in Laravel5 framework. 2015-03-12 10:44:39 +10:00
root
872e9db581 Delete everything in prep for laravel 5. 2015-03-12 10:43:47 +10:00
Hillel Coren
2cdf6d517a Added support for gmail one-click actions 2015-03-11 23:37:43 +02:00
Hillel Coren
228f772f02 Minor tweaks 2015-03-10 14:39:49 +02:00
Hillel Coren
ed3d779bf1 Minor tweaks 2015-03-10 14:39:25 +02:00
Hillel Coren
0ebf08c53d Corrected rounding issue if qty or cost had greater than 2 precision 2015-03-10 13:15:01 +02:00
Hillel Coren
e91c832cc2 Restyled forgot password pages 2015-03-09 23:57:16 +02:00
Hillel Coren
e42c6b3ca2 Combined advanced settings pages 2015-03-09 21:14:00 +02:00
Hillel Coren
d13a377ff7 Added ip to activities table 2015-03-09 17:15:28 +02:00
Hillel Coren
463d0546af Add “order by” for invoice items 2015-03-09 14:01:48 +02:00
Hillel Coren
df439d9a54 Set additional payment gateway fields 2015-03-09 13:52:35 +02:00
Hillel Coren
173b45ec84 Set payment cancelUrl to client invoice page 2015-03-09 13:37:24 +02:00
Hillel Coren
886fccadfd Fix for Viewing invoice as Guest #250 2015-03-09 00:13:25 +02:00
Paul-Vincent Roll
f7cc0f24ce Fixed German translation 2015-03-05 20:57:42 +01:00
Paul-Vincent Roll
32ace7a917 Fixed translations 2015-03-05 20:50:21 +01:00
Hillel Coren
a1f5bef661 Removing API limits for self host 2015-03-05 20:31:55 +02:00
Hillel Coren
3556871fa9 Added support for changing user’s password 2015-03-04 23:53:46 +02:00
Hillel Coren
43d2ce4063 Merge pull request #246 from paviro/master 
New German translations
 2015-03-04 16:06:30 +02:00
Hillel Coren
9b7736719a Removed terms from footer 2015-03-04 16:06:24 +02:00
Hillel Coren
10bc43df91 Added support for an additional payment gateway (paypal + credit card) 2015-03-04 10:27:23 +02:00
Hillel Coren
5853dd34de Added support for an additional payment gateway (paypal + credit card) 2015-03-04 01:23:02 +02:00
Hillel Coren
f42777b1f5 Added support for an additional payment gateway (paypal + credit card) 2015-03-04 00:14:44 +02:00
Paul-Vincent Roll
ca59c3adbe Added new translations 2015-03-03 20:26:32 +01:00
Hillel Coren
c71dcee2ea Added support for API tokens 2015-03-03 17:41:36 +02:00
Hillel Coren
9210e3d578 Added support for API tokens 2015-03-03 17:32:50 +02:00
Hillel Coren
29833e6d83 Corrected invoice items spacing on second page of PDF 2015-03-03 14:59:52 +02:00
Hillel Coren
6e03bc7510 Bug fixes 2015-03-02 16:17:33 +02:00
Hillel Coren
d605c26bd4 Bug fix if terms is null 2015-03-01 20:21:44 +02:00
Hillel Coren
1453ad4a37 Swapped white label and invoice design prices 2015-03-01 20:15:22 +02:00
Hillel Coren
cfe01e7e05 Enabled setting an invoice footer 2015-02-28 23:42:47 +02:00
Hillel Coren
dc117dbaff Bug fixes 2015-02-27 10:37:26 +02:00
Hillel Coren
b165f47763 Enabled creating invoices through the API 2015-02-27 10:10:23 +02:00
Hillel Coren
854f6777ab Bug fixes 2015-02-26 21:24:49 +02:00
Hillel Coren
bf24e8c40f Client page color matches invoice design primary color 2015-02-26 20:47:20 +02:00
Hillel Coren
fe2155e139 Added social buttons to login page 2015-02-26 20:20:10 +02:00
Hillel Coren
856b7977d2 Bug fixes 2015-02-26 17:42:07 +02:00
Hillel Coren
cc46f1fa60 Merge branch 'master' of git://github.com/fabianmarz/invoice-ninja into fabianmarz-master 
Conflicts:
	app/lang/de/texts.php
 2015-02-26 15:10:44 +02:00
Hillel Coren
ef49e970a7 Removed deleted and added archived records to the chart builder 2015-02-26 15:06:44 +02:00
Hillel Coren
3c5a3897cc Fixed incorrect create_at activity timestamps 2015-02-26 15:06:24 +02:00
Hillel Coren
9d240480cc Bug fixes and check-data script 2015-02-26 00:11:00 +02:00
Hillel Coren
82172751dd Added years to the expiration select 2015-02-23 21:17:45 +02:00
Hillel Coren
3a06647336 Fixed issue when deleting recurring invoice 2015-02-23 21:17:15 +02:00
Hillel Coren
ca3abb3e56 Changed payment page to charge invoice balance rather than full amount 2015-02-22 23:07:38 +02:00
Hillel Coren
1f47acb8ae Style fixes 2015-02-19 12:42:13 +02:00
Hillel Coren
4cc885b20f Style fixes 2015-02-19 12:40:29 +02:00
Hillel Coren
5f6cb53837 Style fixes 2015-02-19 12:35:46 +02:00
Hillel Coren
c94c60c33e Restyled client pages 2015-02-19 00:42:12 +02:00
Hillel Coren
b55678b0ba Restyled client pages 2015-02-19 00:34:36 +02:00
Fabian Marz
6e9fe96f8f Merge branch 'master' of https://github.com/fabianmarz/invoice-ninja 
Conflicts:
	app/views/clients/show.blade.php
 2015-02-18 23:00:37 +01:00
Fabian Marz
53111d7584 Merge conflict 2015-02-18 22:59:46 +01:00
Fabian Marz
897277831a Added translation string and fixed german string 2015-02-18 22:58:17 +01:00
Fabian Marz
073cd4e926 Added translation string and fixed german string 2015-02-18 22:28:37 +01:00
Hillel Coren
3c7fefc5d8 Minor tweaks 2015-02-18 15:46:46 +02:00
Hillel Coren
c1bc3f5a3f Added Swiss Franc 2015-02-18 14:59:25 +02:00
Hillel Coren
7f27abace2 Added support for Stripe token billing 2015-02-18 00:22:12 +02:00
Hillel Coren
fbf7c235e8 Resolved conflict 2015-02-16 18:15:56 +02:00
Hillel Coren
89269f4bd7 Added ability for clients to approve a quote, converting it to an invoice 2015-02-16 18:15:05 +02:00
Paul-Vincent Roll
16089f1ab3 Added new German translations 
Added new German translations
 2015-02-13 13:00:21 +01:00
Hillel Coren
2a297e3d3f Added ability to customize emails 2015-02-12 22:50:05 +02:00
Hillel Coren
2c6cce1707 Enable restoring users and re-sending invitations 2015-02-11 14:39:00 +02:00
Hillel Coren
276b23da95 Added 'convert to quote' option to quote list actions 2015-02-10 15:50:38 +02:00
Hillel Coren
24b2e851bb Fixed CSS styling of checkboxes 2015-02-10 15:29:03 +02:00
Hillel Coren
dc23bad422 Added ability to edit payments 2015-02-10 13:29:13 +02:00
Hillel Coren
d57fe62c49 Removed possible duplicates from the payment list 2015-02-10 12:40:12 +02:00
Hillel Coren
1aea4d83a2 Improved logged JavaScript error message 2015-02-10 12:37:28 +02:00
Hillel Coren
2af014dad2 Prevented issue sending invoice when contact or user is deleted 2015-02-10 12:00:59 +02:00
Hillel Coren
29fc9db9b7 Merge pull request #236 from paviro/master 
Improved German translation
 2015-02-09 12:42:21 +02:00
Hillel Coren
45ed61423c Setting default environment back to 'production' 2015-02-09 12:41:11 +02:00
Hillel Coren
ea8f875cae Merge pull request #234 from lbr88/enhancement/negativepayments 
Negative Payments
 2015-02-09 12:30:40 +02:00
Paul-Vincent Roll
2cec89e7f5 Merge pull request #2 from hillelcoren/master 
Update
 2015-02-09 10:39:13 +01:00
Paul-Vincent Roll
5d37077c92 Improved German translation 
Impolite to use "Dein" when talking to a client.
Other small fixes in wording.
 2015-02-09 10:36:45 +01:00
Lars Bo Rasmussen
439edffe20 Made it possible to add negative payments. 
Needed when making an invoice with a negative amount.
The usecase for this is that in denmark you are not allowed to change an invoice once
it has been filed.
So to change an invoice or cancel it, it is required to create a creditnote.
The system allows this but does not let you enter a negative payment for an invoice(creditnote in this case)
which is a mistake.
 2015-02-09 03:16:21 +01:00
Lars Bo Rasmussen
07ee613a44 the missing public.php was added partially translated. 2015-02-09 03:00:31 +01:00
root
fb7cdfdc31 updated danish translation 2015-02-09 02:40:42 +01:00
Hillel Coren
2f80865cd4 Fixed issue with production database config not being used 2015-02-08 22:28:51 +02:00
Hillel Coren
dd718387ed Fixed issue with production database config not being used 2015-02-08 20:04:36 +02:00
Paul-Vincent Roll
6ab8997cbf Improved German translation 
Added new translations and fixed old ones.
 2015-02-07 20:21:00 +01:00