1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Commit Graph

511 Commits

Author SHA1 Message Date
Jeramy Simpson
9d5d3f4277 Modify Index Permissions
New build on CentOS Server was experiencing a 500 internal server error caused by incorrect index.php permissions.
2015-04-06 16:25:35 +10:00
Jeramy Simpson
c6d8b6f8e1 Merge Master Changes
Had to manually resolve conflict issues
2015-03-26 10:10:22 +10:00
Hillel Coren
7662729570 Fixed footer location and added Quetzal 2015-03-24 17:26:39 +02: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
b040b5e242 Fixed problem with line wrapping 2015-03-22 15:13:05 +02:00
Jeramy Simpson
82a97b23ab Merge branch 'master' of github.com:hillelcoren/invoice-ninja into laravel-5 2015-03-18 09:52:42 +10:00
Hillel Coren
4eb56a8f88 Updated version number and set new favicon 2015-03-17 07:20:56 +02:00
Jeramy Simpson
59a94e4b2c Remove Error Log 2015-03-17 07:53:42 +10:00
Jeramy Simpson
04c392136e Add Files 2015-03-17 07:45:25 +10: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
0ebf08c53d Corrected rounding issue if qty or cost had greater than 2 precision 2015-03-10 13:15:01 +02:00
Hillel Coren
901e006274 Fixed footer text color 2015-03-04 16:09:58 +02:00
Hillel Coren
29833e6d83 Corrected invoice items spacing on second page of PDF 2015-03-03 14:59:52 +02:00
Hillel Coren
cfe01e7e05 Enabled setting an invoice footer 2015-02-28 23:42:47 +02:00
Hillel Coren
5f6cb53837 Style fixes 2015-02-19 12:35:46 +02:00
Hillel Coren
b55678b0ba Restyled client pages 2015-02-19 00:34:36 +02:00
Hillel Coren
c1bc3f5a3f Added Swiss Franc 2015-02-18 14:59:25 +02:00
Hillel Coren
24b2e851bb Fixed CSS styling of checkboxes 2015-02-10 15:29:03 +02:00
Hillel Coren
99568e4cee Fix problem with quote labels on PDF 2015-02-09 15:29:11 +02:00
Hillel Coren
1e288aafdf Updating text files 2015-01-25 22:44:36 +02:00
Hillel Coren
31b4e17c18 Enabled viewing previous versions of invoices and quotes 2015-01-25 21:26:15 +02:00
Hillel Coren
fa371d2a77 Added support for saving and showing 0% tax rates 2015-01-25 08:48:40 +02:00
Hillel Coren
b362380615 Minor styling fix 2015-01-22 15:36:16 +02:00
Hillel Coren
6648a32dc4 Minor styling fix 2015-01-22 15:32:54 +02:00
Hillel Coren
4926972167 Fixed table header sort icons 2015-01-22 15:16:26 +02:00
Hillel Coren
7b6e2086eb Bug fixes 2015-01-22 11:23:52 +02:00
Hillel Coren
c67129a6a9 Bug fixes 2015-01-15 12:50:16 +02:00
Hillel Coren
dcc852eafa Enabled fixed amount discounts 2014-12-04 00:05:38 +02:00
Hillel Coren
a739429005 Minor tweaks 2014-11-27 12:55:09 +02:00
Hillel Coren
f43d52005e Enabled restoring entities 2014-11-23 23:47:10 +02:00
Hillel Coren
7ebd690852 Registering new sign ups 2014-11-19 21:51:53 +02:00
Hillel Coren
04da12cecd Added support for a white label license 2014-11-16 22:30:19 +02:00
Hillel Coren
012347afda Created quotes, invoices and payments pages for clients 2014-11-16 12:41:07 +02:00
Hillel Coren
113cb6747c Created quotes, invoices and payments pages for clients 2014-11-12 23:09:42 +02:00
Hillel Coren
39f424fcfe Minor bug fixes 2014-11-12 17:22:54 +02:00
Hillel Coren
58a8b72ce9 Revert "dashboard page" 2014-11-11 19:47:31 +02:00
Hillel Coren
af9e988100 Revert "dashboard page changes" 2014-11-11 19:47:15 +02:00
mindnervestech
301679ae6c slim scroll 2014-11-11 13:52:23 +05:30
mindnervestech
110dcaf062 dashborad page 2014-11-11 11:52:12 +05:30
mindnervestech
ab19abac45 Merge branch 'master' of https://github.com/mindnervestech/invoice-ninja 2014-11-11 11:30:40 +05:30
Hillel Coren
eade73bceb Merge pull request #190 from mindnervestech/master
dashboard page
2014-11-08 20:50:25 +02:00
mindnervestech
8321eeb0d3 dashboard 2014-11-08 21:17:35 +05:30
mindnervestech
179113a996 dashboard page 2014-11-08 11:52:43 +05:30
Hillel Coren
b1ff58d70f Merge pull request #189 from tlbdk/master
Add company ID
2014-11-07 13:41:14 +02:00
Hillel Coren
be2b7d28fc Removed default US dollar client currency to enable company setting to be used 2014-11-04 22:27:09 +02:00
Hillel Coren
cb185531da Removed default US dollar client currency to enable company setting to be used 2014-11-04 22:19:20 +02:00
Hillel Coren
a767f84908 Minor fixes 2014-11-04 20:32:18 +02:00
mindnervestech
f3fb10d33a home page 2014-11-03 15:26:49 +05:30
Troels Liebe Bentsen
8ba9dcbed9 Merge branch 'master' of github.com:tlbdk/invoice-ninja 2014-11-02 18:55:33 +01:00
Troels Liebe Bentsen
f3eb908493 Fix paths in grunt and templates so site can be hosted in /subsite/ 2014-10-31 17:26:22 +01:00
Troels Liebe Bentsen
964264bdad Add company id and do minor fixes for vat number 2014-10-30 20:00:33 +01:00
Troels Liebe Bentsen
4c74c3e173 Fix bower config and rebuild artifacts 2014-10-30 18:56:37 +01:00
Troels Liebe Bentsen
d5306ef1cd Merge branch 'master' of github.com:tlbdk/invoice-ninja
Conflicts:
	Gruntfile.js
	app/lang/en/texts.php
	bower.json
	public/built.css
	public/built.js
