Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 21:52:35 +01:00
Code Issues Releases Activity
1,956 Commits 7 Branches 919 Tags 2 GiB
9436f5a51e
Commit Graph

1288 Commits

Author SHA1 Message Date
Hillel Coren
6350c5bc1b Fixed problem with history page list 2015-02-06 14:55:19 +02:00
Hillel Coren
42abd5f8e0 Fixes #225: Client ID Number not showing under client detail 2015-01-28 16:14:42 +02:00
Hillel Coren
80b6687047 Fix #224 - Emails not getting sent 2015-01-27 20:38:51 +02:00
Hillel Coren
b8bc6e3186 Fix #222 showing incorrect amount on dashboard 2015-01-27 10:03:51 +02:00
Hillel Coren
a6b9bd44b8 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2015-01-27 00:39:05 +02:00
Hillel Coren
1a7a4499af Fix for #219 - multiple currencies on dashboard 2015-01-27 00:38:54 +02:00
Arthur Maroulier
9bdb60e871 Fix translation. 2015-01-26 22:44:16 +01:00
Arthur Maroulier
adaa89c240 Fix french translations. For history feature. 2015-01-26 22:38:23 +01:00
Arthur Maroulier
d7be01add1 Merge branch 'master' of github.com:ArthurMaroulier/invoice-ninja 2015-01-26 22:17:32 +01:00
Arthur Maroulier
cea9c15a5c Fix french translations. Many about 'quote' which is more 'devis' than 'soumission' in french. 2015-01-26 22:11:34 +01:00
Hillel Coren
39c6656e49 Fixed issue related to invoice history 2015-01-25 23:57:42 +02:00
Hillel Coren
eb6b4c1386 Fixes to invoice history 2015-01-25 23:28:49 +02:00
Hillel Coren
b60d36f066 Updating app version 2015-01-25 23:05:26 +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
8d13091e86 Merge pull request #218 from sanglt/master 
Multiple currency support in dashboard
 2015-01-22 15:33:04 +02:00
Hillel Coren
6648a32dc4 Minor styling fix 2015-01-22 15:32:54 +02:00
Sang, Le Thanh
9d6c1d3692 Update Average invoice block support multiple currency 2015-01-22 16:52:26 +07:00
Sang, Le Thanh
087fea1f24 Multiple currency support in dashboard 2015-01-22 16:31:43 +07:00
Hillel Coren
7b6e2086eb Bug fixes 2015-01-22 11:23:52 +02:00
Hillel Coren
7364dcf8fc Bug fixes 2015-01-20 09:45:11 +02:00
Hillel Coren
2d8823db7c Bug fixes 2015-01-15 12:52:09 +02:00
Hillel Coren
c67129a6a9 Bug fixes 2015-01-15 12:50:16 +02:00
Hillel Coren
e2a9079fec Merge pull request #212 from sanglt/master 
Add VietNamDong and Ho Chi Minh timezone
 2015-01-15 12:50:00 +02:00
Sang, Le Thanh
29331a1352 Using VND for symbol 2015-01-15 13:13:45 +07:00
Sang, Le Thanh
f5f23bc079 Change VND symbol into UTF-8 code 2015-01-15 13:07:04 +07:00
Hillel Coren
310bd2bdbc Updating code to PSR-2 guidelines 2015-01-11 14:30:08 +02:00
Hillel Coren
0948b46ea2 Bug fixes 2015-01-11 13:56:58 +02:00
Sang, Le Thanh
1e4bff758e Using currect symbol U+20AB for Dong sign, and revert precision back to 2 number 2015-01-09 08:02:55 +07:00
Sang, Le Thanh
3cb64166bc Add VietNamDong and Ho Chi Minh timezone 2015-01-08 17:14:07 +07:00
Maxim
2ce4ca22ed Add New Zealand Dollar 2014-12-19 00:26:39 +10:00
Hillel Coren
1be9fe69b7 Minor changes 2014-12-14 16:55:13 +02:00
Hillel Coren
f81364d7cc Updated Rupee symbol 2014-12-08 15:41:57 +02:00
Hillel Coren
9532588af5 Minor bug fix 2014-12-07 14:36:04 +02:00
Hillel Coren
8f201e062f Composer install [trigger:composer] 2014-12-07 10:53:27 +02:00
Hillel Coren
b6d6758169 Minor bug fixes 2014-12-07 10:47:58 +02:00
Hillel Coren
dcc852eafa Enabled fixed amount discounts 2014-12-04 00:05:38 +02:00
Hillel Coren
6b519f6833 Working on self host setup page 2014-12-01 21:43:59 +02:00
Hillel Coren
e0aad0e248 Bug fix related to the selected currency 2014-11-30 18:32:48 +02:00
Hillel Coren
2295a64bff Implemented setup page 2014-11-28 15:34:01 +02:00
Hillel Coren
a739429005 Minor tweaks 2014-11-27 12:55:09 +02:00
Hillel Coren
4866e19d88 Added new payment providers 2014-11-25 20:40:54 +02:00
Hillel Coren
b80685b7e4 Minor tweaks 2014-11-25 19:35:29 +02:00
Hillel Coren
f43d52005e Enabled restoring entities 2014-11-23 23:47:10 +02:00
Hillel Coren
8930265447 Set logoImageUrl and borderColor for payment settings optional 2014-11-23 11:15:30 +02:00
Hillel Coren
722e29cc2f Added Australian Dollar 2014-11-22 19:51:47 +02:00
Hillel Coren
891b6c42e2 Fix #199 - migrations problem for sqlite 2014-11-22 19:41:20 +02:00
Hillel Coren
7ebd690852 Registering new sign ups 2014-11-19 21:51:53 +02:00
Hillel Coren
680b67bf7b Streamlined pro upgrade process 2014-11-17 00:23:11 +02:00
Hillel Coren
d71043a2ba Text changes 2014-11-16 23:27:02 +02:00
Hillel Coren
6d02510bb3 Updated texts and resolved multi-contact bug 2014-11-16 23:09:18 +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
d33009b839 Added Philippine Peso and Indian Rupee 2014-11-11 19:55:41 +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
Hillel Coren
1f8a24dbe6 Merge pull request #194 from mindnervestech/master 
dashboard page changes
 2014-11-11 19:28:26 +02:00
Hillel Coren
8317b0349f Minor bug fixes 2014-11-11 10:29:43 +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
6fc91d165e Set invoice date to today when cloning 2014-11-09 21:42:31 +02:00
Hillel Coren
6a00a11e96 Changes to support DMARC for emails 2014-11-09 18:32:09 +02:00
Hillel Coren
555245be33 Minor bug fixes 2014-11-09 18:14:47 +02:00
Hillel Coren
fac4b6a7aa Fixed issue when marking quote as sent 2014-11-08 21:35:02 +02:00
Hillel Coren
257c4342f1 Merging pull#192 2014-11-08 20:56:10 +02:00
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
140fec4b80 Addeded texts to language files 2014-11-04 20:48:17 +02:00
Hillel Coren
365a7f08e6 Addeded texts to language files 2014-11-04 20:47:43 +02:00
Hillel Coren
aa436d824d Addeded texts to language files 2014-11-04 20:38:47 +02:00
Hillel Coren
a767f84908 Minor fixes 2014-11-04 20:32:18 +02:00
Hillel Coren
089f8ee2c5 Merge pull request #187 from mindnervestech/master 
home page png and payments
 2014-11-04 16:51:29 +02:00
