1253 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hillel Coren	3b90030059	Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja	2015-05-27 19:52:14 +03:00
Hillel Coren	3da1e738d8	Working on tasks	2015-05-27 19:52:10 +03:00
Hillel Coren	e4a45c6cf9	Merge pull request #326 from bcole808/whitelabel-fix ... Public payment page white label issue	2015-05-27 09:20:34 +03:00
Ben Cole	e054c4d9e4	Hide logo on public payment page if white label	2015-05-26 21:40:53 -07:00
Hillel Coren	607140327d	Merge pull request #323 from bcole808/issue-320-email-preview ... Added missing template variable to live preview; closes #320	2015-05-26 22:06:50 +03:00
Ben Cole	e9bf76a2d9	Added missing template variable to live preview; closes #320	2015-05-26 10:41:40 -07:00
Hillel Coren	50e3008ebb	Merge #319	2015-05-22 13:52:49 +03:00
Hillel Coren	d8e2aacece	Merge pull request #316 from paralin/master ... Add dependencies to enable mandrill mail	2015-05-22 10:33:36 +03:00
Hillel Coren	7bc95f0381	Merge pull request #318 from hillelcoren/revert-317-master ... Revert "Composer update for HTML/Form Facade"	2015-05-22 10:31:32 +03:00
Hillel Coren	557323d761	Revert "Composer update for HTML/Form Facade"	2015-05-22 10:30:04 +03:00
Hillel Coren	5eeca49771	Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja	2015-05-22 10:22:29 +03:00
Hillel Coren	33d139adf5	Working on pdfmake	2015-05-22 10:22:24 +03:00
Hillel Coren	4512b05f85	Merge pull request #317 from infacq/master ... Composer update for HTML/Form Facade	2015-05-22 10:21:00 +03:00
Infacq	9f388c7a10	fix comma	2015-05-22 15:11:54 +08:00
Infacq	6bf806450c	change to blade style for CSRF	2015-05-22 15:10:55 +08:00
Infacq	4284ab6f91	to suit with Laravel Collective Syntax	2015-05-22 15:09:14 +08:00
Infacq	e40c634ea8	change to official community project	2015-05-22 15:06:34 +08:00
Christian Stewart	ed283b9bad	Merge branch 'master' of github.com:paralin/invoice-ninja	2015-05-21 16:59:01 -07:00
Christian Stewart	6bf47bdb17	Add guzzle for mandrill support ... Conflicts: composer.lock	2015-05-21 16:58:25 -07:00
Hillel Coren	0ffd13f864	Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja	2015-05-19 22:14:24 +03:00
Hillel Coren	edec5028c6	Bug fixes	2015-05-19 22:14:00 +03:00
Hillel Coren	8b8117e539	Merge pull request #309 from jpgnz/mail_from_address ... Sending Email from AWS/Mandrill/Generic SMTP Services: Fix RFC Error	2015-05-15 14:13:32 +03:00
James Graham	ba1231357a	Fix RFC Error ... When using AWS/Mandrill etc, using MAIL_USERNAME as the "From Address" causes errors. Need to create new .env variable.	2015-05-15 21:15:22 +12:00
Hillel Coren	935780f7bc	Bug fixes	2015-05-15 11:51:22 +03:00
Hillel Coren	19c1a33d52	Bug fixes	2015-05-13 18:32:59 +03:00
Hillel Coren	140943f166	Fixed problem when adding user	2015-05-12 12:36:32 +03:00
Hillel Coren	0fa30fb55f	Bug fixes	2015-05-11 14:16:36 +03:00
Hillel Coren	6747e56b71	Merge pull request #304 from paviro/master ... New German translations	2015-05-10 23:14:27 +03:00
Paul-Vincent Roll	8ccaebab60	New German translations	2015-05-10 22:08:56 +02:00
Paul-Vincent Roll	1865880d5d	Merge pull request #7 from hillelcoren/master ... Update from Master	2015-05-10 21:58:04 +02:00
Hillel Coren	fcbec2617b	Bug fixes	2015-05-10 22:02:35 +03:00
Hillel Coren	bdb9fe4324	Change	2015-05-10 13:15:41 +03:00
Hillel Coren	c4a94834a1	API improvements	2015-05-10 11:45:03 +03:00
Hillel Coren	f41e0d999b	Bug fixes	2015-05-09 21:25:16 +03:00
Hillel Coren	9198677277	Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja	2015-05-08 11:21:43 +03:00
Hillel Coren	ef6e930f1b	Minor dashboard improvements	2015-05-08 11:21:29 +03:00
Jeramy Simpson	e4963fef66	Merge pull request #303 from Destination-Design/patch_pdf_upload ... Fixed Invoice object in Mailer instance.	2015-05-06 13:51:04 +10:00
Viktor Rennert	0eaed84132	Fixed Invoice object in Mailer instance.	2015-05-05 22:53:54 +02:00
Hillel Coren	b368e5589c	Bug fixes	2015-05-05 12:48:23 +03:00
Hillel Coren	5a28ff2612	Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja	2015-04-30 20:54:41 +03:00
Hillel Coren	1d6013178f	Working on basic reports	2015-04-30 20:54:19 +03:00
Jeramy Simpson	9cb51f449b	Fix PHP 5.4 Compatibility for pdfupload	2015-04-29 11:49:28 +10:00
Jeramy Simpson	e74963f8fb	Add items to gitignore for PHPStorm Files	2015-04-29 11:47:44 +10:00
Hillel Coren	bc10719fbe	Added support for custom subdomains	2015-04-28 23:13:52 +03:00
Hillel Coren	723aa285f5	Bug fixes	2015-04-27 15:28:40 +03:00
Hillel Coren	f39d1d4ae5	Adding pdfcache folder	2015-04-27 11:17:10 +03:00
Hillel Coren	b2678220c3	Working on PDF attachments	2015-04-23 00:40:21 +03:00
Hillel Coren	dc6ed9fca1	Updating design	2015-04-22 22:21:04 +03:00
Hillel Coren	c0571b0b2e	Bug fixes	2015-04-21 23:09:45 +03:00
Hillel Coren	8018bcad6c	Working on pdfmake	2015-04-21 14:42:31 +03:00