4139 Commits

Author	SHA1	Message	Date
James Cole	ac0e2c9885	Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop ... * 'develop' of https://github.com/firefly-iii/firefly-iii: New translation strings. Update JournalRepository.php Update Amount.php Update ImportStorage.php Fix #854 Enable mod_ssl by default	2017-09-24 21:18:57 +02:00
James Cole	260ef1a07e	Tag view update.	2017-09-24 21:18:43 +02:00
James Cole	ec73607974	Update JournalRepository.php ... Fix #860	2017-09-20 08:35:20 +02:00
James Cole	e442eb6ce2	Update Amount.php ... Fix null pointer #854	2017-09-20 08:31:00 +02:00
James Cole	db9c0600a8	Update ImportStorage.php ... Fix for #854	2017-09-19 07:51:16 +02:00
James Cole	3f93941dd9	Fix #854	2017-09-17 19:21:03 +02:00
James Cole	37250cbde3	Various code cleanup.	2017-09-16 09:24:48 +02:00
James Cole	3424ec1c27	Various code cleanup.	2017-09-16 07:41:03 +02:00
James Cole	fe9adba7fb	Reinstate secure pw check and single user verification.	2017-09-16 07:18:15 +02:00
James Cole	b1135cee60	Various code cleanup	2017-09-16 07:17:58 +02:00
James Cole	bbab89d884	Fixes #848	2017-09-16 06:52:53 +02:00
James Cole	6fd040d420	Fix null pointer exception. #846	2017-09-15 17:35:44 +02:00
James Cole	c8cec91a93	Add debug info to job change status [skip ci]	2017-09-15 07:00:53 +02:00
James Cole	38bb074751	Fix storage bug in #845	2017-09-15 06:26:09 +02:00
James Cole	519ca4b2af	Improve export routine and cron job for #837	2017-09-14 21:17:19 +02:00
James Cole	f54b4c3abc	Implement access token for command line things.	2017-09-14 18:27:22 +02:00
James Cole	43a66fd378	Export job.	2017-09-14 18:10:38 +02:00
James Cole	f4938cfed7	Debug text in import routine.	2017-09-14 18:10:31 +02:00
James Cole	6badf101d7	Small cosmetic changes to export routine.	2017-09-14 18:03:39 +02:00
James Cole	5e900736f8	Various code cleanup.	2017-09-14 17:40:02 +02:00
James Cole	afe9d109b3	Small layout change [skip ci]	2017-09-14 16:13:25 +02:00
James Cole	768c7e53b4	Show message when locale is invalid.	2017-09-14 16:12:07 +02:00
James Cole	c9e7018490	Fix null pointer	2017-09-14 16:11:10 +02:00
James Cole	4b5f500dc1	Filter out opening balances. #839	2017-09-14 10:39:24 +02:00
James Cole	233305ecb4	Change namespace of rules.	2017-09-13 07:49:58 +02:00
James Cole	1d3ace5f21	Fix for #835	2017-09-12 22:28:14 +02:00
James Cole	3e8fe70915	Update error handler.	2017-09-12 22:14:43 +02:00
James Cole	bf8ce5471e	Fix bug in #836	2017-09-12 22:11:45 +02:00
James Cole	262f8a33c6	Fixed validation rules.	2017-09-12 21:44:31 +02:00
James Cole	436017baee	Introduce version to template. Rename Javascript URI	2017-09-12 19:57:41 +02:00
James Cole	6e80b2f4c8	Update tests.	2017-09-12 19:47:29 +02:00
James Cole	ce205ab413	Various small fixes.	2017-09-12 18:24:42 +02:00
James Cole	73d85ca8c6	Update kernel so it works.	2017-09-12 18:24:12 +02:00
James Cole	24ea20f769	Various changes to make things work again.	2017-09-10 09:46:50 +02:00
James Cole	3fda7aa1e5	Update Kernel file to work with Laravel 5.5	2017-09-10 08:33:51 +02:00
James Cole	2268155994	Various files	2017-09-09 22:10:43 +02:00
James Cole	b219283d66	New validation thing is taking my namespace	2017-09-09 22:06:30 +02:00
James Cole	f077adaefd	Separated providers.	2017-09-09 22:06:13 +02:00
James Cole	8823666aa9	CSRF middleware separated.	2017-09-09 22:03:54 +02:00
James Cole	ff9146ab91	Authentication in separate commit.	2017-09-09 22:03:27 +02:00
James Cole	c40be5299c	Kernel middleware in separate commit.	2017-09-09 22:02:20 +02:00
James Cole	bf270745f0	Separate commit for error handler.	2017-09-09 21:57:45 +02:00
James Cole	d1e60cd546	First step towards Laravel 5.5	2017-09-09 21:57:24 +02:00
James Cole	2f8d75eb73	Fix for #827	2017-09-09 18:44:05 +02:00
James Cole	53eef3fda7	Catch for #822	2017-09-09 18:37:47 +02:00
James Cole	0bcc010de8	Create link types when they do not exist in verify routine. #826	2017-09-09 18:36:17 +02:00
James Cole	d46ba4325f	Updated composer file	2017-09-09 07:21:20 +02:00
James Cole	66c13f35e7	Various code cleanup.	2017-09-09 07:03:43 +02:00
James Cole	3a3eb4e84f	Various code cleanup.	2017-09-09 06:41:45 +02:00
James Cole	0543733e3d	Various code cleanup.	2017-09-09 06:28:21 +02:00
James Cole	336fb5f5a6	Fix #820	2017-09-09 06:25:20 +02:00
James Cole	2dff8aec69	Code for #819	2017-09-08 20:24:11 +02:00
James Cole	aae26c5da9	Can edit rule group #794	2017-09-08 20:12:55 +02:00
James Cole	2dbdcf73ed	Possible fix for #724	2017-09-08 20:07:22 +02:00
James Cole	a50945ad53	Fix #814	2017-09-05 20:50:19 +02:00
James Cole	068b9e388f	New code for double transfer routine. #797	2017-09-05 06:43:33 +02:00
James Cole	f2446d46aa	Code for #797	2017-09-03 18:19:58 +02:00
James Cole	78c8680300	Expand log for #797	2017-09-03 18:18:19 +02:00
James Cole	83754960a6	Add messages for all levels.	2017-09-03 16:09:27 +02:00
James Cole	892f262261	Fix transaction controller tests	2017-09-03 16:06:37 +02:00
James Cole	d9dad4387e	Fix rule validation issues.	2017-09-03 15:57:13 +02:00
James Cole	0444ad5221	Debug message for #797	2017-09-03 13:02:19 +02:00
James Cole	693c6fb71b	Debug message for #797	2017-09-03 13:00:36 +02:00
James Cole	b002635d1b	Fixes #809	2017-09-03 12:56:45 +02:00
James Cole	1d87da7745	Fix nullpointer	2017-09-03 11:13:45 +02:00
James Cole	6b09466819	Implement #803	2017-09-03 10:51:02 +02:00
James Cole	816b291ed3	Code for #805	2017-09-03 10:39:05 +02:00
James Cole	b9f6119c68	Fix rule title.	2017-09-03 10:38:41 +02:00
James Cole	aed5ef3fba	Sort triggers and actions	2017-09-03 10:16:45 +02:00
James Cole	c29fb13941	Commit changes.	2017-09-03 10:08:56 +02:00
James Cole	30549da044	Merge pull request #806 from pkoziol/develop ... Fix formatting when currency symbol is separated and follows amount	2017-09-03 09:45:21 +02:00
James Cole	e81775fbce	Merge pull request #807 from pkoziol/issue-799 ... Fix reseting action type when editing rule	2017-09-03 09:45:07 +02:00
koziolek	682f9283a6	Fix search that worked only for lowercase queries ... firefly-iii/firefly-iii#798	2017-09-02 20:38:56 +02:00
koziolek	bbe8a97945	Fix reseting action type when editing rule ... firefly-iii/firefly-iii#799	2017-09-02 20:30:55 +02:00
koziolek	f93d11643f	Fix formatting when currency symbol is separated and follows amount	2017-09-02 20:11:37 +02:00
James Cole	7cab89a291	Remove experimental multi period thing.	2017-09-02 07:40:05 +02:00
James Cole	5e08461385	Fix broken dev installation.	2017-09-01 21:22:55 +02:00
James Cole	632d95f1fb	Should fix rule, category and other name checks. #793	2017-09-01 11:20:51 +02:00
James Cole	ab80803f0f	Fix order for bills.	2017-09-01 06:28:26 +02:00
James Cole	8db9641480	Experimental multi-budget overview.	2017-08-31 07:29:23 +02:00
James Cole	8dec769d64	Add newlines to files [skip ci]	2017-08-31 06:47:18 +02:00
James Cole	7702ed027b	Expand view for #780	2017-08-30 07:40:39 +02:00
James Cole	4aaacf8e2e	Ask for CC number when asset is a CC. #784	2017-08-30 07:14:35 +02:00
James Cole	d610302e79	Code for #782	2017-08-30 07:00:17 +02:00
James Cole	1319cb2e4e	Improving bunq import.	2017-08-27 08:54:58 +02:00
James Cole	b8d4776671	Remove unused code.	2017-08-26 21:28:14 +02:00
James Cole	50837af607	Expand tag view.	2017-08-26 14:50:08 +02:00
James Cole	9238efbd3a	Fix tag cloud	2017-08-26 14:44:05 +02:00
James Cole	ea2af2378d	Expand budget pages to work with new date view.	2017-08-26 14:30:41 +02:00
James Cole	094ddfcf5f	Fix rounding for amounts.	2017-08-26 10:01:48 +02:00
James Cole	7329098ed8	Fix rounding for amounts.	2017-08-26 10:00:08 +02:00
James Cole	0f229e4d7b	Improved extraction of bunq data.	2017-08-26 06:21:22 +02:00
James Cole	4b2abb6f25	Add ability to translate links.	2017-08-25 16:03:36 +02:00
James Cole	dba3d89027	Update form for linking.	2017-08-25 06:58:28 +02:00
James Cole	c37ade8f5b	Catch link error.	2017-08-24 19:42:23 +02:00
James Cole	394e92d538	Improvements for #616 and others.	2017-08-23 21:21:42 +02:00
James Cole	a5013ecbc3	Expand link view and more features #616	2017-08-21 18:16:15 +02:00
James Cole	d00b9515de	fix #770	2017-08-21 17:11:18 +02:00
James Cole	55b1c533cf	Fix division by zero. [skip ci]	2017-08-21 08:48:02 +02:00
James Cole	f1a7f30167	Fix division by zero. [skip ci]	2017-08-21 08:47:03 +02:00
James Cole	9f5c2b74eb	Fix division by zero.	2017-08-21 08:44:04 +02:00
James Cole	35ab4a5ff4	Management of links and first form for link storing #616	2017-08-21 07:13:03 +02:00
James Cole	7684e966fc	First code for #616	2017-08-20 12:41:31 +02:00
James Cole	40639dfa37	New view for tags	2017-08-20 12:40:14 +02:00
James Cole	2609f3425b	Fix #738	2017-08-19 21:59:13 +02:00
James Cole	bd924b993b	This fixes part of #738 (not everything).	2017-08-19 18:24:04 +02:00
James Cole	c4fe9a6a51	More code for bunq import, must now wait for reply from bunq itself	2017-08-19 16:46:06 +02:00
James Cole	4694e31e35	Expand bunq related code.	2017-08-19 09:22:44 +02:00
James Cole	ca0f09c8f7	Various cleanup.	2017-08-18 23:02:29 +02:00
James Cole	684c9773c9	Can now register with Bunq and get device server ID.	2017-08-18 21:09:22 +02:00
James Cole	df443aa34c	Add copyright things.	2017-08-18 21:08:51 +02:00
James Cole	93068659e5	Bunq code.	2017-08-18 17:08:30 +02:00
James Cole	9b17715175	Fix the unit tests.	2017-08-18 15:32:11 +02:00
James Cole	7d8876f03c	new export routine	2017-08-18 15:14:44 +02:00
James Cole	b955486f14	Updated export routine.	2017-08-18 14:45:42 +02:00
James Cole	6666d1a2f4	Add debug information to getAmount routine.	2017-08-15 21:12:49 +02:00
James Cole	7b3ef0e3ab	Fix #764	2017-08-15 17:34:34 +02:00
James Cole	34894fb76b	Add some comments [skip ci]	2017-08-15 17:26:43 +02:00
James Cole	1633994fbd	Slight change in amount handler. #760	2017-08-13 15:30:39 +02:00
James Cole	f9c85d4d81	Catch the error in #760	2017-08-13 12:37:09 +02:00
James Cole	ec636c95a1	Improve update and verify routines.	2017-08-13 12:30:28 +02:00
James Cole	f9b5468481	Last minute fixes for import routine.	2017-08-13 08:49:45 +02:00
James Cole	26740668da	Import transfer error	2017-08-12 21:23:19 +02:00
James Cole	bdd72f0d30	Fix path for tag controller.	2017-08-12 21:22:59 +02:00
James Cole	ad4a811d0a	Small bug fixes [skip ci]	2017-08-12 19:11:24 +02:00
James Cole	018941c5b3	Actually use journal [skip ci]	2017-08-12 19:05:29 +02:00
James Cole	cc1439fb7b	Revamped import routine.	2017-08-12 19:03:42 +02:00
James Cole	f684a2900b	Include default currency.	2017-08-12 16:42:29 +02:00
James Cole	83b721a322	Small bug fix in map / roles.	2017-08-12 16:41:05 +02:00
James Cole	a879528ed8	Back to basics.	2017-08-12 16:40:51 +02:00
James Cole	accbff3ccb	Small cleanup in CSV processor	2017-08-12 16:12:30 +02:00
James Cole	0375f77b73	Prevent asset account from being found by opposing account. #719	2017-08-12 13:49:40 +02:00
James Cole	9803932324	Various code clean up.	2017-08-12 10:27:45 +02:00
James Cole	337895cbaa	Add newlines to files.	2017-08-12 07:48:39 +02:00
James Cole	743547096e	Various code cleanup	2017-08-12 07:47:42 +02:00
James Cole	81fb3df45e	Fix #747	2017-08-12 07:39:58 +02:00
James Cole	12624cab5b	Improve foreign currency routine for #746	2017-08-12 07:38:22 +02:00
James Cole	b5acf1d529	Merge early release branch ... Code for #749 Add link to split withdrawal Clarifies #751 Text for #748 Improve error reporting #752 Small code cleanup. Add copyright markers.	2017-08-12 06:59:59 +02:00
James Cole	2e6d1f3642	Clarifies #751	2017-08-12 06:44:00 +02:00
James Cole	31de86c9eb	Improve error reporting #752	2017-08-12 06:40:17 +02:00
James Cole	04a2cd1f1f	Small code cleanup.	2017-08-11 05:42:15 +02:00
James Cole	bc0ef11a8c	Add copyright markers.	2017-08-11 05:36:05 +02:00
James Cole	90c8420a4c	Initial code for preparing bunq import #714	2017-08-11 05:21:00 +02:00
James Cole	8d4530f1f2	Fixes #743	2017-08-10 20:48:29 +02:00
James Cole	6d15c503c3	Fix #515	2017-08-10 20:41:33 +02:00
James Cole	6fbfe6fb72	Remove references to date range thing.	2017-08-10 19:55:52 +02:00
James Cole	5d1e90d29c	Expand verify password routine.	2017-08-08 16:30:21 +02:00
James Cole	b29fabf76c	Include virtual balance in transaction overview #735	2017-08-07 20:36:23 +02:00
James Cole	4c0396ad1c	Fixes #733	2017-08-07 17:59:26 +02:00
James Cole	3e513e92b1	Import routine is prepped for multi-source import (such as banks).	2017-08-04 15:56:14 +02:00
James Cole	194fe178c0	Refactor for #732	2017-08-04 15:48:26 +02:00
James Cole	5d10a19bfa	First version of routine #732	2017-08-04 15:46:52 +02:00
James Cole	1cfa1faccc	Remove all time jumps because they’re unclear and complex.	2017-07-30 13:53:04 +02:00
James Cole	1caa393974	Simple cache routine.	2017-07-30 13:44:36 +02:00
James Cole	c39c5492ea	Simplify controllers	2017-07-30 13:42:30 +02:00
James Cole	8fcdb91ba3	Will no longer support extended tag modes.	2017-07-30 10:22:14 +02:00
James Cole	f67d5f1197	Fix bug in filter.	2017-07-30 10:21:45 +02:00
James Cole	6e0e6203cc	Some help text for attachment decrypter	2017-07-30 10:21:35 +02:00
James Cole	2694ce4148	Decryption routine for #671	2017-07-30 08:22:39 +02:00
James Cole	eac9613df7	Fix for #648	2017-07-29 14:25:54 +02:00
James Cole	db3b822aef	Include warning for #722	2017-07-29 08:27:39 +02:00
James Cole	f4994ef151	Also store links when importing data.	2017-07-28 14:52:01 +02:00
James Cole	aae9ad78e5	This should fix the tests for now.	2017-07-26 18:40:48 +02:00
James Cole	fb3efbfc66	Fix parameter count.	2017-07-26 16:40:25 +02:00
James Cole	0f8a66609a	Fix controller for #718	2017-07-26 16:40:14 +02:00
James Cole	b3bb8c386f	Fix routes for #718	2017-07-26 16:40:00 +02:00
James Cole	99a0bf1286	This fixes #717	2017-07-25 21:01:25 +02:00
James Cole	650f0ee752	Merge branch 'hotfix/4.6.3.1' into develop	2017-07-23 20:02:46 +02:00
James Cole	7b03b0c5fc	Some PHP 7.1 compatible code.	2017-07-23 19:06:24 +02:00
James Cole	57d6677131	Merge branch 'release/4.6.3'	2017-07-23 10:01:48 +02:00
James Cole	f85ab74e2b	Code cleanup and tests.	2017-07-23 08:32:51 +02:00
James Cole	8bb7d5de3f	Various code clean up.	2017-07-23 08:16:11 +02:00
James Cole	2c00a8353d	Fix small issue reenabling intro [skip ci]	2017-07-23 07:35:30 +02:00
James Cole	f16a186faf	Option to re-enable intro boxes.	2017-07-23 07:30:05 +02:00
James Cole	5b69a697e4	Improve pages to show intro texts.	2017-07-22 10:50:30 +02:00
James Cole	f2d388f742	Improve code for intro texts.	2017-07-21 06:00:10 +02:00
James Cole	77d077ec08	Fix help button.	2017-07-16 18:28:46 +02:00
James Cole	021d0e6359	More stuff for intro texts.	2017-07-16 18:14:29 +02:00
James Cole	09f838089b	Allow rule to be applied to transactions (not just group).	2017-07-16 13:04:45 +02:00
James Cole	b676b1fef9	Simplify import storage routine.	2017-07-16 07:45:20 +02:00
James Cole	58bfb35fa6	Built a new routine for intro tours.	2017-07-16 07:35:08 +02:00
James Cole	1d6ca91c01	This fixes the tests.	2017-07-15 22:41:57 +02:00
James Cole	fa00ba2edd	Expand tests and fix various small issues in strict comparison.	2017-07-15 22:17:24 +02:00
James Cole	8a38ce1964	Remove references to old tour but include code for new tour.	2017-07-15 21:40:42 +02:00
James Cole	accbdea942	Improve search and display of results.	2017-07-15 17:19:12 +02:00
James Cole	22144b78ea	Strict comparisons.	2017-07-15 16:41:07 +02:00
James Cole	c03ab269f0	Memory optimised, connect journal to tag.	2017-07-15 10:43:22 +02:00
James Cole	0c6c4d5959	Fix small issue in chart.	2017-07-15 10:26:27 +02:00
James Cole	e4e1873770	Improve import routine.	2017-07-15 10:26:16 +02:00
James Cole	3b3579025d	Improve results when presented with invalid data. #701	2017-07-14 17:57:20 +02:00
James Cole	5cf8f2f4f4	Add sort flag for #698	2017-07-14 17:25:03 +02:00
James Cole	c4ff05b1ba	Sort fix #698 [skip ci]	2017-07-14 17:21:30 +02:00
James Cole	3c4abb7b60	Fixed some issues in import, should improve results for #701	2017-07-14 06:41:47 +02:00
James Cole	970c73c221	Fix path	2017-07-14 06:41:10 +02:00
James Cole	9b6ccdd43a	Fixes #694	2017-07-10 19:52:31 +02:00
James Cole	e82deddefb	Merge branch 'release/4.6.2'	2017-07-08 09:55:44 +02:00
James Cole	952328d55c	Routine to make sure imported entries have the correct opposing account and the correct amount.	2017-07-08 06:53:06 +02:00
James Cole	5ef2067836	Some code cleanup.	2017-07-08 06:28:44 +02:00
James Cole	de9728895e	Fixed #658	2017-07-08 06:09:17 +02:00
James Cole	19774f32c2	First code for #658	2017-07-07 17:51:14 +02:00