Patrick Samson
0148407a40 Contacts last_login column should be nullable 2014-11-03 19:44:12 -05:00
Patrick Samson
92d1d6562d Fixed SQL query on dashboard 
It did not work properly before on Postgres
 2014-11-03 19:31:28 -05:00
mindnervestech
f3fb10d33a home page 2014-11-03 15:26:49 +05:30
Troels Liebe Bentsen
33bb86ee85 Merge branch 'master' of github.com:tlbdk/invoice-ninja 
Conflicts:
	app/lang/en/texts.php
 2014-11-02 18:56:58 +01:00
Troels Liebe Bentsen
8ba9dcbed9 Merge branch 'master' of github.com:tlbdk/invoice-ninja 2014-11-02 18:55:33 +01:00
Hillel Coren
3035cdba65 Setting mail pretend default to false 2014-11-02 14:53:56 +02:00
Hillel Coren
e8dad88d15 Minor fixes 2014-11-02 14:47:28 +02:00
Hillel Coren
dbbb4eb722 Minor fixes 2014-11-02 14:46:18 +02:00
Troels Liebe Bentsen
92a7b087b0 Disable timesheet route for push request 2014-10-31 17:28:40 +01:00
Troels Liebe Bentsen
32d942b2b4 Add some better test data 2014-10-31 17:28:26 +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
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
d5adfb6625 Bug fixes 2014-10-29 13:45:41 +02:00
Hillel Coren
4dee69de54 Merge pull request #185 from installtech/patch-2 
Some more French translations
 2014-10-27 10:36:34 +02:00
Hillel Coren
198a13aa4c Bug fixes 2014-10-26 22:13:50 +02:00
Aïssa
729618015c Some more French translations 2014-10-26 18:58:59 +01:00
Hillel Coren
8cae66c2ff Bug fixes 2014-10-26 10:42:02 +02:00
Hillel Coren
8d623db294 Updating language files 2014-10-25 20:32:28 +03:00
Hillel Coren
9df6a5a98c Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-10-24 13:49:13 +03:00
Hillel Coren
cc6c6194c6 Added support for additional invoice designs 2014-10-24 13:48:59 +03:00
Hillel Coren
5d105ca4dd Merge pull request #183 from installtech/patch-1 
Some French translations
 2014-10-23 09:37:16 +03:00
Aïssa
dbbd95a8fa Translations 2014-10-22 22:55:18 +02:00
Aïssa
2ef0cff72b Some French translations 
To be completed
 2014-10-22 17:00:42 +02:00
Hillel Coren
ea429368a8 Moved public texts to resource files 2014-10-21 20:57:06 +03:00
Hillel Coren
cfc6e22241 Working on new invoice designs 2014-10-21 15:10:29 +03:00
Troels Liebe Bentsen
1bca065ca7 Added initial page for the Timesheet controller 2014-10-20 22:30:48 +02:00
Hillel Coren
2ea08cd3df fix #182 - SQLite issue on /get_started 2014-10-20 22:16:21 +03:00
Troels Liebe Bentsen
ae42a5a37a Implement delete handling and do more checks to make sure we dont get corrupted ical files 2014-10-20 20:59:46 +02:00
Troels Liebe Bentsen
68a53db5bb Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2014-10-20 19:10:04 +02:00
Andre-Nam
21f4ac3cab * SQLite issues: added missing default values for columns custom_value1, custom_value2 in table 
invoices
* SQLite issues: corrected NOT NULL constraint violation when seeding gateways
 2014-10-20 18:14:59 +02:00
Hillel Coren
9ac9ebca5a Enabled using date variables for non-recurring invoices 2014-10-19 23:22:18 +03:00
Hillel Coren
39eda076c1 Merge pull request #179 from wanchopeblanco/master 
Improved the spanish translation
 2014-10-19 23:10:23 +03:00
Hillel Coren
76e9f107e7 Added support for a demo account 2014-10-19 23:03:57 +03:00
wanchopeblanco
2a7185b5ce Improved the spanish translation 
Some more improvements for the spanish translation.
 2014-10-19 14:08:57 -05:00
Hillel Coren
1b71aa6fcb fix #168 - Allow :MONTH, :QUARTER or :YEAR for products even when the invoice is not recurring 2014-10-19 21:32:10 +03:00
Hillel Coren
3d6ed21adc Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-10-19 21:21:09 +03:00
Hillel Coren
de7f2d5bbd Added payment gateway help/sign-up links 2014-10-19 21:20:59 +03:00
wanchopeblanco
4fec739d37 Added Factura de Venta 
To comply to Colombias law invoice should translate to "Factura de Venta"
 2014-10-19 12:32:44 -05:00
wanchopeblanco
52d9a2dcf2 Improved the spanish translation 
It still need some more improvement, im working on it.
 2014-10-19 12:27:31 -05:00
Hillel Coren
ad8d5df8d5 fix #171 - Quote to invoice should change the Prefix and the number 2014-10-19 19:44:20 +03:00
Hillel Coren
8410ad9dc9 fix #170 - Live PDF not rendered when using logo 2014-10-19 19:37:25 +03:00
Hillel Coren
c879293b14 Added Spanish translation 2014-10-19 17:32:27 +03:00
Hillel Coren
c51b93072a Fixed bug where the incorrect credit balance was updated 2014-10-19 13:13:55 +03:00
pbergsmann
34e1d4e20d [BUGFIX] Wrong usage of use statement 
Resolves errors like "The use statement
with non-compound name 'Client' has no effect"
 2014-10-17 16:21:12 +02:00
