1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-16 08:02:40 +01:00
Commit Graph

1051 Commits

Author SHA1 Message Date
Hillel Coren
d9d327c5b1 Merge pull request #186 from tlbdk/master
Lots of smaller fixes and initial work on time sheet feature(disabled for now)
2014-11-02 14:32:33 +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
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
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
Hillel Coren
d6eff8f913 Bug fixes 2014-10-26 21:54:37 +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
Hillel Coren
f33dc73f20 Merge pull request #184 from installtech/master
Translations
2014-10-23 09:36:58 +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
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
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
0b79b69d41 Fix dependency issue with requires moving to laravel 4.2 2014-10-20 19:22:40 +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
f6e18f0e45 Merge pull request #181 from andrenam/sqliteissues
SQLite: fix issues migrating and seeding
2014-10-20 19:29:04 +03: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
c8146a3d09 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-10-19 23:15:42 +03:00
Hillel Coren
ca8db0ffbc Enabled using date variables for non-recurring invoices 2014-10-19 23:15:37 +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
001208e345 fix #174 - Tax rate error in live PDF 2014-10-19 23:10:16 +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
Hillel Coren
e994db2187 Merge pull request #175 from wanchopeblanco/master
Improved spanish translation
2014-10-19 21:03:56 +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
27339dbfa0 Added tax percent to PDF 2014-10-19 18:06:20 +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
Hillel Coren
62a6f8538a Merge pull request #169 from opendo/master
[BUGFIX] Wrong usage of use statement
2014-10-19 12:33:29 +03:00