12615 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Cole	5cfa9bcc30	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2020-01-09 06:10:31 +01:00
James Cole	5737fefd63	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2020-01-08 18:14:15 +01:00
James Cole	8c611901b8	Fix #2976	2020-01-08 18:13:42 +01:00
James Cole	bb1483f196	Update custom template.	2020-01-08 08:06:42 +01:00
James Cole	a2a980e3de	Fix #2966	2020-01-08 06:05:00 +01:00
James Cole	2485f74302	Fix #2975	2020-01-08 05:48:45 +01:00
James Cole	6019638388	Fix old todo item	2020-01-07 17:18:56 +01:00
James Cole	39d61feede	Update some tests.	2020-01-05 19:29:28 +01:00
James Cole	465947dddf	Updated language string.	2020-01-05 08:13:24 +01:00
James Cole	d116609389	Fix #2956	2020-01-05 08:04:55 +01:00
James Cole	e2bb5c7bfb	Expand nonce.	2020-01-04 11:18:33 +01:00
James Cole	ff3f2c1c9c	Code for #2920	2020-01-04 11:16:14 +01:00
James Cole	d83d8d3f97	Code for #2920	2020-01-04 11:00:44 +01:00
James Cole	cb575f3200	Update JS packages. Remove debug bar.	2020-01-04 07:43:44 +01:00
James Cole	041357c2ff	First steps for #2920	2020-01-04 07:24:43 +01:00
James Cole	40c6ca9d35	Update changelog.	2020-01-04 06:55:23 +01:00
James Cole	be565dd2e5	Fix #2950	2020-01-04 06:18:36 +01:00
James Cole	2fb28669ca	Ignore dev file.	2020-01-03 11:30:41 +01:00
James Cole	ce44edcf63	Fix #2945	2020-01-03 11:30:21 +01:00
James Cole	5b9e0319c7	Fix link in composer	2020-01-03 11:29:56 +01:00
James Cole	b2808d6a0c	Fix root copyright notices, after a tip from @GaryQ [skip ci]	2020-01-03 06:27:46 +01:00
James Cole	b1848e274f	Fix #2941	2020-01-02 19:41:14 +01:00
James Cole	c55ef9c77b	Fix location store for tag.	2020-01-02 19:25:42 +01:00
James Cole	e1577a4a76	Make sure update and edit work for location, API or not.	2020-01-02 19:12:40 +01:00
James Cole	f7d6a4c6f9	Fix some charts.	2020-01-02 08:34:34 +01:00
James Cole	cacc58ee0c	Merge tag '5.0.0-alpha.2' into develop ... 5.0.0-alpha.2	2020-01-01 20:04:13 +01:00
James Cole	7bfca96eae	Merge branch 'release/5.0.0-alpha.2' 5.0.0-alpha.2	2020-01-01 20:04:11 +01:00
James Cole	00f32314f6	final files for new alpha.	2020-01-01 20:03:38 +01:00
James Cole	c78c667157	Reformat if-statement.	2020-01-01 19:55:02 +01:00
James Cole	fca5d9d55b	Update composer file	2020-01-01 19:21:47 +01:00
James Cole	9825f304b5	Remove debug info from login file.	2020-01-01 18:51:59 +01:00
James Cole	a1125278f7	Update libraries.	2020-01-01 16:21:19 +01:00
James Cole	830f6eb785	Remove long/lat from tag info in group collector.	2020-01-01 16:21:07 +01:00
James Cole	3ca18369a0	Better icon for password security help.	2020-01-01 15:38:54 +01:00
James Cole	58498b71f1	Update some translations.	2020-01-01 15:38:47 +01:00
James Cole	18442a3caa	Make sure login form shows errors again.	2020-01-01 15:34:38 +01:00
James Cole	48a1ad3381	Updated methods to make budget charts multi-currency	2020-01-01 14:28:03 +01:00
James Cole	ca260387a2	Make sure location data in request is processed in a unified way.	2020-01-01 14:27:43 +01:00
James Cole	414e8d7153	Refactor data method.	2020-01-01 14:27:08 +01:00
James Cole	35996f24be	Make budget chart multi-currency	2020-01-01 14:26:49 +01:00
James Cole	05bf8121dc	Fix #2937	2020-01-01 14:13:35 +01:00
James Cole	cc09a15dcf	Possible fix for #2936	2020-01-01 13:56:54 +01:00
James Cole	c193284471	Move Location validation rules to single method.	2019-12-31 14:01:53 +01:00
James Cole	96aa42b513	Better text for export	2019-12-31 10:08:15 +01:00
James Cole	51aa48f084	Give importer deprecation warning.	2019-12-31 06:36:30 +01:00
James Cole	f13b912a43	Clean up changelog, remove reference to Sandstorm. [skip ci]	2019-12-31 06:21:44 +01:00
James Cole	2c9bc10e51	Fix #2934	2019-12-31 06:17:32 +01:00
James Cole	a331b2d661	Same but for tags.	2019-12-30 21:04:22 +01:00
James Cole	e1186b48ec	Fix account name validator and make sure the location CRUD works in the API for accounts.	2019-12-30 20:44:52 +01:00
James Cole	0ae52198e7	Add location to Account transformer.	2019-12-30 17:49:29 +01:00