1337 Commits

Author	SHA1	Message	Date
James Cole	23925a0076	Enabled cache [skip ci]	2016-11-19 15:17:00 +01:00
James Cole	50b72cf229	More chart optimisations.	2016-11-19 13:37:44 +01:00
James Cole	ee6b72afa5	Fix some bugs related to cash accounts.	2016-11-19 12:57:35 +01:00
James Cole	781621960d	Make sure chart is displayed.	2016-11-19 09:26:32 +01:00
James Cole	e15ea04186	Join two charts, simpler code.	2016-11-19 07:27:54 +01:00
James Cole	73f0cc705b	Code cleanup.	2016-11-18 20:06:08 +01:00
James Cole	757662ca4b	Removed duplicate code.	2016-11-16 20:59:21 +01:00
James Cole	750b9d8038	Reduce number of queries.	2016-11-12 21:06:48 +01:00
James Cole	7e7ac264d2	Fixed category chart	2016-11-12 20:29:16 +01:00
James Cole	98d6c90e90	Removed some duplicate code.	2016-11-12 19:22:03 +01:00
James Cole	a294f757ff	Fixes all charts in future category report.	2016-11-12 10:14:20 +01:00
James Cole	04515da0bc	Fixed the charts	2016-11-12 07:02:32 +01:00
James Cole	6d60d64a82	Some extended code for the category report.	2016-11-12 06:48:38 +01:00
James Cole	32b5a84a0c	Fixes #401	2016-11-12 06:34:54 +01:00
James Cole	5d4f1bc76d	First working example of category report. No content, just place holders. #396	2016-11-10 06:23:21 +01:00
James Cole	3600e1b5e7	Extend report capability for issue #396 and related report issues.	2016-11-09 21:36:54 +01:00
James Cole	fe57648349	Allow report options to be pulled using AJAX. Ajax is cool.	2016-11-09 19:25:09 +01:00
James Cole	f653bc5f6e	Expand firefly config.	2016-11-07 18:49:35 +01:00
James Cole	0c8a1b51e9	Quick bug fix: missing class.	2016-11-06 15:01:04 +01:00
James Cole	22a2fe3f61	Improved search.	2016-11-06 14:52:31 +01:00
James Cole	77e2cf40df	Removed more getJournals functions in favour of the collector.	2016-11-06 08:08:06 +01:00
James Cole	962cad33e2	Code cleanup.	2016-11-05 18:43:18 +01:00
James Cole	1e2124c5ed	Moved more stuff to the journal collector.	2016-11-05 18:08:44 +01:00
James Cole	37435da459	Moved more stuff to the journal collector.	2016-11-05 17:47:50 +01:00
James Cole	13e1292bb7	Automated code cleanup [skip ci]	2016-11-05 11:47:21 +01:00
James Cole	8e542531b3	Move collecting journals to the collector.	2016-11-05 11:44:41 +01:00
James Cole	aeca2ef3b2	Move some code around	2016-11-05 10:42:31 +01:00
James Cole	205a593721	Removed unused method.	2016-11-05 10:28:10 +01:00
James Cole	46649fe228	Solved group thing.	2016-11-05 10:26:57 +01:00
James Cole	98160e9b63	Expand use of journal collector.	2016-11-05 08:46:55 +01:00
James Cole	9c5d192d90	Journal collector may not have been a bad idea after all!	2016-11-05 08:27:25 +01:00
James Cole	5f7fb77db2	Code to fix #378	2016-11-04 16:04:36 +01:00
James Cole	72f7b5f3ea	This fixes #375	2016-11-03 21:07:12 +01:00
James Cole	e1be4909b9	Redirect when 0 accounts. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-11-02 21:24:16 +01:00
James Cole	5e480eca36	Clean up some report code. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-11-02 20:45:11 +01:00
James Cole	e24f5ec9f3	Multi year report move to AJAX. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-11-02 20:08:11 +01:00
James Cole	2ddd4314f1	Extend help pages.	2016-11-02 14:33:57 +01:00
James Cole	5be317d73c	sprintf ALL THE THINGS ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-11-02 07:04:14 +01:00
James Cole	124ecb1372	New budget table for multi year report. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-11-02 04:55:44 +01:00
James Cole	33c0c1bea6	Removed everything pointless from multi year report. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-11-01 19:06:35 +01:00
James Cole	ed33a054ad	This update will make the help method fall back to the English content, if it is available.	2016-10-31 18:31:52 +01:00
James Cole	7821c52842	Ajax some report parts.	2016-10-30 18:29:26 +01:00
James Cole	d4995e342f	Fixed #330	2016-10-30 06:14:07 +01:00
James Cole	c9f14da294	Translations.	2016-10-29 17:30:55 +02:00
James Cole	35f179625c	New queries for #366	2016-10-29 16:11:54 +02:00
James Cole	39749aa113	First code set for #330	2016-10-29 15:14:33 +02:00
James Cole	73f1491d2d	Updates for translations.	2016-10-29 07:44:46 +02:00
James Cole	afdcfa8525	Tweak reports.	2016-10-26 19:45:10 +02:00
James Cole	fe3f015171	Add more stuff to ajax controllers, making report controller simpler.	2016-10-26 16:46:43 +02:00
James Cole	a7e5fcc806	Move some stuff over to AJAX thing.	2016-10-25 18:53:54 +02:00
James Cole	e2d187d74b	Various small bug fixes.	2016-10-24 18:01:15 +02:00
James Cole	48b0620629	New help thing.	2016-10-23 17:33:53 +02:00
James Cole	19e9f382e4	Add some rounding to make forms more neat.	2016-10-23 16:56:18 +02:00
James Cole	78deb1420d	Some fixes for bills.	2016-10-23 14:56:05 +02:00
James Cole	81f6fef978	Add new line to files [skip ci]	2016-10-23 12:42:44 +02:00
James Cole	a79a8c8874	Various small upgrades.	2016-10-23 12:37:12 +02:00
James Cole	c39659b064	Remove a lot of references to user id.	2016-10-23 12:19:32 +02:00
James Cole	9a30fbd05a	Move stuff to request classes for #339	2016-10-23 12:10:22 +02:00
James Cole	bcd7b41c91	Simplified export.	2016-10-23 09:44:14 +02:00
James Cole	a8a8afc2be	More for #339	2016-10-22 22:03:00 +02:00
James Cole	49e32abd3f	Move some code for #339	2016-10-22 21:40:31 +02:00
James Cole	a147e9b74a	Fix edit screen. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-10-22 11:53:34 +02:00
James Cole	0d87f7c4ca	Better implementation of markdown. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-10-22 11:50:33 +02:00
James Cole	8c675615df	Support markdown in notes. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-10-22 11:47:47 +02:00
James Cole	e4d249e73c	Piggy bank supports notes (#350)	2016-10-22 10:13:49 +02:00
James Cole	091f6e918b	Fix some reported issues.	2016-10-22 09:44:47 +02:00
James Cole	5d9b68c3e7	Various code cleanup [skip ci]	2016-10-22 09:39:31 +02:00
James Cole	12a6a61100	Various code cleanup [skip ci]	2016-10-22 09:33:03 +02:00
James Cole	7ce3b8d4ef	Updated events, fixes #345	2016-10-22 09:31:27 +02:00
James Cole	2346d2ec05	Fine tuning split edit screens.	2016-10-22 07:28:31 +02:00
James Cole	a4c081c8a5	Fix unset variable. [skip ci]	2016-10-21 22:01:42 +02:00
James Cole	316980efbd	Fix unset variable. [skip ci]	2016-10-21 22:00:45 +02:00
James Cole	a05bc0eed0	Fix route [skip ci]	2016-10-21 21:57:10 +02:00
James Cole	6a553f77f3	Large update to fix split journals.	2016-10-21 21:41:31 +02:00
James Cole	a74cef439b	For simplicity, split controller.	2016-10-21 19:20:03 +02:00
James Cole	9a3cd27700	Many updates to get split transactions and normal transactions working side by side.	2016-10-21 19:06:22 +02:00
James Cole	f83aaf77f1	Improve bill things for issue #341	2016-10-20 21:40:45 +02:00
James Cole	d92768ecbf	This code fixes #349	2016-10-20 19:10:43 +02:00
James Cole	b9308cd74a	Test flash messages.	2016-10-20 16:51:05 +02:00
James Cole	78b577bc9d	Better ip info [skip ci]	2016-10-18 06:50:35 +02:00
James Cole	8e48e53f17	Restucturing some code.	2016-10-15 12:39:34 +02:00
James Cole	ac968dd6cd	Extended the user admin.	2016-10-15 07:11:53 +02:00
James Cole	d662c18ed7	Fix sorting in chart. [skip ci]	2016-10-14 20:07:15 +02:00
James Cole	e4ea234707	New revenue accounts chart.	2016-10-14 20:01:17 +02:00
James Cole	0b526c0168	New revenue chart	2016-10-14 19:59:10 +02:00
James Cole	2acde5c72a	Option to show deposit accounts on the front page.	2016-10-14 19:52:30 +02:00
James Cole	23fad62d46	Completely removed account crud class.	2016-10-10 08:03:03 +02:00
James Cole	3cbf00734f	Remove storeMeta	2016-10-10 07:53:25 +02:00
James Cole	1dc17dd59d	Move getActiveAccountsByType	2016-10-10 07:53:12 +02:00
James Cole	de6f838413	Moved getAccountsByType	2016-10-10 07:49:39 +02:00
James Cole	e8a095e543	Moved getAccountsById	2016-10-10 07:25:27 +02:00
James Cole	8ef7c5ac33	Moved find() method to new class.	2016-10-10 07:12:39 +02:00
James Cole	7180a40cd8	Refactored some methods surrounding the opening balance of an account.	2016-10-10 07:01:14 +02:00
James Cole	85dc7f3643	Moved another method.	2016-10-10 06:49:50 +02:00
James Cole	fcb5e4eabc	Moved leftOnAccount()	2016-10-10 06:47:42 +02:00
James Cole	ade1cf9c19	Fixed wrong listing.	2016-10-10 06:40:50 +02:00
James Cole	e94ae126fd	Refactored accountRepository::getJournals > accountTasker > getJournals	2016-10-09 21:36:03 +02:00
James Cole	5bb8c6a366	This should fix #355	2016-10-09 20:18:46 +02:00
James Cole	b77ea6d316	Add some phpdoc	2016-10-09 11:21:41 +02:00
James Cole	b082858866	Removed unused blocks from the front page. Savings and piggy banks.	2016-10-09 10:58:54 +02:00
James Cole	a8a014189d	Removed method that was already there under another name.	2016-10-09 10:57:06 +02:00
James Cole	39ea9e85a7	Various code cleanup and refactoring. Restored cache.	2016-10-09 10:53:37 +02:00
James Cole	90f2e27f1f	Refactoring income and expense reports.	2016-10-09 09:32:12 +02:00
James Cole	a3359ba47a	Moved destroy() method from CRUD to Account repos.	2016-10-09 08:20:29 +02:00
James Cole	1d2d3523d6	Move CRUD method count() to account repository	2016-10-09 08:18:47 +02:00
James Cole	c64771b76b	Move some methods around, refactoring.	2016-10-09 07:58:27 +02:00
James Cole	ea7ee7ee9a	Moved a report out of the controller.	2016-10-08 16:24:07 +02:00
James Cole	a1f797c4d1	Moved a method around.	2016-10-08 16:04:05 +02:00
James Cole	24f62b8fce	Some minor refactoring.	2016-10-08 10:02:33 +02:00
James Cole	d43936155c	Removed some unused code.	2016-10-07 16:33:17 +02:00
James Cole	5540697dbd	Removed a method no longer necessary.	2016-10-05 16:09:37 +02:00
James Cole	b355c18e0c	Some code cleanup and copyright cleanup. [skip ci]	2016-10-05 06:52:15 +02:00
James Cole	0fdaac53d0	Removed for #334	2016-10-01 08:49:33 +02:00
James Cole	e1b3a08878	Fix #337 [skip ci]	2016-10-01 08:49:02 +02:00
James Cole	dc893588b0	Fix #335	2016-10-01 08:48:13 +02:00
James Cole	2fc09ff9d7	Fix empty pop-ups in report.	2016-09-25 14:47:55 +02:00
James Cole	9a53d8c21c	Some array_keys fixes.	2016-09-25 08:46:42 +02:00
James Cole	0d198193db	Some issues fixed for scrutiniser.	2016-09-25 08:36:35 +02:00
James Cole	3323c31765	Some issues fixed for scrutiniser.	2016-09-25 08:24:03 +02:00
James Cole	bb7c26b77c	Some issues fixed for scrutiniser.	2016-09-25 08:20:17 +02:00
Niek van der Kooy	2f7cf9b916	Fix assignment of array variables	2016-09-24 17:01:41 +02:00
James Cole	6fef9ee72b	#315	2016-09-24 10:58:48 +02:00
James Cole	ab6dd0a1ec	#314	2016-09-24 10:55:13 +02:00
James Cole	577290e813	add strtolower [skip ci]	2016-09-24 09:14:47 +02:00
James Cole	11385494eb	Fix for income entry.	2016-09-20 08:57:08 +02:00
James Cole	a95099fa46	Update FF configuration.	2016-09-18 19:57:21 +02:00
James Cole	5ca9099654	Some code fixes.	2016-09-17 09:50:40 +02:00
James Cole	6e33e26ddf	Update copyright notices, update German language.	2016-09-17 07:57:32 +02:00
James Cole	aac0c9ab98	Various layout updates and tiny upgrade fixes [skip ci]	2016-09-16 13:29:56 +02:00
James Cole	d25d0454fc	Code clean up	2016-09-16 12:15:58 +02:00
James Cole	f38984398d	Code clean up [skip ci]	2016-09-16 12:07:45 +02:00
James Cole	7c52f297ee	MySQL 5.7 compatible query fixing. [skip ci]	2016-09-16 11:06:21 +02:00
James Cole	63fb435002	Expand code.	2016-09-16 10:50:19 +02:00
James Cole	2f8263f53a	Possible fix for reports [skip ci]	2016-09-16 09:36:08 +02:00
James Cole	fccdf56c5d	Fixed some query things.	2016-09-16 09:09:54 +02:00
James Cole	bd53410c71	Some changes in login routes for 5.3	2016-09-16 09:02:35 +02:00
James Cole	7d63f124c4	Fixing some login routes	2016-09-16 07:22:57 +02:00
James Cole	d00fbe4eb3	More code for 5.3	2016-09-16 06:48:38 +02:00
James Cole	3d25fd79ca	First set of upgrade to 5.3 stuff.	2016-09-16 06:19:40 +02:00
James Cole	7d5bb72b0c	Fix for #312 ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-09-15 19:14:22 +02:00
James Cole	2da087401e	Extend audit report ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-09-10 18:37:16 +02:00
James Cole	629baf9de5	Added invoice date ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-09-10 18:36:52 +02:00
James Cole	176752e219	Code for optional fields #301 ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-09-09 11:19:40 +02:00
James Cole	8d19f60091	Various translation updates. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-09-09 11:19:19 +02:00
James Cole	c3ccc4ccdf	This should fix #308 ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-09-08 21:10:24 +02:00
James Cole	6c5cd705c0	Some code for new optional fields, see #301 ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-09-04 16:21:51 +02:00
James Cole	ce003f217b	Removed unused "budget maximum" preference	2016-09-03 21:13:08 +02:00
James Cole	8c7ef49eb6	New code by @vissert that allows category edit (see #282) ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-09-03 05:01:48 +02:00
James Cole	2ce5142b06	Small fix for #303 ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-09-01 19:01:08 +02:00
James Cole	f3a8a25872	Fixed #303 ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-09-01 18:31:39 +02:00
James Cole	312079657b	Include files from new import routine in export routine.	2016-08-28 07:05:42 +02:00
James Cole	5c3da9fd9e	New language files. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-08-27 04:34:59 +02:00
James Cole	65f5d27b12	New pages for administration. More settings will be web-based. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-08-27 04:00:48 +02:00
James Cole	a9444ac702	Code cleanup. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-08-26 09:30:52 +02:00
James Cole	d0c6afc3a9	Various code clean up. [skip ci]	2016-08-26 08:21:31 +02:00
James Cole	0ec021c375	No need to grab journals we don't need. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-08-26 07:36:26 +02:00
James Cole	58ca7d551a	Rename import procedure method name	2016-08-26 06:43:23 +02:00
James Cole	fd8ed4c9aa	Fixed a bug in strict typing. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-08-25 19:19:12 +02:00
James Cole	5aadb29905	Add some forgotten code to the mobile piggy bank controller things. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-08-24 20:06:45 +02:00
James Cole	98c4ac955a	Finetune user feedback during import and add a tag to collect transactions.	2016-08-14 11:31:09 +02:00
James Cole	70b63e1736	Better report for finished import.	2016-08-14 10:11:49 +02:00
James Cole	85f484e73c	Divide by zero.	2016-08-14 09:10:08 +02:00
James Cole	e440d55034	Finetune import status page.	2016-08-14 08:10:42 +02:00
James Cole	c58eea6654	Fine-tuning the import routine.	2016-08-13 23:28:01 +02:00
James Cole	bbed5d0701	First version of a web-based import status thing.	2016-08-13 21:51:01 +02:00
James Cole	2947ec0002	Small optimisations.	2016-08-12 15:27:44 +02:00
James Cole	5c4d010bde	Code cleanup.	2016-08-12 15:10:03 +02:00
James Cole	76649cb7de	Extended views and language.	2016-08-12 10:07:53 +02:00
James Cole	186b704509	Lots of new code to test the import routine. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-08-11 10:21:32 +02:00
James Cole	5826fec519	Some new import stuff.	2016-08-06 06:21:25 +02:00
James Cole	47376f1f35	Fix a problem mentioned in issue #283 ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-08-05 19:29:44 +02:00
James Cole	09d63b584d	Save old data; bread crumbs	2016-08-04 06:14:08 +02:00
James Cole	5f5469a7d4	Moved some files around.	2016-08-04 06:10:30 +02:00
James Cole	38800d61b0	New user related code.	2016-08-04 06:07:53 +02:00
James Cole	1186e95c51	Admin view will show some IP addresses. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-08-03 20:57:01 +02:00
James Cole	0db9852769	This should fix a bug in split expenses.	2016-08-02 19:12:18 +02:00
James Cole	541d9ebdd9	Optimised some code.	2016-07-30 16:29:04 +02:00
James Cole	c287bc139c	Check new list.	2016-07-24 18:51:39 +02:00
James Cole	1392275b81	Lots of new code for importer and some preferences.	2016-07-24 18:47:55 +02:00
James Cole	87c0f1d86e	More CSV related updates.	2016-07-23 21:37:06 +02:00
James Cole	cb9433f4b9	This should fix #280	2016-07-17 08:50:22 +02:00
James Cole	f1e8d1cf1e	Show bill average.	2016-07-05 08:57:45 +02:00
James Cole	e8e7ab01d2	Merge branch 'develop' of github.com:JC5/firefly-iii into develop	2016-07-04 12:38:22 +02:00
James Cole	9244994233	Fix bug that would report wrong file size to browser.	2016-07-04 12:37:33 +02:00
James Cole	ae768a8525	Works up until actual import.	2016-07-02 23:08:47 +02:00
James Cole	57b5981904	Fix #266 for period-chart.	2016-07-02 17:42:27 +02:00
James Cole	275d19e71d	Fix #266 for all-chart.	2016-07-02 17:39:58 +02:00
James Cole	189b11befa	Extra page number check for issue #276	2016-07-02 17:36:46 +02:00
James Cole	a56a5fc228	New code for import routine.	2016-07-02 17:33:57 +02:00
James Cole	18d2741814	More code for the new CSV import	2016-06-27 15:15:46 +02:00
James Cole	3d201db6fc	More code for import.	2016-06-24 14:24:34 +02:00
James Cole	9ffc0936ee	Merge branch 'feature/new-csv-import' into develop ... # Conflicts: # app/Helpers/Csv/Importer.php	2016-06-23 12:15:19 +02:00
James Cole	2c826451d1	Fix delete routine and some NULLs	2016-06-23 12:07:31 +02:00
James Cole	8ee1676f0a	New migrations.	2016-06-18 07:36:15 +02:00
James Cole	ae649223d8	Mobile add money to piggy routine	2016-06-16 20:52:59 +02:00
James Cole	e63f216905	Fix small bug in reorder routine.	2016-06-15 09:58:33 +02:00
James Cole	ec18165698	Fixed #267	2016-06-11 07:38:30 +02:00
James Cole	5a79bc0a99	Initial code base for new CSV import.	2016-06-10 21:00:00 +02:00
James Cole	beda6ec3a9	Removed old CSV stuff.	2016-06-10 15:25:24 +02:00
James Cole	c619b8730b	Implemented #264	2016-06-07 12:22:46 +02:00