9082 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Cole	dc48335ed9	Remove double budget limits.	2017-10-15 14:38:12 +02:00
James Cole	dad1ee6edd	Fix bars #916	2017-10-15 14:37:58 +02:00
James Cole	5c0bb34d77	Code for #916	2017-10-15 14:05:31 +02:00
James Cole	3e85e4180a	New translations firefly.php (Spanish)	2017-10-15 11:20:28 +02:00
James Cole	99500a1ee2	New translations firefly.php (Portuguese, Brazilian)	2017-10-15 11:20:24 +02:00
James Cole	4945356665	New translations config.php (Portuguese, Brazilian)	2017-10-15 10:50:26 +02:00
James Cole	2190fb972c	New translations csv.php (Portuguese, Brazilian)	2017-10-15 10:50:23 +02:00
James Cole	dfa7e94f87	New translations bank.php (Slovenian)	2017-10-15 10:50:19 +02:00
James Cole	aa6a0f6e83	New translations breadcrumbs.php (Portuguese, Brazilian)	2017-10-15 10:50:13 +02:00
James Cole	02203fb38a	New translations intro.php (French)	2017-10-15 10:50:12 +02:00
James Cole	64b957fda6	New translations bank.php (Slovenian)	2017-10-15 10:40:22 +02:00
James Cole	f82880a519	New translations firefly.php (Portuguese, Brazilian)	2017-10-15 10:40:16 +02:00
James Cole	e7a782359d	New translations csv.php (Portuguese, Brazilian)	2017-10-15 10:40:14 +02:00
James Cole	7f9f83bb3f	New translations config.php (Portuguese, Brazilian)	2017-10-15 10:40:12 +02:00
James Cole	7dca784091	New translations breadcrumbs.php (Portuguese, Brazilian)	2017-10-15 10:40:11 +02:00
James Cole	c633c800a5	New translations intro.php (French)	2017-10-15 10:10:09 +02:00
James Cole	9277ba60aa	New translations firefly.php (Spanish)	2017-10-15 10:10:07 +02:00
James Cole	b30f76ccf5	Merge branch 'release/4.6.8'	2017-10-15 08:57:11 +02:00
James Cole	7ff19a8419	Updated changelog.	2017-10-15 08:52:36 +02:00
James Cole	b28c3a64fa	Updated version.	2017-10-15 08:45:12 +02:00
James Cole	6fedf1eec0	Fixed tests	2017-10-15 08:44:16 +02:00
James Cole	e47911ef43	Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop ... * 'develop' of https://github.com/firefly-iii/firefly-iii: (30 commits) New translations firefly.php (French) New translations csv.php (French) New translations firefly.php (German) New translations intro.php (German) New translations intro.php (German) New translations intro.php (German) New translations list.php (German) New translations firefly.php (Slovenian) New translations firefly.php (Slovenian) New translations firefly.php (Slovenian) New translations csv.php (Slovenian) New translations csv.php (Slovenian) New translations list.php (Slovenian) New translations csv.php (Slovenian) New translations bank.php (Slovenian) New translations list.php (Slovenian) New translations breadcrumbs.php (Slovenian) New translations intro.php (French) New translations firefly.php (French) New translations firefly.php (French) ...	2017-10-15 08:31:17 +02:00
James Cole	7a873c6ee7	Merge pull request #918 from firefly-iii/l10n_develop ... New Crowdin translations	2017-10-15 08:30:57 +02:00
James Cole	c6c76ac710	New lock file	2017-10-15 08:30:32 +02:00
James Cole	2dae7f40e1	Small updates in change log [skip ci]	2017-10-15 08:26:13 +02:00
James Cole	918ebafd7c	Update changelog formatting.	2017-10-15 08:24:21 +02:00
James Cole	466ff4fe3c	Solution for #926	2017-10-15 07:52:15 +02:00
James Cole	353b3fcba7	Fix invalid JSON.	2017-10-14 08:08:14 +02:00
James Cole	da980bcf9c	Remove dev package from wrong section.	2017-10-14 08:06:34 +02:00
James Cole	ed237476fa	Correct environment in example .env file. #925	2017-10-14 08:06:24 +02:00
James Cole	401ae92a62	Various fixes for #916	2017-10-14 07:58:29 +02:00
James Cole	70ab42bc43	Will correctly join budget tables. #916	2017-10-13 18:26:22 +02:00
James Cole	15e060ea9e	Won’t set budget for anything other then withdrawals. #916	2017-10-13 18:26:05 +02:00
James Cole	4c834467ae	Get all fields	2017-10-13 17:34:19 +02:00
James Cole	7bf691e2bd	Verify deposits with budget.	2017-10-13 17:32:14 +02:00
James Cole	f63bf12733	New translations firefly.php (French)	2017-10-11 18:10:29 +02:00
James Cole	65f0acbd10	New translations csv.php (French)	2017-10-11 18:00:21 +02:00
James Cole	6dd0c2612b	New translations firefly.php (German)	2017-10-11 14:31:30 +02:00
James Cole	21701fd5f2	New translations intro.php (German)	2017-10-11 14:20:21 +02:00
James Cole	beabed1c1b	New translations intro.php (German)	2017-10-11 14:10:11 +02:00
James Cole	ece042b468	New translations intro.php (German)	2017-10-11 14:00:18 +02:00
James Cole	668e36ccf6	New translations list.php (German)	2017-10-11 14:00:17 +02:00
James Cole	27d533dd5b	New docker things.	2017-10-11 10:07:09 +02:00
James Cole	011e28e8c2	Updated docker file.	2017-10-11 09:34:03 +02:00
James Cole	dadeb4616e	Updated docker file.	2017-10-11 09:14:34 +02:00
James Cole	bea0c8dd55	Update docker files. #919 and #915	2017-10-11 08:16:57 +02:00
James Cole	31b92fe594	New translations firefly.php (Slovenian)	2017-10-10 17:32:09 +02:00
James Cole	1753b58ec9	New translations firefly.php (Slovenian)	2017-10-10 17:20:14 +02:00
James Cole	ade8bbb221	New translations firefly.php (Slovenian)	2017-10-10 17:10:10 +02:00
James Cole	c31160f82d	New translations csv.php (Slovenian)	2017-10-10 17:10:08 +02:00