Troels Liebe Bentsen
9d021f93a2 Added TODO 2014-10-16 23:54:02 +02:00
Troels Liebe Bentsen
666b815917 Finish danish translation 2014-10-16 11:13:31 +02:00
Troels Liebe Bentsen
79908e75eb Link project to client so we get some default when adding to an invoice 2014-10-15 01:50:03 +02:00
Troels Liebe Bentsen
acd5b7118e Disable tax code default until its an option 2014-10-15 01:45:57 +02: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
71d161e654 Add vat_number to client also 2014-10-15 01:31:15 +02:00
Troels Liebe Bentsen
792bf47419 Convert to UTF8 2014-10-15 01:30:04 +02:00
Troels Liebe Bentsen
5b4c93c5d4 Start work on danish translation 2014-10-15 01:07:55 +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
Troels Liebe Bentsen
7f288e224d Added vat_number to clients table also 2014-10-14 23:47:33 +02:00
Hillel Coren
919f13b0d4 Enabled manually setting invoices and quotes as sent 2014-10-14 22:04:48 +03: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
7c24a34b6d Working on invoice design page 2014-10-12 21:19:40 +03:00
Hillel Coren
9770e6a1d5 Working on invoice design page 2014-10-12 21:11:41 +03:00
Troels Liebe Bentsen
a32431c223 Added fixme 2014-10-07 23:41:25 +02:00
Troels Liebe Bentsen
2db6fb6afd Did more work on update logic and added timing 2014-10-07 23:37:06 +02:00
Troels Liebe Bentsen
6e59fc85df Disable truncation 2014-10-07 00:00:57 +02:00
Troels Liebe Bentsen
090f0c9c55 Fix uid handling and other errors 2014-10-06 23:59:32 +02:00
Troels Liebe Bentsen
bad9f8bf0b Update ide helpers and remember to include new utils class 2014-10-06 20:43:37 +02:00
Troels Liebe Bentsen
28b5b5f9c2 Refactor code and do more work on import function 2014-10-06 20:42:07 +02:00
Hillel Coren
4f3e9ee935 Set canonical link 2014-10-06 10:46:35 +03:00
Troels Liebe Bentsen
56a296f103 Support sequences 2014-10-06 03:20:47 +02:00
Troels Liebe Bentsen
81c4adfaa4 More work on the event importer and fix some module issues 2014-10-06 03:00:31 +02:00
Hillel Coren
e8b5317f2e Added d3 to js folder 2014-10-06 00:31:14 +03:00
Hillel Coren
d5ac64bf65 Fixed typo 2014-10-06 00:13:54 +03:00
Hillel Coren
70b409184a Version check and news feed messages 2014-10-06 00:00:42 +03:00
Troels Liebe Bentsen
8382b669a9 Convert to foreach loop 2014-10-05 15:49:56 +02: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
a4e949daec Added payment confirmation email for license purchases 2014-10-05 14:55:59 +03:00
Hillel Coren
051aec19c0 Back-fill migrations table for dbs created with the database.sql file 2014-10-05 13:18:42 +03:00
Hillel Coren
48064313cc Working on d3 viz 2014-10-05 12:35:51 +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
Hillel Coren
b3a0b6f83d Adding test data 2014-10-03 02:37:06 +03:00
Hillel Coren
00a8f66a9f Adding test data 2014-10-03 02:15:20 +03:00
Hillel Coren
8e5b8b9596 Adding test data 2014-10-03 02:13:01 +03:00
Hillel Coren
a8dac34c16 Adding test data 2014-10-03 02:08:46 +03:00
Hillel Coren
9c71be5fb6 Adding test data 2014-10-03 02:05:47 +03:00
Hillel Coren
7773b2bd64 Adding test data 2014-10-03 02:01:41 +03:00
Hillel Coren
2eee5bcd85 Adding test data 2014-10-03 02:00:35 +03:00
Hillel Coren
819c9076cd Adding test data 2014-10-03 01:54:45 +03:00
Hillel Coren
35771d48a2 Adding test data 2014-10-03 01:44:20 +03:00
Hillel Coren
17653cc252 Adding test data 2014-10-03 01:36:25 +03:00
Hillel Coren
57341cfe40 Adding test data 2014-10-03 01:31:01 +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
713d15aa2c Rename table and make sure we delete and create in correct order 2014-10-01 03:14:17 +02:00
Troels Liebe Bentsen
be68e45a13 fix naming of table 2014-10-01 03:03:54 +02:00
Troels Liebe Bentsen
6b9b3fd317 Added models for the TimeSheet migration 2014-10-01 03:01:41 +02:00
Troels Liebe Bentsen
198c7dde3e Start working on TimeSheet feature 2014-10-01 02:47:09 +02:00
Troels Liebe Bentsen
5613f39ce5 Start working on TimeSheet feature 2014-10-01 02:46:35 +02:00
Hillel Coren
8133482d19 Commented out url reset 2014-09-30 17:03:16 +03:00
Troels Liebe Bentsen
89ab09f90c Add ide helper and do composer update and fix reference for Former so it does not pull in too new version of laravel 2014-09-30 12:26:47 +02:00
Troels Liebe Bentsen
4ad8ef70d7 Default to first tax rate 2014-09-30 12:24:53 +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
c535afa5ed Added webbased update support 2014-09-28 13:37:54 +03:00
Hillel Coren
767dfe5ec7 Updated version 2014-09-17 09:27:25 +03:00
Hillel Coren
539d86770e Prevented text in inputs from wrapping 2014-09-17 09:26:01 +03:00
Hillel Coren
f6ac344c3f Added Candian Dollar 2014-09-15 12:27:21 +03:00
Hillel Coren
74b680ef87 Added the ability to cancel an account 2014-09-14 15:26:51 +03:00
Hillel Coren
47edf3f565 Changed additional user emails to be sent from primary user name\email 2014-09-14 14:46:59 +03:00
Hillel Coren
0c2b75a324 Resolved issue updating company details as additional user 2014-09-14 14:39:15 +03:00
Hillel Coren
f8c2edc0dc Enabled updating accepted credit cards without re-entering payment credentials 2014-09-14 10:33:34 +03:00
Hillel Coren
2995814927 Added archived data to the dashboard calculations 2014-09-14 09:05:16 +03:00
Hillel Coren
213579ff34 Bug fixes 2014-09-14 00:13:09 +03:00
Hillel Coren
b0942449bb Changed from address when sending from yahoo or aol accounts 2014-09-12 15:11:59 +03:00
Hillel Coren
84cf760785 Added confirm when saving recurring invoice 2014-09-12 00:28:36 +03:00
Hillel Coren
f5b16c82ad Text changes 2014-09-06 23:40:51 +03:00
Hillel Coren
5c7d0a159a Adding Norwegian to lang table 2014-08-31 23:22:47 +03:00
Hillel Coren
6716f8a3ab Version and text changes 2014-08-31 22:39:22 +03:00
Hillel Coren
77b055aff8 Fixed recurring invoices client balance 2014-08-31 22:01:20 +03:00
Hillel Coren
9ca974e49e Changed url constant for footers 2014-08-31 21:18:42 +03:00
Hillel Coren
a2d65a7b81 Merge pull request #158 from sdebacker/master 
Compatibility with MySQL STRICT_TRANS_TABLE + removed some hardcoded urls, fixes #157
 2014-08-31 21:13:34 +03:00
Troels Liebe Bentsen
a09a563219 Fix CSS errors 2014-08-29 23:24:02 +02:00
Hillel Coren
8923065426 Merging chages 2014-08-26 13:59:13 +03:00
Hillel Coren
8a56575eda Tracking activity when invoice is archived 2014-08-26 13:57:44 +03:00
Samuel De Backer
47455dc058 Hardcoded urls removed in mail templates 2014-08-26 10:39:17 +02:00
Samuel De Backer
3273eea39f 3 constants taken from config 2014-08-26 10:37:47 +02:00
Samuel De Backer
30c65f4a23 simpler short conditionnal 
“Since PHP 5.3, it is possible to leave out the middle part of the
ternary operator. Expression expr1 ?: expr3 returns expr1 if expr1
evaluates to TRUE, and expr3 otherwise.”
http://php.net/manual/en/language.operators.comparison.php
 2014-08-26 10:36:53 +02:00
Samuel De Backer
8edb063b30 default integer value for payment_terms 
Because sending an empty string to a integer column is not allowed with
MySQL in STRICT_TRANS_TABLE mode.
 2014-08-26 10:32:14 +02:00
Samuel De Backer
686be0852b nullable added to some fields 2014-08-26 10:30:45 +02:00
Samuel De Backer
bb4b14e49c Client import, create invoice with STRICT_TRANS_TABLE 2014-08-25 23:26:17 +02:00
Samuel De Backer
17ab45014a Migrations for accounts and users tables 
Now when clicking on INVOICE NOW, we can reach first step of a new
invoice creation even with MySQL 5.6 default STRICT_TRANS_TABLE.
 2014-08-25 22:31:45 +02:00
Samuel De Backer
620b09ccc8 Seeding ok with MySQL STRICT_TRANS_TABLE, fixes #157 2014-08-25 22:00:15 +02:00
Harald
6f1e874b90 Norwegian language update. 
Fixed some format issues.
 2014-08-25 02:08:32 +02:00