2014-10-30 18:42:26 +01:00
Hillel Coren
d6eff8f913 Bug fixes 2014-10-26 21:54:37 +02:00
Hillel Coren
8cae66c2ff Bug fixes 2014-10-26 10:42:02 +02:00
Hillel Coren
cc6c6194c6 Added support for additional invoice designs 2014-10-24 13:48:59 +03:00
Hillel Coren
cfc6e22241 Working on new invoice designs 2014-10-21 15:10:29 +03:00
Troels Liebe Bentsen
2c1b67c4aa Remove the custom ui stuff 2014-10-20 22:39:25 +02:00
Troels Liebe Bentsen
99021fdedd Remove the custom ui stuff 2014-10-20 22:38:52 +02:00
Troels Liebe Bentsen
1bca065ca7 Added initial page for the Timesheet controller 2014-10-20 22:30:48 +02:00
Troels Liebe Bentsen
68a53db5bb Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2014-10-20 19:10:04 +02:00
Hillel Coren
ca8db0ffbc Enabled using date variables for non-recurring invoices 2014-10-19 23:15:37 +03:00
Hillel Coren
001208e345 fix #174 - Tax rate error in live PDF 2014-10-19 23:10:16 +03:00
Hillel Coren
27339dbfa0 Added tax percent to PDF 2014-10-19 18:06:20 +03:00
Troels Liebe Bentsen
d6ceb33318 Implement missing function and client vat number to invoice 2014-10-15 01:42:17 +02:00
Troels Liebe Bentsen
8ca8cc91b1 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja
Conflicts:
	composer.lock
