12628 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Cole	cf067d0bd2	Some extra debugging.	2020-01-09 19:42:28 +01:00
James Cole	2efe5b07e2	#2981 whoops	2020-01-09 19:29:43 +01:00
James Cole	42de629646	Fix #2981	2020-01-09 19:28:23 +01:00
James Cole	220230e981	Fix #2983	2020-01-09 19:26:45 +01:00
James Cole	7f002eb6a9	Be backwards compatible.	2020-01-09 17:04:10 +01:00
James Cole	8c6f8460a2	Be backwards compatible.	2020-01-09 17:03:59 +01:00
James Cole	7f0ac79c5c	Merge tag '5.0.0-beta.1' into develop ... 5.0.0-beta.1	2020-01-09 06:39:13 +01:00
James Cole	4ff2c19fa9	Merge branch 'release/5.0.0-beta.1' 5.0.0-beta.1	2020-01-09 06:39:12 +01:00
James Cole	cfeaeb7877	Update changelog.	2020-01-09 06:38:38 +01:00
James Cole	298371f680	Update libraries.	2020-01-09 06:33:10 +01:00
James Cole	c1aba726de	New strings.	2020-01-09 06:29:54 +01:00
James Cole	8d92b4f3a0	Update language strings	2020-01-09 06:29:16 +01:00
James Cole	0ac973f2b7	Go to beta.1	2020-01-09 06:10:54 +01:00
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