1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 07:02:34 +01:00
Commit Graph

886 Commits

Author SHA1 Message Date
Hillel Coren
a457a334b0 Merge pull request #195 from hillelcoren/revert-194-master
Revert "dashboard page changes"
2014-11-11 19:47:28 +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
mindnervestech
8f24b84762 Merge pull request #1 from hillelcoren/master
merge from master
2014-11-10 21:49:46 +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
Hillel Coren
925f6384e4 Merge pull request #188 from Lykegenes/master
Fixed SQL query on dashboard
2014-11-04 11:13:34 +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
92b691d19b Dont print 2014-11-02 18:58:08 +01:00
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
b11a169de1 Changes to the readme 2014-11-02 15:06:16 +02: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
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