Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity
4,375 Commits 7 Branches 917 Tags 2 GiB
e6e9237b4d
Commit Graph

1175 Commits

Author SHA1 Message Date
Hillel Coren
0505f2ebb7 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-09-19 09:15:59 +03:00
Hillel Coren
a41066b2e5 Fix task styling 2016-09-18 22:20:56 +03:00
Christian González
0484c5ac8e show pointer on search dropdown 
This *should* fix #1076
 2016-09-18 21:19:02 +02:00
Hillel Coren
ea18ac74c8 Text correction 2016-09-18 22:15:05 +03:00
Hillel Coren
0d2b1f64f9 Fix for description textarea 2016-09-18 22:12:09 +03:00
Hillel Coren
ec963e0823 Added basic task report 2016-09-18 20:45:41 +03:00
Hillel Coren
1e48a9c17d Use improve date selector in reports 2016-09-18 17:06:56 +03:00
Hillel Coren
4530abf495 Disable wordWrapText 2016-09-18 14:58:44 +03:00
Hillel Coren
8ce558d391 Fix for unique invoice number check with slashes 2016-09-18 12:26:18 +03:00
Hillel Coren
ad4841822a Fix for failed payment details 2016-09-18 12:18:42 +03:00
Hillel Coren
4ac6c7eeee Tweaks to limits UI 2016-09-16 12:46:53 +03:00
Hillel Coren
e743af4d24 Merged #1062 2016-09-15 13:41:09 +03:00
Hillel Coren
531c26e87c Updated language files 2016-09-15 11:08:07 +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
Hillel Coren
4df68473ee Logging Stripe error 2016-09-14 18:54:41 +03:00
Hillel Coren
1147ee0329 Cleaned up FB pixel 2016-09-14 16:01:07 +03:00
Hillel Coren
ee55374fc1 Add limit for number of invoice items 2016-09-14 10:39:08 +03:00
Hillel Coren
77a85408b3 Only show trial message for ninja installs 2016-09-13 16:24:30 +03:00
Hillel Coren
3588f82fce Fix checkbox logic on export page 2016-09-13 16:12:27 +03:00
Hillel Coren
5888a287bc Fix for tests 2016-09-12 14:17:10 +03:00
Hillel Coren
8cfcb93179 Added Albanian 2016-09-12 13:08:32 +03:00
Hillel Coren
b2074ae004 Updated lanuguages and added Albaninan 2016-09-12 13:04:47 +03:00
Hillel Coren
e4f914f65d Updated lanuguages and added Albaninan 2016-09-12 13:03:34 +03:00
Hillel Coren
c1d41d6f85 Set allowOutsideClick for sweet alert 2016-09-12 12:51:24 +03:00
Hillel Coren
d6774fed60 Warn leaving page after invoice item changes 2016-09-12 09:44:26 +03:00
Hillel Coren
359271d6c8 Fix undefined on playful quote 2016-09-12 09:38:02 +03:00
Hillel Coren
db35d70494 Improve initial display 2016-09-12 09:37:49 +03:00
Hillel Coren
db4dbdc87e Cleaning up errors from the logs 2016-09-12 08:51:41 +03:00
Hillel Coren
ef81549694 Working on the dashboard 2016-09-11 20:05:59 +03:00
Hillel Coren
ce3a510037 Working on the dashboard 2016-09-11 17:30:23 +03:00
Hillel Coren
9543336b31 Show 'Unnamed Client' for clients w/o a name 2016-09-06 14:55:31 +03:00
Hillel Coren
2f54d1dfa3 Enable iframe feature for self host users 2016-09-06 14:54:53 +03:00
Hillel Coren
c45a3b030c Check if confirmed to show portal link 2016-09-06 12:12:36 +03:00
Hillel Coren
657f5c066c Change label to Partial/Deposit 2016-09-06 12:12:23 +03:00
Hillel Coren
b57deab66e Clarify white label message 2016-09-06 11:13:31 +03:00
Hillel Coren
8f65817dc5 Added fb/twtr to notifications page 2016-09-06 11:02:21 +03:00
Hillel Coren
aee75551b8 Tweak styling 2016-09-06 10:20:51 +03:00
Hillel Coren
f49827d4ad Tweaking UI colors 2016-09-05 22:18:35 +03:00
Hillel Coren
b0146ce8ec Add hash when selecting nav tab 2016-09-05 21:51:22 +03:00
Hillel Coren
0aa266d093 Add hash when selecting nav tab 2016-09-05 21:51:00 +03:00
Hillel Coren
ea2d5af69a Camel case anchor tag 2016-09-05 21:40:02 +03:00
Hillel Coren
75e67f10ee Update nav anchor links 2016-09-05 21:34:34 +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
d740db676f Prevent double pay now click for non-Stripe gateways 2016-09-04 00:15:50 +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
db0c305b4f Working on history sidebar 2016-08-31 22:10:41 +03:00
Hillel Coren
a2f7d32e57 Working on the sidebars 2016-08-31 12:58:31 +03:00
Hillel Coren
49650a01c2 Improve layout 2016-08-31 12:41:19 +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
Hillel Coren
c4c1ef26a4 Update to use minified CSS files 2016-08-22 16:45:34 +03:00
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
de602283c1 Added 'tax' as custom label 2016-08-21 18:39:43 +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
086e48bd4a Fix for active navbar highlight in client portal 2016-08-19 11:55:27 +03:00
Hillel Coren
9060d901a7 Fix initial load of templates and reminders page 2016-08-18 12:24:26 +03:00
Hillel Coren
886d7f6e12 Show 'Valid until' for quotes in HTML emails 2016-08-17 13:17:24 +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
Hillel Coren
c5eed8f902 Host google fonts locally 2016-08-15 22:07:41 +03:00
Hillel Coren
b35c44b1e8 Fixes for JSON import 2016-08-15 21:37:47 +03:00
Hillel Coren
c595d16c2a Check before sending GA data 2016-08-15 19:39:34 +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
18d4cbcfbc Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-08-15 15:15:32 +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
263c34c04f Tweak alert settings 2016-08-15 07:51:56 +03:00
Hillel Coren
bfae5018e0 Fixes for the bot 2016-08-14 12:30:16 +03:00
Hillel Coren
0a5d0ea44c Fix for cvv/cvc 2016-08-14 08:54:16 +03:00
Hillel Coren
ce2c71843c Working on the bot 2016-08-13 22:19:37 +03:00
Hillel Coren
38ef857c14 Fix for using a space as the cvv 2016-08-11 09:31:47 +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
815c3991a6 Working on the bot 2016-08-10 15:57:34 +03:00
Hillel Coren
d374843e50 Working on the bot 2016-08-09 23:06:24 +03:00
Hillel Coren
713394ea8a Don't show portal for ninja account 2016-08-09 09:56:18 +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
16aadf5615 Support links in login page messages 2016-08-02 16:22:02 +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
2924e03a17 Added automated test for language files 2016-08-02 10:41:04 +03:00
Hillel Coren
305ef1d378 Disable date picker language 2016-07-31 21:47:29 +03:00
Hillel Coren
ae87edadfc Fix for fr_CA 2016-07-31 21:41:21 +03:00
Hillel Coren
123d704b56 Fix for quotes on dashboard 2016-07-30 22:10:00 +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
be311315c3 Don't focus invoice number when viewing an invoice 2016-07-28 17:09:58 +03:00
Hillel Coren
7b52776f6e Fixes for browser fav icons 2016-07-27 16:00:32 +03:00
Hillel Coren
aa53a96b5d Verify that invoice number is unique using JS 2016-07-27 15:46:05 +03:00
Hillel Coren
d44213bce9 Fix display of expense exchange rates 2016-07-27 13:54:00 +03:00
Hillel Coren
05a92fea8d Fix for report checkboxes 2016-07-27 13:40:54 +03: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
98a8b7b368 Remove less folder from resources 2016-07-21 20:52:55 +00: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
49a94bc1a0 Fix for unintialized contact 2016-07-20 23:35:07 +03:00
Hillel Coren
8bc3d6c937 Ensure 0% taxes are shown 2016-07-20 20:48:56 +03:00
Hillel Coren
10fdfd2988 Add isStorageSupported() 2016-07-20 20:01:25 +03: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
24503ad53b Merge pull request #980 from codedge/Refactor-utils-helper-class 
Refactor Utils class
 2016-07-20 10:58:32 +03: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