Harald
5ece9cf684 Norwegian language updated. 
All language files now translated into Norwegian. Keep in mind that this
is the first complete translation and it may be some discrepancies.
 2014-08-25 01:58:12 +02:00
Harald
4a7738b727 Norwegian language update 2014-08-25 01:31:34 +02:00
Harald
cf3143eaec Added Norske Kroner 2014-08-24 01:29:19 +02:00
Harald
3abb7dbbda Norwegian language update 2014-08-24 01:08:50 +02:00
Harald
05dd67377d Norwegian language update 2014-08-23 22:45:32 +02:00
Harald
86a60025ef Norwegian language update 2014-08-23 22:21:51 +02:00
Harald
2a485f02f0 Norwegian language update 2014-08-23 22:06:33 +02:00
Harald
698d42c7e8 Norwegian language added 
Started translating into Norwegian
 2014-08-23 21:48:34 +02:00
Hillel Coren
1f29dcd7ed Text changes 2014-08-05 17:22:51 +03:00
Hillel Coren
6662950e51 Fixed issue when setting payment API key 2014-08-04 06:34:53 -07:00
Hillel Coren
0da7a1a6d1 Added Swedish Krona 2014-08-04 16:14:18 +03:00
Hassen Ben Tanfous
e5dabc0969 fixes typo "crated" instead of "created" 2014-08-01 15:51:11 -04:00
Hillel Coren
77289e270e Change to license page 2014-07-30 20:33:57 +03:00
Hillel Coren
bb560778af Working on API 2014-07-30 10:08:01 +03:00
Hillel Coren
67046b39de Working on API 2014-07-30 10:07:41 +03:00
Hillel Coren
9feb616f1b Added support for Zapier 2014-07-27 23:31:41 +03:00
Hillel Coren
360d3d4f8d Updating text files 2014-07-23 23:35:17 +03:00
Hillel Coren
0123ee36a2 Working on multi-user support 2014-07-23 23:28:40 +03:00
Hillel Coren
f431426469 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-07-23 18:03:09 +03:00
Hillel Coren
051ba95b7b Working on multi-user support 2014-07-23 18:02:56 +03:00
Hillel Coren
e9391c9d68 Merge pull request #146 from chernjie/SGD 
Added SG phone number support
 2014-07-23 15:34:58 +03:00
CJ
2d3ef1e4a8 Fix SG vs US phone country/area code clashes 2014-07-23 02:17:49 +08:00
Hillel Coren
d0ee8f5b6c Merge pull request #147 from chernjie/SGD_currency 
Added SGD currency
 2014-07-21 11:19:31 +03:00
CJ
e6c78e3621 Added SGD currency 2014-07-21 10:53:54 +08:00
CJ
9f7b8e6c38 Added SG phone number support 2014-07-21 10:52:47 +08: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
eafaa4c8d2 Bug fixes 2014-07-16 00:12:32 +03:00
Hillel Coren
9427f5180f Working on self hosting 2014-07-15 23:36:40 +03:00
Hillel Coren
5821f3542d Working on self-hosted 2014-07-07 09:45:13 +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
ad5dc0f5c9 Revert fix as it does not work correctly 2014-07-07 00:42:21 +02:00
Troels Liebe Bentsen
5d05eec037 Wrap gateway logos in asset() so we can host under /appname/ without issue 2014-07-04 22:23:49 +02:00
Troels Liebe Bentsen
24d2357799 Make sure we default to the correct tax rate 2014-07-04 21:46:13 +02:00
Troels Liebe Bentsen
5ad67f55e1 Disable commercial website unless it has NINJA_PROD or NINJA_DEV env set 2014-07-04 20:07:31 +02:00
Troels Liebe Bentsen
6a4fae2e2b Extend the documentation to be more detailed and add section on Ubuntu 2014-07-04 17:59:00 +02:00
Hillel Coren
f1d2444cc9 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-06-30 14:42:46 +03:00
Hillel Coren
a787427688 Bug fixes 2014-06-30 14:42:25 +03:00
Hillel Coren
4d454d9a79 Merge pull request #139 from aggepagge/master 
Show previously selected credit cards
 2014-06-30 12:01:20 +03:00
aggepagge
a04127cd48 Show previously selected credit cards 2014-06-30 00:14:17 +02:00
aggepagge
df89ed41a8 Show previously selected credit cards 2014-06-30 00:11:31 +02:00
Hillel Coren
ada7246b2b Bug fixes 2014-06-29 20:23:10 +03: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
92fdf49c10 validate and save to account_gateways 2014-06-23 22:31:21 +02:00
aggepagge
0f6e374402 added functionallity to company/payments page 2014-06-23 04:15:24 +02: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
1456a62024 Updated FAQ 2014-06-16 17:05:39 +03:00
Hillel Coren
1892e3f413 Bug fixes 2014-06-16 01:13:31 +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
Hillel Coren
457a8d8078 Merge pull request #131 from raziraz/master 
New menu and mobile menu
 2014-06-15 21:50:11 +03:00
seamofreality
17a5ca387c Update texts.php 
Could you tell me in which context you're using quote_total and total?
 2014-06-14 14:56:26 +02: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
Zaldor
943ef1c1e0 Update texts.php 
Completed italian translation
 2014-06-12 12:19:08 +02:00
Hillel Coren
6246ff2933 Blank commit 2014-06-09 09:38:25 +03:00
Hillel Coren
0b23a2c203 Made features visisble 2014-06-09 09:36:07 +03:00
Hillel Coren
cdd4ffde68 Bug fixes 2014-06-04 23:41:34 +03:00
Hillel Coren
a5f991870c Bug fixes 2014-06-02 19:21:47 +03: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
c9b7f79d7c Bug fixes 2014-05-26 12:43:46 +03:00
Hillel Coren
0097f0c192 Bug fixes 2014-05-26 09:24:37 +03:00
Hillel Coren
0f5adbf62a Bug fixes 2014-05-25 21:38:40 +03:00
Hillel Coren
d4c31e3bbe Bug fixes 2014-05-25 19:23:07 +03:00
Hillel Coren
36114d251f Bug fixes 2014-05-25 17:48:00 +03:00
Hillel Coren
3b4220cede Bug fixes 2014-05-25 17:25:58 +03:00
Hillel Coren
af5f659d24 Bug fixes 2014-05-25 16:55:47 +03:00
Hillel Coren
f515d57669 Bug fixes 2014-05-25 16:40:09 +03:00
Hillel Coren
18bd38f5b6 Bug fixes 2014-05-25 13:57:19 +03:00
Hillel Coren
380d7e0a4a Bug fixes 2014-05-22 21:29:29 +03:00
Hillel Coren
8049a27beb Working on quotes 2014-05-21 00:40:09 +03:00
Hillel Coren
ca4a3f24b7 Bug fixes 2014-05-20 09:59:33 +03:00
Hillel Coren
aa3a3f174f Working on quotes 2014-05-17 22:29:57 +03:00
Hillel Coren
a14e00d520 Text changes 2014-05-15 17:57:07 +03:00
Hillel Coren
c6f0d9e71e Secure payment design 2014-05-14 01:17:33 +03:00
Hillel Coren
c357f4a278 Redesign of the payment page 2014-05-14 00:53:41 +03:00
Hillel Coren
fd99dd122c Fixed date picker in chart builder 2014-05-14 00:04:42 +03:00
Hillel Coren
ebac75ee4f Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-05-13 23:24:46 +03:00
Hillel Coren
2431c3828b Working on API 2014-05-13 23:24:40 +03:00
Hillel Coren
89b638b620 Merge pull request #120 from raziraz/master 
About page, Secure payment page, footer
 2014-05-13 23:23:49 +03:00
