Commit Graph

1310 Commits

Author SHA1 Message Date
James Cole
55ac76f663 Update copyright. 2022-10-16 19:22:26 +02:00
James Cole
49560ca6a6 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	composer.lock
#	config/firefly.php
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
2022-10-16 19:13:15 +02:00
James Cole
5038ed7708 Update build files 2022-10-16 16:07:48 +02:00
James Cole
841edcfffb Rebuild frontend 2022-10-08 07:04:41 +02:00
James Cole
05fe503456 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	frontend/src/i18n/tr_TR/index.js
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
#	resources/assets/js/locales/bg.json
#	resources/assets/js/locales/cs.json
#	resources/assets/js/locales/de.json
#	resources/assets/js/locales/el.json
#	resources/assets/js/locales/en-gb.json
#	resources/assets/js/locales/en.json
#	resources/assets/js/locales/es.json
#	resources/assets/js/locales/fi.json
#	resources/assets/js/locales/fr.json
#	resources/assets/js/locales/hu.json
#	resources/assets/js/locales/it.json
#	resources/assets/js/locales/ja.json
#	resources/assets/js/locales/nb.json
#	resources/assets/js/locales/nl.json
#	resources/assets/js/locales/pl.json
#	resources/assets/js/locales/pt-br.json
#	resources/assets/js/locales/pt.json
#	resources/assets/js/locales/ro.json
#	resources/assets/js/locales/ru.json
#	resources/assets/js/locales/sk.json
#	resources/assets/js/locales/sv.json
#	resources/assets/js/locales/tr.json
#	resources/assets/js/locales/vi.json
#	resources/assets/js/locales/zh-cn.json
#	resources/assets/js/locales/zh-tw.json
#	resources/lang/bg_BG/firefly.php
#	resources/lang/fr_FR/firefly.php
#	resources/lang/nl_NL/firefly.php
#	resources/lang/ru_RU/firefly.php
2022-10-08 07:03:40 +02:00
James Cole
030b6cb281 Rebuild frontend 2022-10-08 06:50:17 +02:00
James Cole
896c15a7a1 Update meta data and translations. 2022-10-08 06:47:56 +02:00
James Cole
db2485f97a Clean up rule form. 2022-10-03 05:49:25 +02:00
James Cole
5f11272d49 Merge branch 'develop' into 5.8-dev 2022-10-01 19:06:55 +02:00
James Cole
c4e46bf89b Fix issue in budget limits 2022-10-01 16:35:29 +02:00
James Cole
9bfa52f3ce Merge branch 'develop' into 5.8-dev
And fix rule creation and edit etc
2022-10-01 07:34:30 +02:00
James Cole
a9f2741282 Add ability to move stuff around, fix spelling. 2022-09-24 17:43:49 +02:00
James Cole
c25b63d87b Fix #4198 2022-09-18 16:28:04 +02:00
James Cole
07541fa08f Update translations and notifications. 2022-09-18 15:48:28 +02:00
James Cole
67126e46b9 Add webhook code and rebuild. 2022-09-18 10:45:38 +02:00
James Cole
d9245f06f7 Add option to delete webhooks. 2022-09-18 05:49:56 +02:00
James Cole
625ad14d7d Add code to create webhook. 2022-09-17 16:54:13 +02:00
James Cole
ad9efde2d0 Expand webhook code. 2022-09-17 07:08:30 +02:00
James Cole
f0416f5322 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	config/firefly.php
2022-09-11 08:59:34 +02:00
James Cole
93ea86f921 Fix meta files for new release. 2022-09-11 07:27:16 +02:00
James Cole
7104433a68 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	app/Exceptions/Handler.php
#	config/firefly.php
2022-09-07 18:35:01 +02:00
James Cole
1d21a8788c Update packages and meta data. 2022-09-04 13:58:21 +02:00
James Cole
e420ead9e8 Update translations. 2022-09-04 13:53:24 +02:00
James Cole
7cf6066afd Merge branch 'develop' into 5.8-dev 2022-08-21 10:42:01 +02:00
James Cole
b6e8144fe9 Try to catch bad operations. 2022-08-19 20:24:20 +02:00
James Cole
4d1b21f70d Merge branch 'develop' into 5.8-dev
# Conflicts:
#	composer.lock
2022-08-03 05:40:31 +02:00
James Cole
aa3fba91d4 Remove the service worker. 2022-08-03 05:39:47 +02:00
James Cole
6b6107fb00 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	config/firefly.php
#	frontend/src/i18n/nb_NO/index.js
#	frontend/src/i18n/nl_NL/index.js
#	frontend/src/i18n/ru_RU/index.js
2022-07-17 08:18:18 +02:00
James Cole
2e8ea7493a Update packages. 2022-07-16 17:26:10 +02:00
James Cole
1406abe7ae Merge branch 'develop' into 5.8-dev
# Conflicts:
#	yarn.lock
2022-07-16 09:46:43 +02:00
James Cole
ef23948b41 Update packages and rebuild 2022-07-16 09:40:52 +02:00
James Cole
0e8d2c5f0a Rebuild frontend 2022-07-16 09:26:19 +02:00
James Cole
5e8671d24b Expand code and upgrade. 2022-07-10 06:23:59 +02:00
James Cole
9118a153d5 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	composer.lock
#	yarn.lock
2022-07-09 17:25:39 +02:00
James Cole
b97988a597 Update packages to shutup dependabot. 2022-07-05 19:16:53 +02:00
James Cole
e0c9d3627e Fix bills. 2022-06-10 17:45:25 +02:00
James Cole
5a02006a42 Remove code. 2022-06-10 17:35:34 +02:00
James Cole
86d15435a5 Update frontend build. 2022-06-09 20:31:44 +02:00
James Cole
9c08b9f1d3 Small update to frontend and associated code. 2022-06-05 20:02:43 +02:00
James Cole
47167c06ae Rebuild frontend. 2022-06-05 14:09:30 +02:00
James Cole
0bc1e6dbaa Add local css & js 2022-06-05 11:50:23 +02:00
James Cole
0ab92114a5 Remove old v2 stuff. 2022-06-04 21:03:55 +02:00
James Cole
bc3c019d03 Meta files for new release. 2022-05-18 06:40:17 +02:00
James Cole
2579750ba3 Update meta files for new release. 2022-05-05 06:01:48 +02:00
James Cole
a258b35236 Update meta files for 5.7.5 2022-05-04 20:15:47 +02:00
James Cole
295724c4e9 Meta files for new release. 2022-05-02 19:08:28 +02:00
James Cole
50f87a210a Replace uri with url 2022-04-12 18:19:30 +02:00
James Cole
ac5c11a8d7 Update meta files for new release. 2022-04-12 17:45:54 +02:00
James Cole
122cab1757 Update meta files for new release. 2022-04-03 12:12:41 +02:00
James Cole
9cdaf7076a Add copyright statements 2022-03-29 14:55:51 +02:00