7961 Commits

Author	SHA1	Message	Date
James Cole	7ce6dc9f16	Merge branch 'adminlte4' into develop	2023-08-12 17:44:08 +02:00
James Cole	1b9d8dd3c3	Fix #7845 among other things	2023-08-12 17:43:24 +02:00
James Cole	daf753d76e	Merge branch 'develop' into adminlte4	2023-08-11 19:43:18 +02:00
James Cole	4c90f66578	Minor code cleanup	2023-08-11 19:40:44 +02:00
James Cole	a9bd0f551d	Make sure all objects also add user group	2023-08-11 19:37:28 +02:00
James Cole	939c636a74	Add new action that can switch the source and destination account of a transfer	2023-08-11 06:16:40 +02:00
James Cole	2b829cb645	Code cleanup	2023-08-11 06:05:02 +02:00
James Cole	4bbc898639	Expand bill API and v2 account API	2023-08-11 06:04:03 +02:00
James Cole	fc0fee161e	Merge branch 'develop' into adminlte4	2023-08-09 14:14:57 +02:00
James Cole	72c99d3834	New API endpoints + transformer	2023-08-09 14:14:44 +02:00
James Cole	a2984f299b	Extend API	2023-08-09 14:14:33 +02:00
James Cole	deb51bd8de	Merge branch 'develop' into adminlte4	2023-08-08 16:45:23 +02:00
James Cole	03f39f53d8	Fix nullpointer	2023-08-08 15:55:48 +02:00
James Cole	ced3e9387a	Merge branch 'develop' into adminlte4	2023-08-08 15:04:10 +02:00
James Cole	02c906afe6	Expand API to return transaction groups.	2023-08-08 15:03:58 +02:00
James Cole	7a2d4c9bd2	Log as error, not debug	2023-08-08 14:11:25 +02:00
James Cole	8ce760a0bf	Merge branch 'develop' into adminlte4 ... # Conflicts: # app/Api/V2/Controllers/Chart/CategoryController.php	2023-08-06 19:40:09 +02:00
James Cole	8d8e047d2c	New charts	2023-08-06 19:37:51 +02:00
James Cole	551408b801	Expand layout	2023-08-06 18:33:29 +02:00
James Cole	e1915e365a	Merge branch 'develop' into adminlte4 ... # Conflicts: # config/cors.php # config/hashing.php	2023-08-06 11:25:20 +02:00
James Cole	e8c4eec536	New API code for boxes.	2023-08-06 11:22:36 +02:00
James Cole	fd640f9698	Merge branch 'develop' into adminlte4	2023-08-06 07:08:33 +02:00
James Cole	ffd8aef35f	Expand API with v2 summary endpoint.	2023-08-06 07:04:09 +02:00
James Cole	46412bdc66	Fix #7810	2023-08-06 07:03:39 +02:00
James Cole	1a3dfbdef6	Merge branch 'develop' into adminlte4	2023-08-01 19:55:08 +02:00
James Cole	0c087f33c2	Build administration-compatible budget chart.	2023-08-01 19:38:53 +02:00
James Cole	5f9f621fa6	Small chart fixes	2023-08-01 12:28:11 +02:00
James Cole	8aeb513d54	Merge branch 'develop' into adminlte4	2023-08-01 12:11:45 +02:00
James Cole	bfc5c5d154	Fix API version and match API	2023-08-01 11:15:19 +02:00
James Cole	7c9f7f04b7	Chart field name refactor	2023-08-01 10:26:26 +02:00
James Cole	e61a433999	Merge branch 'develop' into adminlte4	2023-08-01 09:54:40 +02:00
James Cole	3517452ea1	Expand upgrade command	2023-08-01 09:54:09 +02:00
James Cole	fc78c9a1d6	Merge branch 'develop' into adminlte4 ... # Conflicts: # yarn.lock	2023-08-01 09:47:30 +02:00
James Cole	8d55f7f2e5	Clean up code	2023-08-01 09:47:06 +02:00
James Cole	8162b22d43	Fix chart	2023-08-01 09:42:59 +02:00
James Cole	8504d55f17	First code for new balance chart	2023-08-01 09:27:39 +02:00
James Cole	75ae1bbde1	Show expanded transactions in all account overviews.	2023-08-01 06:24:26 +02:00
James Cole	eb559bbb03	Merge pull request #7803 from zqye/main	2023-07-31 19:11:46 +02:00
zqye	2eae96a895	exchangeRatesCronJob should only be fired when ENABLE_EXTERNAL_RATES is true.	2023-07-31 10:04:16 -07:00
James Cole	fe4e00dc5c	Fix #7792	2023-07-29 06:52:21 +02:00
James Cole	1a1b0ee27d	Fix https://github.com/firefly-iii/firefly-iii/issues/7787	2023-07-29 06:17:09 +02:00
James Cole	99009cff88	Meta files for new release.	2023-07-28 16:14:55 +02:00
James Cole	673f68b07c	A simple command that outputs the Firefly III version.	2023-07-26 07:30:44 +02:00
James Cole	8796168580	Merge branch 'develop' into adminlte4 ... # Conflicts: # yarn.lock	2023-07-25 16:12:58 +02:00
James Cole	dde7bcfc4c	Expand code for exchange rates	2023-07-25 09:01:44 +02:00
James Cole	be531d777e	Continued work on v4	2023-07-23 07:10:31 +02:00
James Cole	6ab332e4fb	fix: nullpointer	2023-07-20 12:55:45 +02:00
James Cole	923debb299	Fix notification nullpointer	2023-07-18 18:15:17 +02:00
James Cole	f5fef8c036	Fix https://github.com/firefly-iii/firefly-iii/issues/7757	2023-07-18 18:15:07 +02:00
James Cole	982134c077	fix: prevent the demo user from changing the slack URL	2023-07-18 07:15:41 +02:00