Hillel Coren
d42712204c Working on API 2014-05-13 22:48:02 +03:00
Hillel Coren
561907ae60 Starting on the API 2014-05-13 22:20:54 +03:00
Razi KAntorp
4b45f5adc8 About page, Secure payment page, footer 2014-05-13 20:21:14 +02:00
Hillel Coren
38008fa5c2 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-05-13 17:05:41 +03:00
Hillel Coren
7d6587a5ff Redesign of the payment page 2014-05-13 17:05:26 +03:00
Razi KAntorp
cfdf41afbd Merge remote-tracking branch 'upstream/master' 2014-05-12 13:34:31 +02:00
Hillel Coren
71bc52f724 Working on secure payment page 2014-05-12 14:10:42 +03: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
683dacdc37 Bug fixes 2014-05-11 22:40:46 +03:00
Hillel Coren
113665da1e Updating texts 2014-05-11 21:24:30 +03:00
Hillel Coren
4f732386eb Added email footer 2014-05-11 20:14:44 +03:00
Hillel Coren
4d2473dc9f Added goal tracking 2014-05-09 16:28:20 +03:00
Hillel Coren
aa7542c2fa Text changes 2014-05-08 22:24:34 +03:00
Hillel Coren
6bdc9e9eb9 Working on advanced settings 2014-05-08 22:19:33 +03:00
Hillel Coren
7b86aea0a7 Enabled setting the transaction reference field when creating a payment 2014-05-08 20:16:00 +03:00
Hillel Coren
cde2da6f6c Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-05-06 21:24:55 +03:00
Hillel Coren
31e1296c5e Text changes 2014-05-06 21:24:49 +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
fc15b438e0 Merge remote-tracking branch 'upstream/master' 2014-05-05 18:14:51 +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
seamofreality
5735f3eb3e Update texts.php 2014-05-05 12:46:29 +02:00
Hillel Coren
c5f725fe17 Text changes 2014-05-05 01:00:33 +03:00
Hillel Coren
c9ee2bc247 Bug fixes 2014-05-04 23:01:02 +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
a20ddd1f45 Text changes 2014-05-04 16:07:45 +03:00
Hillel Coren
9dbfe94e95 Bug fixes 2014-05-04 12:11:08 +03:00
Hillel Coren
0208ea1e75 Bug fixes 2014-05-01 22:54:02 +03:00
Hillel Coren
6912b04063 Bug fixes 2014-05-01 22:02:36 +03:00
Hillel Coren
a4a66cba63 Merge pull request #108 from whitebook/master 
fixed invoice payment calculations
 2014-05-01 21:14:30 +03:00
Hillel Coren
668fbd47fa Bug fixes 2014-05-01 20:20:52 +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
eebcdf57c0 Adding custom invoice colors 2014-04-29 23:51:15 +03:00
Hillel Coren
3e26880561 Adding custom invoice colors 2014-04-29 23:46:40 +03:00
Hillel Coren
19a11a3cd8 Bug fixes 2014-04-29 16:45:00 +03:00
Hillel Coren
a60f37fa03 Adding version 2014-04-29 11:37:53 +03:00
Hillel Coren
263c6722c8 Bug fixes 2014-04-29 11:32:18 +03:00
Hillel Coren
f3e88a3923 Bug fixes 2014-04-29 10:25:58 +03:00
Hillel Coren
fca1078401 Working on Grunt support 2014-04-28 23:22:55 +03:00
Hillel Coren
67a494c537 Working on Grunt support 2014-04-28 23:15:09 +03:00
Hillel Coren
11f83ce5fa Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-04-28 23:05:51 +03:00
Hillel Coren
113cf9b482 Adding Grunt for file concat 2014-04-28 23:05:37 +03:00
rollbrettler
e9d711ec0c fixed a small typo 2014-04-28 21:23:32 +02:00
Hillel Coren
8595ba6113 Bug fixes 2014-04-28 01:07:45 +03:00
Hillel Coren
948af3b3bd Bug fixes 2014-04-27 16:40:22 +03:00
Hillel Coren
9658f557e8 Bug fixes 2014-04-27 16:28:23 +03:00
Hillel Coren
0ef559562e Bug fixes 2014-04-27 16:22:03 +03:00
Hillel Coren
f3e6bc14a5 Bug fixes 2014-04-27 08:58:39 +03:00
Hillel Coren
c5aee51ecc Bug fixes 2014-04-27 01:02:13 +03:00
Hillel Coren
ec7dd89936 Bug fixes 2014-04-26 22:35:14 +03:00
Hillel Coren
b0091bd27b Bug fixes 2014-04-26 22:00:31 +03:00
Hillel Coren
93740713c1 Bug fixes 2014-04-25 18:37:08 +03:00
Hillel Coren
5fcfa2e2ca Text changes 2014-04-25 16:15:13 +03:00
Hillel Coren
805f5cf189 Text changes 2014-04-25 16:04:57 +03:00
Hillel Coren
fc8c4610c7 Text changes 2014-04-25 12:11:20 +03:00
Hillel Coren
61ac8739eb Text changes 2014-04-25 12:09:58 +03:00
seamofreality
9dd5d75eb0 Update texts.php 2014-04-25 10:59:58 +02:00
Hillel Coren
4c52e91b58 Text changes 2014-04-24 13:24:51 +03:00
Hillel Coren
5ca44ca4e1 Adding plans page 2014-04-24 11:46:44 +03:00
Hillel Coren
0922b97567 Working on products 2014-04-24 01:04:21 +03:00
Hillel Coren
2c4d635432 Working on products 2014-04-24 00:48:09 +03:00
Hillel Coren
6e86f1904a Working on product management 2014-04-23 23:30:54 +03:00
Hillel Coren
9b149189fb Bug fixes 2014-04-23 16:46:52 +03:00
Hillel Coren
1d0f6bf27a Bug fixes 2014-04-23 16:04:40 +03:00
Hillel Coren
a4f7789e97 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-04-23 16:02:29 +03:00
Hillel Coren
ffcff14c26 Bug fixes 2014-04-23 16:02:24 +03:00
Hillel Coren
f28e536325 Bug fixes 2014-04-23 15:47:44 +03:00
Hillel Coren
55a8ef4951 Bug fixes 2014-04-23 10:20:01 +03:00
Hillel Coren
b11ab39a9f Bug fixes 2014-04-22 23:10:14 +03:00
Hillel Coren
4a7432cc41 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-04-22 18:10:55 +03:00
Hillel Coren
4c621758f1 Added bower depedancies to codebase 2014-04-22 18:10:41 +03:00
Hillel Coren
2a8b25b208 Merge pull request #90 from blkmutt/master 
Added validation to prevent saving of masked fields.
 2014-04-22 18:09:37 +03:00