Holger Lösken
68a1a81748 Make app language available in templates 
- Fix #705
- $appLanguage can be fetched inside each template
 2016-07-19 19:04:31 +02:00
Hillel Coren
4306892a5b Update language files 2016-07-19 19:07:03 +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
56f89ef3a0 Update zaps listed 2016-07-16 23:01:55 +03:00
Hillel Coren
86c08f3af5 Working on new pricing 2016-07-15 11:24:08 +03:00
Holger Lösken
39d8e3c7b8 Refactor Utils class 2016-07-14 21:57:13 +00:00
Hillel Coren
8590f9ad17 Working on new pricing 2016-07-14 12:46:00 +03:00
Hillel Coren
2cdba1e4ed Fixes #974 2016-07-14 11:42:10 +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
92043afb9c WePay fixes 2016-07-13 16:35:56 +03:00
Hillel Coren
b9f9c0807d WePay fixes 2016-07-13 16:34:26 +03:00
Hillel Coren
f3a278b9b5 Moved buy now div id 2016-07-13 16:33:49 +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
ca94f5053e Prevent payments for deleted invoices from being included in export 2016-07-11 22:24:49 +03:00
Hillel Coren
6dba7f7153 Minor style change 2016-07-11 22:16:36 +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
5f8ae65310 Working on expense category permissions 2016-07-07 11:44:15 +03:00
Hillel Coren
e6b60c6f1a Working on expense categories 2016-07-07 11:03:43 +03:00
Hillel Coren
cd9aae1e22 Working on expense categories 2016-07-06 21:35:16 +03:00
Hillel Coren
d83f2dc246 Working on expense test 2016-07-06 10:31:06 +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
f2cbfec926 Improved options when exporting data 2016-07-05 17:27:30 +03: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
Hillel Coren
d051ae70ef Make view client dashboard link open in new tab 2016-07-04 21:20:00 +03:00
Holger Lösken
f58b7f1559 Setting start day of week for jQuery date time picker 2016-07-04 19:38:45 +02: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
f0a52a1bf7 Shortening pro plan process 2016-07-04 11:22:10 +03:00
Hillel Coren
80d0d7693a Change 'return to app' to return to account mgmt page 2016-07-04 11:01:26 +03:00
Hillel Coren
a56134050d Fix search when session has expired 2016-07-04 10:59:30 +03:00
Hillel Coren
65d0e350d0 Fix for bold/modern designs on customize page 2016-07-04 10:46:41 +03:00
Hillel Coren
429aba9471 Remove customize save button if not pro 2016-07-04 10:43:04 +03: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
Hillel Coren
d22d8f8d01 Fix for website link in client portal dashboard 2016-07-03 17:13:45 +03:00
Hillel Coren
03b696ac9e Prevent downloading cloned invoice PDF before saving 2016-07-03 16:23:16 +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
Hillel Coren
f9aee23de8 Merge pull request #923 from vincentdh/develop 
Add Mailgun API in mail drivers
 2016-07-03 11:58:24 +03: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
