11121 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dennis Enderink	057619b157	Cast to string because trans() could return array	2018-10-27 23:26:04 +02:00
Dennis Enderink	fd505b77b2	Fixed alignment of some language files	2018-10-27 23:23:54 +02:00
Dennis Enderink	81a23b5b22	Added translation for initial balance account name on creation	2018-10-27 23:20:54 +02:00
James Cole	3a427dd0f4	Refactor temporary account storage and fix a bug in the bunq import. #1607	2018-10-25 20:03:48 +02:00
James Cole	e1402d5d8a	Fix for #1812	2018-10-23 18:56:37 +02:00
James Cole	864a6883d4	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2018-10-23 18:54:31 +02:00
James Cole	9b58c28be8	Fix #1807	2018-10-23 18:53:38 +02:00
James Cole	69fe6ecb7d	Merge pull request #1813 from hamuz/develop ... Fix remote backing storage	2018-10-23 18:52:48 +02:00
HamuZ HamuZ	321676c97f	fix wrong local disk for export, and prefer local to remote	2018-10-23 18:44:12 +03:00
HamuZ HamuZ	d2e1493530	fixate flysystem-fallback-adapter in 0.1.2 (without buggy PR accepted)	2018-10-23 18:36:45 +03:00
James Cole	1c8375d0c2	Fix #1807	2018-10-22 19:00:37 +02:00
James Cole	e164e22e13	Yoda style if statement.	2018-10-21 11:08:54 +02:00
James Cole	c1c4c96918	Keep DB at version 10.	2018-10-21 11:08:45 +02:00
James Cole	742e03944d	Small textual changes for #1159	2018-10-21 11:08:36 +02:00
James Cole	60f2c19d9d	Clean up env files.	2018-10-21 11:07:19 +02:00
James Cole	21a8d9a109	Merge pull request #1797 from bnw/develop ... Parse description from FinTSTransaction	2018-10-21 10:47:34 +02:00
Ben	9abedf3160	Refactored pardsing of description for FinTS import. ... Added some tests.	2018-10-20 15:50:53 +02:00
Ben	4e48961c2b	Parse description from FinTSTransaction	2018-10-20 14:53:47 +02:00
James Cole	78cd1629de	Fix for #1805	2018-10-20 09:16:35 +02:00
James Cole	dd0cc2d173	Updated Docker files and double check the login provider.	2018-10-19 09:51:58 +02:00
James Cole	8f00d2b616	Merge pull request #1800 from hamuz/develop ... bills: match attachment route with the icon	2018-10-17 18:14:11 +02:00
HamuZ HamuZ	c26d98b308	bills: match attachment route with icon	2018-10-17 19:07:09 +03:00
James Cole	913774850b	Merge pull request #1799 from hamuz/develop ... Add links to transaction from dates in bill, closes #1771	2018-10-17 17:47:17 +02:00
HamuZ HamuZ	43c9737e6e	Add links to transaction from dates in bill	2018-10-17 18:17:16 +03:00
James Cole	67cd3b6f81	Force InnoDB for MySQL.	2018-10-17 15:50:43 +02:00
James Cole	d0d2189d55	Users can now reorder budgets #1108	2018-10-17 15:18:09 +02:00
James Cole	b12773bc99	Fix for #1784	2018-10-17 06:06:36 +02:00
James Cole	da5a1fe264	Fix for #1785	2018-10-17 06:05:19 +02:00
James Cole	ea48c23535	Fix for #1790	2018-10-17 05:31:51 +02:00
James Cole	8cd0d5e1ef	Fix for #1798	2018-10-17 05:04:26 +02:00
James Cole	9b46e62eb6	match api end point with config changes.	2018-10-16 21:42:08 +02:00
James Cole	1653152dad	Fix for #1792	2018-10-15 19:37:18 +02:00
James Cole	db7e3d725e	Fix for #1781	2018-10-14 17:38:26 +02:00
James Cole	329b34f7d1	Fix for #1760	2018-10-14 16:54:11 +02:00
James Cole	d624f20107	Fixes for #1747	2018-10-14 16:40:12 +02:00
James Cole	20bebeb7de	Fix in file system configuration [skip ci]	2018-10-14 16:27:26 +02:00
James Cole	4e9456b33b	Make SFTP primary.	2018-10-14 14:49:03 +02:00
James Cole	26c03552c6	Fix for #1159	2018-10-14 14:38:13 +02:00
James Cole	ac6c3496d4	Fix LDAP in Dockerfile.	2018-10-14 11:42:49 +02:00
James Cole	2f1760f358	Sync up config files #1787	2018-10-14 09:05:02 +02:00
James Cole	53db8912d6	Some mild refactoring for #1787	2018-10-14 08:53:00 +02:00
James Cole	91ef21a665	Merge pull request #1787 from hamuz/develop ... allow sftp host as backing storage using env	2018-10-14 08:41:40 +02:00
James Cole	5b1153ab65	Considerations on new line.	2018-10-14 08:40:10 +02:00
James Cole	5196bb9281	Remove code climate configuration.	2018-10-14 08:38:11 +02:00
James Cole	8fd6f8177f	Update readme.	2018-10-14 08:38:03 +02:00
HamuZ HamuZ	7b68716a3d	allow sftp host as backing storage using env	2018-10-14 07:09:00 +03:00
James Cole	d8ecc63e66	Fix Spectre test.	2018-10-13 22:15:06 +02:00
James Cole	2575f61828	Remove test script from root of Firefly III.	2018-10-13 21:45:23 +02:00
James Cole	c6370ebe48	Fix tests for login providers when dealing with LDAP.	2018-10-13 21:45:12 +02:00
James Cole	3bc38570a2	Code for #1071	2018-10-13 21:32:20 +02:00