Hillel Coren
9683f1d1b5 Custom fields 2014-04-22 00:39:42 +03:00
Hillel Coren
add9cb1569 Bug fixes 2014-04-22 00:25:40 +03:00
Hillel Coren
01ec2cb838 Working on custom fields for pro plan 2014-04-18 11:57:31 +03:00
Hillel Coren
0d912373e7 Bug fixes 2014-04-17 18:20:01 +03:00
Hillel Coren
a6bd9d30be Added warning when leaving page with unsaved work 2014-04-17 17:48:56 +03:00
Hillel Coren
016b21584e Bug fixes 2014-04-16 16:26:23 +03:00
pierrefaure
092add7f8f Update texts.php 
// client view page && // payment pages && // account/company pages && // application messages && // Emails && // Payment page && // Security alerts && // Pro Plan
 => OK
 2014-04-15 21:52:57 +02:00
pierrefaure
7a09d07ddd Update texts.php 
// list pages => OK
 2014-04-15 00:50:58 +02: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
blkmutt
55d1ec415c Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 
Merged from parent.
 2014-04-13 21:55:40 -04:00
blkmutt
33b90241a2 Updated validation to avoid saving masked fields. 2014-04-13 21:54:01 -04:00
pierrefaure
43a7e236f3 Update texts.php 
// recurring invoices && // dashboard => OK
 2014-04-13 17:48:56 +02:00
Hillel Coren
777c4a6240 Working on pro plan 2014-04-13 16:38:07 +03:00
Hillel Coren
3a50fd6aa2 Working on pro plan 2014-04-13 16:34:58 +03:00
blkmutt
a7e0ca0d60 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 
Received PHP-Payments directory from parent.
 2014-04-13 07:06:24 -04:00
blkmutt
bd73fa5b54 Updated validation to fail if values are all asterisks. 2014-04-13 07:05:29 -04:00
Hillel Coren
c557276a6e Working on pro plan 2014-04-13 11:19:10 +03:00
Hillel Coren
75a1fd3240 Working on pro plan 2014-04-13 08:29:29 +03:00
Hillel Coren
dfd4de33bd Working on pro plan 2014-04-13 08:28:16 +03:00
blkmutt
ebcbbf65ff Updated copy in 'other'option on payments page. 2014-04-12 19:01:38 -04:00
blkmutt
0143881732 Created 'other' option on payments page, showed and hid dropdown, accordingly. 2014-04-12 18:49:18 -04:00
Hillel Coren
40ee3c8b40 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-04-12 21:55:56 +03:00
Hillel Coren
944ef2ccd3 Working on pro plan 2014-04-12 21:55:40 +03:00
blkmutt
381d2604b0 Updated Account Controller to work when no present payment libraries are in use. 2014-04-10 20:09:57 -04:00
blkmutt
7c39574720 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 
Merged from parent.
 2014-04-10 19:34:27 -04:00
Hillel Coren
3cfa9a5ce5 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-04-10 22:29:13 +03:00
Hillel Coren
7bf470b9b1 Bug fixes 2014-04-10 22:29:01 +03:00
blkmutt
008eb31643 Removed extra payment libraries 2014-04-10 13:39:23 -04:00
Hillel Coren
b59b730c67 Merge pull request #83 from SergeyDruid/master 
Update texts.php
 2014-04-10 15:32:05 +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
blkmutt
a952d90c24 Updated Payments and routes to support additional PHP-Payments gateways. Masked account info on payments page. 2014-04-09 22:33:32 -04:00
Joel Limberg
bd0e2ffe55 Fix "DEFAULT_LOCALE" constant spelling 
Was “DEFUALT_LOCALE”
 2014-04-10 00:53:09 +03:00
Hillel Coren
ecec87668a Working on issues when setting up the site 2014-04-09 19:49:18 +03:00
SergeyDruid
50f4df54b3 Update texts.php 2014-04-09 15:15:43 +02:00
Hillel Coren
c61a572314 Resolving issues settng up the site 2014-04-09 15:23:00 +03:00
Hillel Coren
b6353d30aa Merge pull request #82 from SergeyDruid/master 
Update texts.php
 2014-04-09 15:12:00 +03:00
Hillel Coren
e609b49b2c Fixing some issues getting the site set up 2014-04-09 14:47:25 +03:00
SergeyDruid
b38face3f3 Update texts.php 2014-04-09 09:52:52 +02:00
blkmutt
57c588c3bc Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 
Merged from parent.
 2014-04-08 16:32:25 -04:00
seamofreality
e9bee61cb8 Update texts.php 2014-04-08 18:46:30 +02:00
Hillel Coren
29e83ed0be Merge pull request #79 from pierrefaure/patch-2 
// navigation -> OK
 2014-04-08 09:38:10 +03:00
Thiago Coutinho
16a56c1664 Update texts.php 2014-04-07 22:47:11 -03:00
pierrefaure
c15db27c4c // navigation -> OK 2014-04-08 01:02:23 +02: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
7a359d6db3 Merge pull request #75 from chrisderouck/master 
Updates for dutch text
 2014-04-06 21:29:10 +03:00
blkmutt
fabfb14470 Updated Payment Library checks to use global variables. 2014-04-06 14:24:56 -04:00
Razi KAntorp
7a368e9533 New about page 2014-04-06 19:48:34 +02:00
Chris De Rouck
f5a1af9522 Revision of some texts 2014-04-06 19:30:12 +02:00
Chris De Rouck
ba1d05e950 Dutch update for new text 2014-04-06 18:27:04 +02:00
blkmutt
3c99bebae9 merged from parent 2014-04-06 11:47:22 -04:00
Hillel Coren
cb0444f339 Bug fixes 2014-04-06 13:18:34 +03:00
Hillel Coren
c3b7902e6b Bug fixes 2014-04-06 12:45:39 +03:00
Hillel Coren
e36e5b4247 Bug fixes 2014-04-06 12:41:35 +03:00
Hillel Coren
7fd844de31 Bug fixes 2014-04-06 12:21:59 +03:00
Hillel Coren
6710eba329 Bug fixes 2014-04-06 12:02:04 +03:00
Hillel Coren
bd5472994b Bug fixes 2014-04-06 10:49:32 +03:00
blkmutt
638d26adb8 Updated code to fix issues with BeanStream payments. 2014-04-05 21:49:21 -04:00
Chris De Rouck
8886007edb Minor update 2014-04-05 22:56:02 +02:00
Chris De Rouck
b87daa4cb2 Dutch translation added + fix in english translation 2014-04-05 22:31:25 +02:00
Hillel Coren
5b323e04d7 Adding ability to remove ninja logo 2014-04-04 12:24:56 +03:00
Hillel Coren
8fdb122224 Working on pro plan 2014-04-04 00:13:11 +03:00
Hillel Coren
8e3f602e3a Working on pro plan 2014-04-04 00:12:38 +03:00
Hillel Coren
c49da09f8a Adding language file 2014-04-03 23:05:24 +03:00
Hillel Coren
424f292c66 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-04-03 23:01:34 +03:00
Hillel Coren
7c92ed8530 Bug fixes 2014-04-03 23:01:03 +03:00
seamofreality
d04739c7a4 Update texts.php 
Well, I didn't translate everything, but most of it, and I guess a few could be better.

I was wondering what polite form of address invoice ninja is aiming at?
And also if you'd rather like to use "Kredit" than "Gutschrift" for credit.
 2014-04-03 21:11:06 +02:00