Hillel Coren
ff911888ec Merging tranlations from Transifex 2016-06-30 21:26:14 +03:00
Holger Lösken
ae78a177b0 Fix #562 
Make „Manual entry“ translatable
 2016-06-30 14:38:55 +02:00
Hillel Coren
9603439a33 Added additional designs 2016-06-29 22:48:56 +03:00
Hillel Coren
0449fe2515 Minor text/styling fixes 2016-06-28 21:22:16 +03:00
Hillel Coren
af4cb1dac8 Fix for client portal header navigation 2016-06-26 19:48:15 +03:00
Hillel Coren
d71cf4dd49 Payment fixes 2016-06-26 19:38:36 +03:00
Hillel Coren
7c0875841a Fixed autobill message in emails 2016-06-26 12:59:42 +03:00
Hillel Coren
74e5b80f8c Fix for add company link 2016-06-25 22:05:08 +03:00
Hillel Coren
6ad49cf281 Fixing payment hooks 2016-06-23 16:15:52 +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
c9a19cbd76 Fixes for WePay 2016-06-21 19:10:22 +03:00
Hillel Coren
8a6227bf89 Fix for tests 2016-06-21 12:40:10 +03:00
Hillel Coren
5ff69c6f29 Payments refactor 2016-06-20 17:14:43 +03:00
vincentdh
5875b70496 Add Mailgun API as mail driver 
Add Mailgun API as a mail driver.  Can be configured from the System
Settings page.
 2016-06-19 13:51:22 -04:00
Hillel Coren
1a9f7bf098 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-09 10:56:31 +03:00
Hillel Coren
ffa67cef3b Refactoring payments code... 2016-06-09 10:56:22 +03:00
Hillel Coren
31fc4ad59c Merge pull request #911 from haleksandre/invoice-subtotals 
Add custom labelling and style to multiple labels and amount in the subtotals table
 2016-06-09 09:05:57 +03:00
Alexandre Villeneuve
eafdc12fa5 Add style to multiple subtotals labels 2016-06-08 14:00:44 -04:00
Hillel Coren
7a0ca450a8 Fix payments for clients w/o an email address 2016-06-08 08:43:21 +03:00
Hillel Coren
a91f257f01 Moved up handleDocumentUploaded counter 2016-06-07 21:46:07 +03:00
Hillel Coren
d5cb8b3abe Minor fixes 2016-06-05 22:55:23 +03:00
Hillel Coren
706c26b4d5 Minor fixes 2016-06-05 21:05:11 +03:00
Hillel Coren
5c7a15ff83 Minor fixes 2016-06-05 19:10:15 +03:00
Hillel Coren
8b2f7eb39f Check for blank api secret 2016-06-05 18:50:41 +03:00
Hillel Coren
37a92fc853 Fix for online payments page 2016-06-04 22:11:46 +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
e312f00b80 Don't refresh PDF after file uploaded 2016-06-01 17:32:51 +03:00