2014-10-14 23:48:59 +02:00
Hillel Coren
65f58c64d6 Added invoice and quote number prefixes and counters 2014-10-14 10:46:30 +03:00
Hillel Coren
edea8d0bc2 Moved custom client and company fields to their respective sections on the PDF 2014-10-12 22:36:35 +03:00
Hillel Coren
9770e6a1d5 Working on invoice design page 2014-10-12 21:11:41 +03:00
Hillel Coren
e8b5317f2e Added d3 to js folder 2014-10-06 00:31:14 +03:00
Troels Liebe Bentsen
20bf88b028 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2014-10-05 15:19:20 +02:00
Hillel Coren
e7184ab59d Added moolah as recommended payment gateway 2014-10-05 16:07:04 +03:00
Hillel Coren
fa676f1e57 Working on d3 viz 2014-10-05 10:49:34 +03:00
Hillel Coren
020158a0ae Working on d3.js vizualizer 2014-10-03 02:51:21 +03:00
Troels Liebe Bentsen
b09ebf3229 Added support for listing VAT numbers as used in all of EU 2014-10-01 16:33:09 +02:00
Troels Liebe Bentsen
be408db583 Add handsontable for TimeSheet feature 2014-10-01 02:47:56 +02:00
Troels Liebe Bentsen
3da8555a53 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2014-09-29 12:38:17 +02:00
Hillel Coren
539d86770e Prevented text in inputs from wrapping 2014-09-17 09:26:01 +03:00
Hillel Coren
84cf760785 Added confirm when saving recurring invoice 2014-09-12 00:28:36 +03:00
Troels Liebe Bentsen
a09a563219 Fix CSS errors 2014-08-29 23:24:02 +02:00
Hillel Coren
bb560778af Working on API 2014-07-30 10:08:01 +03:00
Hillel Coren
9feb616f1b Added support for Zapier 2014-07-27 23:31:41 +03:00
Hillel Coren
f5f87319b2 Fixed issue with showing paid to date 2014-07-23 23:55:04 +03:00
Hillel Coren
0123ee36a2 Working on multi-user support 2014-07-23 23:28:40 +03:00
Hillel Coren
051ba95b7b Working on multi-user support 2014-07-23 18:02:56 +03:00
Hillel Coren
4b177e160d Added custom invoice fields 2014-07-20 13:38:42 +03:00
Hillel Coren
4620a06a9b Enabled setting accepted credit cards 2014-07-17 23:44:34 +03:00
Hillel Coren
daf14c6916 Improvements for responsive design 2014-07-17 00:04:56 +03:00
Hillel Coren
9427f5180f Working on self hosting 2014-07-15 23:36:40 +03:00
Hillel Coren
7d48d9d138 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-07-07 09:43:30 +03:00
Hillel Coren
b6092efb41 Show new client form on click 2014-07-07 09:43:16 +03:00
Troels Liebe Bentsen
f2de3f8a81 Update static builds 2014-07-04 19:18:55 +02:00
Hillel Coren
7d41fcd7ac Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-06-29 12:39:29 +03:00
Hillel Coren
306e51c09b Bug fixes 2014-06-29 12:39:08 +03:00
aggepagge
24a071c0f3 added functionallity to company/payments page 2014-06-22 21:08:52 +02:00
Hillel Coren
d2760c42f2 Merge pull request #134 from aggepagge/master
Added functionality to display credit card types for user
2014-06-18 12:28:31 +03:00
aggepagge
a9312d1092 Added functionality to display credit card types for user 2014-06-17 18:53:51 +02:00
Hillel Coren
b4bb01bc90 Text changes 2014-06-17 16:17:38 +03:00
Razi KAntorp
da1db89c75 Header updates 2014-06-16 17:56:06 +02:00
Hillel Coren
1892e3f413 Bug fixes 2014-06-16 01:13:31 +03:00
Hillel Coren
0e5ca8d8f0 Bug fixes 2014-06-16 00:49:07 +03:00
Hillel Coren
7db893e286 Bug fixes 2014-06-16 00:06:59 +03:00
Hillel Coren
fc00c12f98 Bug fixes 2014-06-15 23:54:58 +03:00
Hillel Coren
6fab2cf962 Bug fixes 2014-06-15 21:52:14 +03:00
Hillel Coren
605a04a32f Bug fixes 2014-06-15 21:51:22 +03:00
Razi KAntorp
5a4f625d31 Responsive fixes for homepage 2014-06-14 14:29:37 +02:00
Razi KAntorp
080800d646 Testimonials page 2014-06-13 17:11:46 +02:00
Razi KAntorp
4441c9f283 New menu and mobile menu 2014-06-13 15:49:37 +02:00
Razi KAntorp
7af5a7bb35 FAQ page and some code cleaning 2014-06-12 18:58:19 +02:00
Hillel Coren
f97fed96c9 Merge pull request #127 from raziraz/master
Prevented horizontal scrolling on the features page
2014-06-04 23:40:31 +03:00
Hillel Coren
cdd4ffde68 Bug fixes 2014-06-04 23:41:34 +03:00
Razi KAntorp
f07c327845 Prevented horizontal scrolling on the features page 2014-06-02 18:39:24 +02:00
Hillel Coren
04679b41ce Bug fixes 2014-06-01 17:38:23 +03:00
Hillel Coren
3688669963 Bug fixes 2014-06-01 16:35:19 +03:00
Hillel Coren
8049a27beb Working on quotes 2014-05-21 00:40:09 +03:00
Hillel Coren
c6f0d9e71e Secure payment design 2014-05-14 01:17:33 +03:00
Hillel Coren
fd99dd122c Fixed date picker in chart builder 2014-05-14 00:04:42 +03:00
Razi KAntorp
4b45f5adc8 About page, Secure payment page, footer 2014-05-13 20:21:14 +02:00
Razi KAntorp
e233d4b347 Onging work 2014-05-12 12:19:25 +02:00
Razi KAntorp
f4c857d4b9 Ongoing work with the about us page 2014-05-12 12:14:29 +02:00
Hillel Coren
113665da1e Updating texts 2014-05-11 21:24:30 +03:00
Hillel Coren
4d2473dc9f Added goal tracking 2014-05-09 16:28:20 +03:00
Hillel Coren
7b86aea0a7 Enabled setting the transaction reference field when creating a payment 2014-05-08 20:16:00 +03:00
Razi KAntorp
226c376dc0 Features page and updated heros 2014-05-06 19:54:28 +02:00
Hillel Coren
1fbf61cd55 Bug fixes 2014-05-06 11:50:17 +03:00
Razi KAntorp
dfd8546cf5 new header style 2014-05-05 20:44:21 +02:00
Razi KAntorp
5bb370eda0 Merge remote-tracking branch 'upstream/master' 2014-05-05 15:09:11 +02:00
Razi KAntorp
76a0a013ef ongoing work 2014-05-05 15:08:57 +02:00
Hillel Coren
c2998b888c Removing bower components from repo 2014-05-04 23:34:51 +03:00
Hillel Coren
bbbcca2768 Bug fixes 2014-05-04 20:11:27 +03:00
Hillel Coren
9d858f4bfc Updating texts and added invoice_now link 2014-05-04 18:49:57 +03:00
Hillel Coren
0208ea1e75 Bug fixes 2014-05-01 22:54:02 +03:00
Hillel Coren
9360852ad5 Bug fixes 2014-05-01 21:17:04 +03:00
root
8bb90759fc fixed invoice payment calculations 2014-05-01 15:47:55 +00:00
Razi KAntorp
3e24a8e3b4 Updated splash page 2014-05-01 13:21:59 +02:00
Razi KAntorp
7c06b95e83 pricing page 2014-04-30 16:14:11 +02:00
Hillel Coren
3e26880561 Adding custom invoice colors 2014-04-29 23:46:40 +03:00
Hillel Coren
fca1078401 Working on Grunt support 2014-04-28 23:22:55 +03:00
Hillel Coren
113cf9b482 Adding Grunt for file concat 2014-04-28 23:05:37 +03:00
Hillel Coren
8595ba6113 Bug fixes 2014-04-28 01:07:45 +03:00
Hillel Coren
0ef559562e Bug fixes 2014-04-27 16:22:03 +03:00
Hillel Coren
b0091bd27b Bug fixes 2014-04-26 22:00:31 +03:00
Hillel Coren
805f5cf189 Text changes 2014-04-25 16:04:57 +03:00
Hillel Coren
4c621758f1 Added bower depedancies to codebase 2014-04-22 18:10:41 +03:00
Hillel Coren
f7c41827bf Adding bower dependancies 2014-04-22 14:33:53 +03:00
Hillel Coren
add9cb1569 Bug fixes 2014-04-22 00:25:40 +03:00
Hillel Coren
40dae71bc4 Custom fields layout in the PDF 2014-04-21 22:09:16 +03:00
Hillel Coren
01ec2cb838 Working on custom fields for pro plan 2014-04-18 11:57:31 +03:00
Hillel Coren
4d1df9bdc3 Removing debug messages 2014-04-14 15:16:32 +03:00
Hillel Coren
45ed680c77 Bug fixes 2014-04-14 14:33:43 +03:00
Hillel Coren
3a50fd6aa2 Working on pro plan 2014-04-13 16:34:58 +03:00
blkmutt
ba13c105ed Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja
Merged from parent
2014-04-09 22:33:41 -04:00
Hillel Coren
bd2ef0b7b6 Fixing some issues getting the site set up 2014-04-09 14:49:18 +03:00
Hillel Coren
e609b49b2c Fixing some issues getting the site set up 2014-04-09 14:47:25 +03:00
blkmutt
f613caec07 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja
Merging files from parent.
2014-04-07 09:53:26 -04:00
Hillel Coren
0e48e9b637 Deleting files 2014-04-06 21:00:02 +03:00
Razi KAntorp
7a368e9533 New about page 2014-04-06 19:48:34 +02:00
blkmutt
3c99bebae9 merged from parent 2014-04-06 11:47:22 -04:00
Hillel Coren
6710eba329 Bug fixes 2014-04-06 12:02:04 +03:00
Hillel Coren
5b323e04d7 Adding ability to remove ninja logo 2014-04-04 12:24:56 +03:00
Hillel Coren
3d6530e83f Bug fixes 2014-04-03 20:54:06 +03:00
Hillel Coren
1b7c885367 Working on multi-language support 2014-04-02 21:20:01 +03:00
Razi KAntorp
e88712e42f Removed about link and added features and faq to header and footer. 2014-04-02 11:54:25 +02:00
Razi KAntorp
7747943136 Updated hero for contact page 2014-03-31 17:54:21 +02:00
Razi KAntorp
80f0a17eea Features page added 2014-03-31 17:43:43 +02:00
Razi KAntorp
008cca025f Faq page added 2014-03-31 17:06:44 +02:00
Razi KAntorp
bdd4fa18b4 Updated login page. 2014-03-31 15:40:19 +02:00
blkmutt
227282a8cf Made changes to include PHP-Payments. Added Recommended Gateways to the Company/Payments UI. 2014-03-29 20:21:57 -04:00
blkmutt
33d54abb1e Made some styling updates. 2014-03-29 20:21:37 -04:00
Hillel Coren
2e299aa83f Working on multi-language support 2014-03-27 14:25:31 +02:00
blkmutt
3ca03eb2b4 Merge branch 'master' into Dev_PHP-Payments
Merged changes from master.
2014-03-25 21:21:23 -04:00
blkmutt
33ff8e1d60 Updated account controller, data objects, and logos for recommended gateways. 2014-03-25 20:59:33 -04:00
Hillel Coren
b99427b05c Bug fixes 2014-03-23 21:38:03 +02:00
Hillel Coren
db3a6abad3 Bug fixes 2014-03-23 21:17:45 +02:00
Hillel Coren
a09b898cb1 Bug fixes 2014-03-23 20:19:03 +02:00
Hillel Coren
9a592753b2 Bug fixes 2014-03-23 19:54:02 +02:00
Hillel Coren
c08a46a7da Bug fixes 2014-03-23 17:59:30 +02:00
Hillel Coren
3bbb156124 Bug fixes 2014-03-23 17:49:14 +02:00
Hillel Coren
c4665f84f0 Bug fixes 2014-03-23 16:23:53 +02:00
Hillel Coren
631cdef345 Bug fixes 2014-03-23 15:36:18 +02:00
Hillel Coren
6e532063fd Working on multi-language support 2014-03-23 14:53:16 +02:00
Hillel Coren
6d6084728d Working on multi-language support 2014-03-23 14:19:54 +02:00
Hillel Coren
b7061222e8 Bug fixes 2014-03-23 13:11:04 +02:00
Hillel Coren
bb06e31403 Reworking public pages and bug fixes 2014-03-21 00:12:07 +02:00
Hillel Coren
36cf1810e8 Added sign up popover message 2014-03-19 18:17:26 +02:00
Hillel Coren
b523d6f44d Enabled off-site payment with PayPal Express 2014-03-19 01:28:43 +02:00
Hillel Coren
0f9f32dd49 Improved logo in PDF 2014-03-18 22:43:12 +02:00
Hillel Coren
1757dd706d Added ability to remove account logo 2014-03-18 20:55:50 +02:00
Razi KAntorp
723b45f3a7 Fixed field jumping issue in Manage Rate Modal, changed to red color of the remove icon in Manage Rate Modal and Create invoice 2014-03-18 17:08:30 +01:00
Razi KAntorp
0f6c87e39e modal styling updates 2014-03-18 16:17:49 +01:00
Hillel Coren
cf6e199bbe Merging conflicts 2014-03-18 15:20:38 +02:00
Razi KAntorp
6dd89bb77f background color 2014-03-18 14:09:36 +01:00
Razi KAntorp
a5e9d52958 merging conflicts 2014-03-18 14:05:42 +01:00
Razi KAntorp
d117683c37 alert border-radius + border: none 2014-03-18 11:01:02 +01:00
Hillel Coren
c25e821748 Bug fixes 2014-03-17 20:11:39 +02:00
Hillel Coren
ccbbf6c6fa Bug fixes 2014-03-17 20:05:01 +02:00
Razi KAntorp
d6e7f19f2f .. 2014-03-14 11:24:40 +01:00