Hillel Coren
3d6530e83f Bug fixes 2014-04-03 20:54:06 +03:00
Hillel Coren
4c1b33f601 Working on multi-language support 2014-04-02 22:03:01 +03:00
Hillel Coren
1b7c885367 Working on multi-language support 2014-04-02 21:20:01 +03:00
Hillel Coren
06edfdd8e5 Working on multi-language support 2014-04-02 16:10:00 +03:00
Hillel Coren
f1f6d67af1 Working on multi-language support 2014-04-02 15:28:23 +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
43198e47f7 Merge remote-tracking branch 'upstream/master' 2014-04-02 11:45:52 +02:00
Hillel Coren
673c30456b Working on multi-language support 2014-04-01 13:30:43 +03: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
Razi KAntorp
7a2c17fe50 Merge remote-tracking branch 'upstream/master' 2014-03-31 13:52:58 +02:00
Hillel Coren
6377d2a91b Bug fixes 2014-03-31 13:52:03 +03: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
blkmutt
5bd1aff573 Updated payment logic with config settings. 2014-03-29 19:42:37 -04:00
Razi KAntorp
7acb1a92c1 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	app/views/clients/edit.blade.php
 2014-03-28 13:53:19 +01:00
Razi KAntorp
6f58d1c63f test 2014-03-28 13:46:19 +01:00
Hillel Coren
2e299aa83f Working on multi-language support 2014-03-27 14:25:31 +02:00
seamofreality
f0dcd5d17c Update fields.php 2014-03-26 20:07:22 +01:00
Fernando Martínez
0e39488fd4 using https://github.com/caouecs/Laravel4-lang/tree/master/es 'official' translations 2014-03-26 09:33:29 -03:00
blkmutt
d20f6d3055 Added extra payment gateways that had not been previously considered. 2014-03-25 21:58:42 -04:00
blkmutt
3ca03eb2b4 Merge branch 'master' into Dev_PHP-Payments 
Merged changes from master.
 2014-03-25 21:21:23 -04:00
blkmutt
7485c01de6 Removed some of the data attributes that I was not using. 2014-03-25 21:07:43 -04:00
blkmutt
33ff8e1d60 Updated account controller, data objects, and logos for recommended gateways. 2014-03-25 20:59:33 -04:00
Fernando Martínez
938dc5d4c0 first draft of spanish translations 2014-03-26 00:16:16 +01:00
Hillel Coren
53f9eef3ca Bug fixes 2014-03-23 22:56:19 +02:00
Hillel Coren
684d856278 Bug fixes 2014-03-23 21:39:18 +02: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
bb6815ba13 Bug fixes 2014-03-23 20:01:00 +02:00
Hillel Coren
2efde97a4e Bug fixes 2014-03-23 19:59:15 +02:00
Hillel Coren
94f5047d46 Bug fixes 2014-03-23 19:55:29 +02:00
Hillel Coren
271f6262fb Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-03-23 19:54:34 +02:00
Hillel Coren
9a592753b2 Bug fixes 2014-03-23 19:54:02 +02:00
pierrefaure
e748ea7cc2 Update fields.php 
Hi,

I'm not sure for line 42 :)
 2014-03-23 18:48:00 +01:00
Hillel Coren
f9bec51b30 Bug fixes 2014-03-23 18:02:33 +02:00
Hillel Coren
c08a46a7da Bug fixes 2014-03-23 17:59:30 +02:00
Hillel Coren
cae88df6d4 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-03-23 17:49:29 +02:00
Hillel Coren
3bbb156124 Bug fixes 2014-03-23 17:49:14 +02:00
blkmutt
af7ba0b7b1 Merge branch 'master' into Dev_PHP-Payments 
Merged changes from master.
 2014-03-23 11:41:21 -04:00
S3NS4Ti0N
951cc78c76 Update fields.php 
added german translation
 2014-03-23 15:28:14 +01:00
blkmutt
6c286b9648 Merge branch 'master' into Dev_PHP-Payments 
Merged changes from master.
 2014-03-23 10:23:55 -04:00
Hillel Coren
c4665f84f0 Bug fixes 2014-03-23 16:23:53 +02:00
blkmutt
b1a525a7f4 Added code for PHP-Payments to payment controller and to JSON for Composer. 2014-03-23 10:22:56 -04: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
58f6c0ff97 Working on multi-language support 2014-03-23 14:21:40 +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
308a75099a Bug fixes 2014-03-23 11:30:48 +02:00
blkmutt
11c6cff7ca Merge branch 'master' into Dev_PHP-Payments 
Merging master into PHP-Payments branch.
 2014-03-21 08:17:51 -04:00
blkmutt
433c51886e Updated migration, seeder, and model files. 2014-03-21 08:16:37 -04:00
blkmutt
c4e629c84f Created database migratioin, updated models, updated .gitignore to ignore a .project file. 2014-03-21 08:15:53 -04:00
Hillel Coren
45a8689bf0 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-03-21 00:12:23 +02:00
Hillel Coren
bb06e31403 Reworking public pages and bug fixes 2014-03-21 00:12:07 +02:00
Thiago Coutinho
33e69f132a Update validation.php 2014-03-20 13:12:53 -03:00
Thiago Coutinho
2ca7259840 Create validation.php 2014-03-20 11:03:06 -03:00
Thiago Coutinho
8bd629e939 Create reminders.php 2014-03-20 10:51:12 -03:00
Thiago Coutinho
3e645b4766 Create pagination.php 2014-03-20 10:46:58 -03:00
Thiago Coutinho
03a0a07347 Update texts.php 2014-03-20 10:45:59 -03:00
Thiago Coutinho
1f00b20b98 Create texts.php 2014-03-20 10:43:22 -03:00
Hillel Coren
ee95cca182 Working on multi-language support 2014-03-20 00:00:56 +02:00
Hillel Coren
6876edc510 Bug fixes 2014-03-19 20:54:27 +02:00
Hillel Coren
a43de0eb6b Bug fixes 2014-03-19 19:53:21 +02:00
Hillel Coren
545412369b Bug fixes 2014-03-19 19:50:00 +02:00
Hillel Coren
7fe26d54e7 Bug fixes 2014-03-19 19:08:02 +02:00
Hillel Coren
e51e85740f Bug fixes 2014-03-19 18:23:50 +02:00
Hillel Coren
68ff18fca2 Bug fixes 2014-03-19 18:20:12 +02:00
Hillel Coren
36cf1810e8 Added sign up popover message 2014-03-19 18:17:26 +02:00
Hillel Coren
dcc68a6c38 Bug fixes 2014-03-19 10:49:33 +02:00
Hillel Coren
0daa3161e3 Enabled off-site payment with PayPal Express 2014-03-19 01:33:13 +02:00
Hillel Coren
b523d6f44d Enabled off-site payment with PayPal Express 2014-03-19 01:28:43 +02:00
Hillel Coren
e80422d030 Merge pull request #40 from ascariandrea/master 
Add stripslashes on invoice terms.
 2014-03-18 23:27:44 +02:00
Hillel Coren
f9a8642909 Bug fixes 2014-03-18 23:25:54 +02:00
Andrea Ascari
b57bb90ccb Merge branch 'master' of github.com:ascariandrea/invoice-ninja 2014-03-18 22:13:44 +01:00
Andrea Ascari
9b6d86a630 Add stripslashes on invoice term 2014-03-18 22:12:36 +01:00
Hillel Coren
0f9f32dd49 Improved logo in PDF 2014-03-18 22:43:12 +02:00
Hillel Coren
48130290ce Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-03-18 20:56:03 +02:00
Hillel Coren
1757dd706d Added ability to remove account logo 2014-03-18 20:55:50 +02:00
Hillel Coren
d47b468e5c Merge pull request #33 from topsitemakers/master 
Fixing the breadcrumbs and minor typo
 2014-03-18 20:54:45 +02:00
