429 Commits

Author	SHA1	Message	Date
James Cole	a57554d380	Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop ... * 'develop' of https://github.com/firefly-iii/firefly-iii: Fix charts in IE	2018-01-08 20:20:14 +01:00
James Cole	f737cb7235	Update language files for #1109	2018-01-08 19:20:41 +01:00
devlearner	495158b9c9	Fix charts in IE ... since IE apparently doesn't support arrow function expression (and throws a syntax error)	2018-01-08 07:49:32 +00:00
James Cole	5177619301	Lots of new code for Spectre import.	2018-01-03 19:17:30 +01:00
James Cole	d87dda40ee	Clean up some JS and views.	2018-01-01 16:46:41 +01:00
James Cole	06cfc391a1	Add cast to string to fix chart. [skip ci]	2018-01-01 16:46:15 +01:00
James Cole	9d8a4cd934	Clean up JS code #1078 (also old code removed)	2017-12-30 12:22:49 +01:00
James Cole	0c2ec58366	Merge pull request #1078 from vicmosin/issues/509 ... Introduced bulk edit endpoint for bulk edit of categories and tags	2017-12-30 11:54:06 +01:00
Victor Mosin	2955d7148f	Merge branch 'develop' into issues/509 ... # Conflicts: # public/js/ff/transactions/list.js	2017-12-30 11:49:42 +01:00
Victor Mosin	805456d032	Introduced bulk edit endpoint for bulk edit of categories and tags	2017-12-30 09:21:28 +01:00
James Cole	a9df7906eb	Update JS and CSS libraries.	2017-12-30 06:51:16 +01:00
James Cole	3815f9836f	Various code cleanup.	2017-12-29 09:05:35 +01:00
James Cole	a10672a683	Progress for Spectre import.	2017-12-28 18:38:59 +01:00
James Cole	b65e1e022e	First code for #1050	2017-12-28 11:38:40 +01:00
James Cole	f7652e7f01	Fix data export.	2017-12-26 08:32:00 +01:00
James Cole	f6096339cb	Fix #1063	2017-12-23 22:02:42 +01:00
James Cole	36c8275f5e	Fix #1061	2017-12-20 20:07:57 +01:00
James Cole	a69aad878e	Fix #1056	2017-12-19 19:25:50 +01:00
James Cole	6c3204a8ce	Update copyright [skip ci]	2017-12-17 14:43:13 +01:00
James Cole	8176356509	New code for import routine, part 3	2017-12-16 19:47:14 +01:00
James Cole	84b6708260	Massive rewrite for import routine, part 1.	2017-12-16 08:03:35 +01:00
James Cole	44496707fb	Remove some comments [skip ci]	2017-12-12 20:53:40 +01:00
James Cole	1b4edae4d9	Final code for #384	2017-12-12 18:22:29 +01:00
James Cole	d7f2b7cd63	Remove unused overview #384	2017-12-11 05:57:07 +01:00
James Cole	54c449f11b	Some code to get #384 working.	2017-12-10 17:55:06 +01:00
James Cole	6ad90c7a87	Update copyright stuff [skip ci]	2017-12-10 09:02:26 +01:00
James Cole	2a87add745	New stuff for report.	2017-12-10 08:56:20 +01:00
James Cole	4998eaeaf1	Code for #384	2017-12-09 21:49:19 +01:00
James Cole	1fec7d6271	Fix #1047	2017-12-09 19:19:15 +01:00
James Cole	462439a5ab	Better chart display for #1034	2017-12-03 09:27:54 +01:00
James Cole	f7b1168e7c	Code cleanup for scrutinizer.	2017-11-25 08:54:52 +01:00
James Cole	be0758ce8a	Update reconciliation code for #1011 and #736	2017-11-24 21:51:07 +01:00
James Cole	644fa3027a	Some code for #736	2017-11-24 18:05:58 +01:00
James Cole	7de512aff8	Fix #1014	2017-11-24 17:33:05 +01:00
James Cole	7a1f698d5e	Fix for #1016 and #968	2017-11-24 17:05:22 +01:00
James Cole	24b63abf2f	Fix Javascript [skip ci]	2017-11-22 21:18:55 +01:00
James Cole	781ca052d8	Code cleanup.	2017-11-22 21:12:27 +01:00
James Cole	0faa599b4c	Code for reconcile.	2017-11-22 20:20:44 +01:00
James Cole	69bb76b6fe	Update code for reconciliation.	2017-11-22 16:54:49 +01:00
James Cole	573e72f7fb	Fix views for #1000	2017-11-18 05:45:58 +01:00
James Cole	141225c980	Code for #914	2017-11-17 19:31:48 +01:00
James Cole	57dcdfa0c4	Code clean up.	2017-11-15 11:33:07 +01:00
James Cole	5530347bb2	New code for #736	2017-11-15 06:29:49 +01:00
James Cole	f0e195f33b	Basic reconcile view for #736	2017-11-10 18:25:11 +01:00
James Cole	b899628dbe	New code for #736	2017-11-10 15:00:24 +01:00
James Cole	78009c1cc0	New strings for reconciled transactions. #736	2017-11-08 09:40:38 +01:00
James Cole	33d89d52c2	Code that allows transaction reconciliation. #736	2017-11-05 19:48:43 +01:00
James Cole	d30d6b5e19	Fix #962	2017-11-03 06:57:46 +01:00
James Cole	1e91be420b	Fix for #967	2017-11-01 16:17:14 +01:00
James Cole	654b9d2022	Various code cleanup.	2017-10-29 20:02:34 +01:00