Hillel Coren
88b8d97603 Styling changes 2014-03-18 19:03:39 +02:00
Hillel Coren
c3d7a98b4f Fix contact form styling 2014-03-18 19:00:02 +02:00
Topsitemakers
dde02a4fb6 removing the dashboard link from breadcrumbs 2014-03-18 17:35:55 +01: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
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
833da15d45 Bug fixes 2014-03-17 20:09:56 +02:00
Hillel Coren
ccbbf6c6fa Bug fixes 2014-03-17 20:05:01 +02:00
Topsitemakers
af2289206f Fixing the issue with breadcrumbs and subfolders; including the link to dashboard by default on all non-dashboard pages. 2014-03-17 19:03:43 +01:00
Topsitemakers
8d06758734 fixing typo: Recommnded to Recommended 2014-03-17 18:38:19 +01:00
contact@invoiceninja.com
73ac123c36 Text changes 2014-03-17 12:34:06 +02:00
contact@invoiceninja.com
1a3fa14b8b Text changes 2014-03-17 12:04:44 +02:00
contact@invoiceninja.com
7d20c583c7 Merge remote-tracking branch 'upstream/master' 2014-03-17 11:32:38 +02:00
Razi KAntorp
d6e7f19f2f .. 2014-03-14 11:24:40 +01:00
Hillel Coren
cfbfba0ae6 Text changes 2014-03-11 19:42:49 +02:00
Hillel Coren
1d084999fa Text changes 2014-03-11 19:37:54 +02:00
Hillel Coren
013a2103dd bug fixes 2014-03-10 23:55:56 +02:00
Hillel Coren
70c5645088 Fixed issue with datatable sorting [trigger:composer] 2014-03-10 22:56:58 +02:00
Hillel Coren
915e0636c0 Bug fixes 2014-03-10 20:22:40 +02:00
Hillel Coren
dd1178ee16 merging changes 2014-03-10 19:19:47 +02:00
Hillel Coren
7fa754c067 merging changes 2014-03-10 19:05:00 +02:00
Razi KAntorp
d63d7d3b40 Images to about page 2014-03-10 17:58:02 +01:00
Hillel Coren
78be769c8d bug fixes 2014-03-10 13:04:15 +02:00
Hillel Coren
388ca323c8 bug fixes 2014-03-10 08:10:08 +02:00
Hillel Coren
1f5ba56f0f Bug fixes 2014-03-10 00:31:46 +02:00
Hillel Coren
76080fcc69 Working on the invoice designs 2014-03-09 23:19:56 +02:00
Hillel Coren
a035387d86 Updated contact page 2014-03-06 11:51:01 +02:00
Hillel Coren
334428a0e1 bug fixes 2014-03-05 22:56:34 +02:00
Hillel Coren
63a6b88e20 bug fixes 2014-03-05 22:19:12 +02:00
Hillel Coren
a1c7efb919 Merge pull request #23 from raziraz/master 
About page update, image update.
 2014-03-05 17:34:02 +02:00
Razi KAntorp
eb980f2ecc Merge remote-tracking branch 'upstream/master' 2014-03-05 16:06:21 +01:00
Razi KAntorp
71c9ca9961 Addded text to the About page. Hided the blur section on the landing page that coused a blur line over the second large image 2014-03-05 16:05:36 +01:00
Hillel Coren
70b9256ddb bug fixes 2014-03-05 17:03:31 +02:00
Razi KAntorp
cc360e3d57 Contact page 2014-03-05 14:59:13 +01:00
contact@invoiceninja.com
700d9f25f8 Merge remote-tracking branch 'upstream/master' 2014-03-04 12:29:55 +02:00
Hillel Coren
25c42ca044 Merge pull request #19 from raziraz/master 
button update
 2014-03-04 12:29:44 +02:00
Razi KAntorp
64f9951941 Merge remote-tracking branch 'upstream/master' 2014-03-04 11:26:25 +01:00
Razi KAntorp
d898667440 button update 2014-03-04 11:25:29 +01:00
contact@invoiceninja.com
d5b00ff717 Merge remote-tracking branch 'upstream/master' 2014-03-04 09:04:40 +02:00
Hillel Coren
6f87769077 bug fixes 2014-03-03 20:26:45 +02:00
Razi KAntorp
fe9249beb7 Dasboard table headers, golobal button change. 2014-02-27 12:42:23 +01:00
alltheworld
7fc457883c report 3-3 2014-02-27 08:57:59 +02:00
contact@invoiceninja.com
dd69b788cf Text changes 2014-02-26 20:47:11 +02:00
contact@invoiceninja.com
bdbe643eb4 Text changes 2014-02-26 19:00:41 +02:00
shalom
3d9fdbf495 Text changes 2014-02-26 18:57:38 +02:00
Hillel Coren
d6bb0befa0 Added blank contact us page 2014-02-26 18:50:27 +02:00
Razi KAntorp
9d39f6cdaa Added HTML and CSS for About page. 2014-02-26 17:41:08 +01:00
Hillel Coren
1c9c69e611 added about us page 2014-02-26 18:08:40 +02:00
Hillel Coren
162f34e265 added about us page 2014-02-26 16:23:54 +02:00
Hillel Coren
7a896bd307 Merge pull request #12 from raziraz/master 
table color fix, search field fix, account pages update.
 2014-02-26 06:44:50 +02:00
Razi KAntorp
3ac855be6b table color fix, search field fix, account pages update. 2014-02-25 19:10:16 +01:00
alltheworld
4006404f61 report 2 add 2014-02-25 14:54:50 +02:00
Hillel Coren
a21aa75837 bug fixes 2014-02-25 13:52:40 +02:00
Razi KAntorp
4810ddf93e dashboard tweaks, account pages buttons etc 2014-02-23 17:10:56 +01:00
Razi KAntorp
32ae1b23f7 dashboard updates 2014-02-23 15:51:52 +01:00
Razi KAntorp
b406ed79bb modals on create invoice page, changed blue icons on dashboard 2014-02-23 14:53:22 +01:00
Razi KAntorp
676e277cdf Merge remote-tracking branch 'upstream/master' 2014-02-21 14:03:47 +01:00
Razi KAntorp
b131b71534 global buttons, global tables, create invoice 2014-02-21 14:02:59 +01:00
Hillel Coren
295aaa60cf Merge pull request #9 from alltheworld/report2 
Report2
 2014-02-21 13:57:34 +02:00
Hillel Coren
3572b6d128 bug fixes 2014-02-21 13:54:53 +02:00
alltheworld
91612eb48d Report 1 2014-02-21 07:26:40 +02:00
Hillel Coren
99e4e40223 bug fixes 2014-02-20 16:42:09 +02:00
Hillel Coren
da29bd8900 bug fixes 2014-02-20 16:31:46 +02:00
Hillel Coren
b67beba7b2 bug fixes 2014-02-19 22:36:09 +02:00
Razi KAntorp
e4e440c9be Merge remote-tracking branch 'upstream/master' 2014-02-19 21:12:31 +01:00
Razi KAntorp
c04b552683 Header updates, forms, tables, buttons. 2014-02-19 21:11:08 +01:00